jeena/PeerTube
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Fix transcoding

Browse source
This commit is contained in:
Chocobozzz 2020-01-29 16:54:03 +01:00
parent 14aa85562c
commit c7f36e4f48
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/helpers/ffmpeg-utils.ts
View file

@ -263,8 +263,9 @@ async function canDoQuickTranscode (path: string): Promise<boolean> {
return true
}
function getClosestFramerateStandard (fps: number, hd = false): number {
return VIDEO_TRANSCODING_FPS[hd ? 'HD_STANDARD' : 'STANDARD'].slice(0).sort((a, b) => fps % a - fps % b)[0]
function getClosestFramerateStandard (fps: number, type: 'HD_STANDARD' | 'STANDARD'): number {
return VIDEO_TRANSCODING_FPS[type].slice(0)
.sort((a, b) => fps % a - fps % b)[0]
}
// ---------------------------------------------------------------------------
@ -294,12 +295,10 @@ async function buildx264Command (command: ffmpeg.FfmpegCommand, options: Transco
// On small/medium resolutions, limit FPS
options.resolution !== undefined &&
options.resolution < VIDEO_TRANSCODING_FPS.KEEP_ORIGIN_FPS_RESOLUTION_MIN &&
fps > VIDEO_TRANSCODING_FPS.AVERAGE ||
// If the video is doesn't match hd standard
!VIDEO_TRANSCODING_FPS.HD_STANDARD.some(value => fps % value === 0)
fps > VIDEO_TRANSCODING_FPS.AVERAGE
) {
// Get closest standard framerate by modulo: downsampling has to be done to a divisor of the nominal fps value
fps = getClosestFramerateStandard(fps)
fps = getClosestFramerateStandard(fps, 'STANDARD')
}
command = await presetH264(command, options.inputPath, options.resolution, fps)
@ -312,7 +311,7 @@ async function buildx264Command (command: ffmpeg.FfmpegCommand, options: Transco
if (fps) {
// Hard FPS limits
if (fps > VIDEO_TRANSCODING_FPS.MAX) fps = getClosestFramerateStandard(fps, true)
if (fps > VIDEO_TRANSCODING_FPS.MAX) fps = getClosestFramerateStandard(fps, 'HD_STANDARD')
else if (fps < VIDEO_TRANSCODING_FPS.MIN) fps = VIDEO_TRANSCODING_FPS.MIN
command = command.withFPS(fps)