X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fffmpeg-utils.ts;h=7c45f36326de30ba57b6d143d8e8258d9c2e8623;hb=a651038487faa838bda3ce04695b08bc65baff70;hp=ab187aa59319625ad19ecc14c649807688a48aeb;hpb=80bc88c1330c5cf6f5da0ec9252f905e30037f59;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts index ab187aa59..7c45f3632 100644 --- a/server/helpers/ffmpeg-utils.ts +++ b/server/helpers/ffmpeg-utils.ts @@ -1,11 +1,33 @@ import * as ffmpeg from 'fluent-ffmpeg' import { join } from 'path' import { VideoResolution } from '../../shared/models/videos' -import { CONFIG, VIDEO_TRANSCODING_FPS, FFMPEG_NICE } from '../initializers' -import { unlinkPromise } from './core-utils' +import { CONFIG, FFMPEG_NICE, VIDEO_TRANSCODING_FPS } from '../initializers' import { processImage } from './image-utils' import { logger } from './logger' import { checkFFmpegEncoders } from '../initializers/checker' +import { remove } from 'fs-extra' + +function computeResolutionsToTranscode (videoFileHeight: number) { + const resolutionsEnabled: number[] = [] + const configResolutions = CONFIG.TRANSCODING.RESOLUTIONS + + // Put in the order we want to proceed jobs + const resolutions = [ + VideoResolution.H_480P, + VideoResolution.H_360P, + VideoResolution.H_720P, + VideoResolution.H_240P, + VideoResolution.H_1080P + ] + + for (const resolution of resolutions) { + if (configResolutions[ resolution + 'p' ] === true && videoFileHeight > resolution) { + resolutionsEnabled.push(resolution) + } + } + + return resolutionsEnabled +} async function getVideoFileResolution (path: string) { const videoStream = await getVideoFileStream(path) @@ -56,7 +78,7 @@ async function generateImageFromVideoFile (fromPath: string, folder: string, ima try { await new Promise((res, rej) => { - ffmpeg(fromPath, { 'niceness': FFMPEG_NICE.THUMBNAIL }) + ffmpeg(fromPath, { niceness: FFMPEG_NICE.THUMBNAIL }) .on('error', rej) .on('end', () => res(imageName)) .thumbnail(options) @@ -68,7 +90,7 @@ async function generateImageFromVideoFile (fromPath: string, folder: string, ima logger.error('Cannot generate image from video %s.', fromPath, { err }) try { - await unlinkPromise(pendingImagePath) + await remove(pendingImagePath) } catch (err) { logger.debug('Cannot remove pending image path after generation error.', { err }) } @@ -84,11 +106,14 @@ type TranscodeOptions = { function transcode (options: TranscodeOptions) { return new Promise(async (res, rej) => { - let command = ffmpeg(options.inputPath, { 'niceness': FFMPEG_NICE.TRANSCODING }) + let command = ffmpeg(options.inputPath, { niceness: FFMPEG_NICE.TRANSCODING }) .output(options.outputPath) - .outputOption('-threads ' + CONFIG.TRANSCODING.THREADS) - .renice(5) // we don't want to make the system unrepsonsive - .preset(standard) + .preset(standard) + + if (CONFIG.TRANSCODING.THREADS > 0) { + // if we don't set any threads ffmpeg will chose automatically + command = command.outputOption('-threads ' + CONFIG.TRANSCODING.THREADS) + } let fps = await getVideoFileFPS(options.inputPath) if (options.resolution !== undefined) { @@ -130,7 +155,9 @@ export { getDurationFromVideoFile, generateImageFromVideoFile, transcode, - getVideoFileFPS + getVideoFileFPS, + computeResolutionsToTranscode, + audio } // --------------------------------------------------------------------------- @@ -190,28 +217,32 @@ namespace audio { // without position, ffprobe considers the last input only // we make it consider the first input only // if you pass a file path to pos, then ffprobe acts on that file directly - return new Promise((res, rej) => { - _ffmpeg - .ffprobe(pos, (err,data) => { - if (err) return rej(err) - - if ('streams' in data) { - return res(data['streams'].find(stream => stream['codec_type'] === 'audio')) - } else { - rej() + return new Promise<{ absolutePath: string, audioStream?: any }>((res, rej) => { + _ffmpeg.ffprobe(pos, (err,data) => { + if (err) return rej(err) + + if ('streams' in data) { + const audioStream = data['streams'].find(stream => stream['codec_type'] === 'audio') + if (audioStream) { + return res({ + absolutePath: data.format.filename, + audioStream + }) } - }) + } + return res({ absolutePath: data.format.filename }) + }) }) } export namespace bitrate { - export const baseKbitrate = 384 + const baseKbitrate = 384 const toBits = (kbits: number): number => { return kbits * 8000 } export const aac = (bitrate: number): number => { switch (true) { - case bitrate > toBits(384): + case bitrate > toBits(baseKbitrate): return baseKbitrate default: return -1 // we interpret it as a signal to copy the audio stream as is @@ -219,6 +250,11 @@ namespace audio { } export const mp3 = (bitrate: number): number => { + /* + a 192kbit/sec mp3 doesn't hold as much information as a 192kbit/sec aac. + That's why, when using aac, we can go to lower kbit/sec. The equivalences + made here are not made to be accurate, especially with good mp3 encoders. + */ switch (true) { case bitrate <= toBits(192): return 128 @@ -238,7 +274,6 @@ namespace audio { * See https://trac.ffmpeg.org/wiki/Encode/AAC#fdk_vbr */ async function standard (_ffmpeg) { - let _bitrate = audio.bitrate.baseKbitrate let localFfmpeg = _ffmpeg .format('mp4') .videoCodec('libx264') @@ -247,19 +282,10 @@ async function standard (_ffmpeg) { .outputOption('-bf 16') // NOTE: Why 16: https://github.com/Chocobozzz/PeerTube/pull/774. b-strategy 2 -> B-frames<16 .outputOption('-map_metadata -1') // strip all metadata .outputOption('-movflags faststart') - let _audio = audio.get(localFfmpeg) - .then(res => res) - .catch(_ => undefined) + const _audio = await audio.get(localFfmpeg) - if (!_audio) return localFfmpeg.noAudio() - - // we try to reduce the ceiling bitrate by making rough correspondances of bitrates - // of course this is far from perfect, but it might save some space in the end - if (audio.bitrate[_audio['codec_name']]) { - _bitrate = audio.bitrate[_audio['codec_name']](_audio['bit_rate']) - if (_bitrate === -1) { - return localFfmpeg.audioCodec('copy') - } + if (!_audio.audioStream) { + return localFfmpeg.noAudio() } // we favor VBR, if a good AAC encoder is available @@ -269,5 +295,17 @@ async function standard (_ffmpeg) { .audioQuality(5) } - return localFfmpeg.audioBitrate(_bitrate) + // we try to reduce the ceiling bitrate by making rough correspondances of bitrates + // of course this is far from perfect, but it might save some space in the end + const audioCodecName = _audio.audioStream['codec_name'] + let bitrate: number + if (audio.bitrate[audioCodecName]) { + bitrate = audio.bitrate[audioCodecName](_audio.audioStream['bit_rate']) + + if (bitrate === -1) return localFfmpeg.audioCodec('copy') + } + + if (bitrate !== undefined) return localFfmpeg.audioBitrate(bitrate) + + return localFfmpeg }