yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-03 17:59:37 +02:00
Code Issues Releases Wiki Activity

Fix duplicated resolutions when capping fps

Browse source
This commit is contained in:
Chocobozzz 2024-09-11 16:05:10 +02:00
parent 8e644dedb2
commit baefe61cff
No known key found for this signature in database
GPG key ID: 583A612D890159BE
3 changed files with 38 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts
View file

@ -38,8 +38,6 @@ export abstract class AbstractJobBuilder <P> {
const probe = await ffprobePromise(videoFilePath)
const quickTranscode = await canDoQuickTranscode(videoFilePath, CONFIG.TRANSCODING.FPS.MAX, probe)
let inputFPS: number
let maxFPS: number
let maxResolution: number
@ -47,7 +45,7 @@ export abstract class AbstractJobBuilder <P> {
if (videoFile.isAudio()) {
// The first transcoding job will transcode to this FPS value
inputFPS = maxFPS = Math.min(DEFAULT_AUDIO_MERGE_RESOLUTION, CONFIG.TRANSCODING.FPS.MAX)
maxFPS = Math.min(DEFAULT_AUDIO_MERGE_RESOLUTION, CONFIG.TRANSCODING.FPS.MAX)
maxResolution = DEFAULT_AUDIO_RESOLUTION
mergeOrOptimizePayload = this.buildMergeAudioPayload({
@ -58,7 +56,7 @@ export abstract class AbstractJobBuilder <P> {
fps: maxFPS
})
} else {
inputFPS = videoFile.fps
const inputFPS = videoFile.fps
maxResolution = buildOriginalFileResolution(videoFile.resolution)
maxFPS = computeOutputFPS({ inputFPS, resolution: maxResolution, isOriginResolution: true, type: 'vod' })
@ -116,7 +114,7 @@ export abstract class AbstractJobBuilder <P> {
const lowerResolutionJobPayloads = await this.buildLowerResolutionJobPayloads({
video,
inputVideoResolution: maxResolution,
inputVideoFPS: inputFPS,
inputVideoFPS: maxFPS,
hasAudio: videoFile.hasAudio(),
isNewVideo,
hlsAudioAlreadyGenerated