X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fchecker-before-init.ts;h=b04f3e538750d8fa9630e5484e17eb089fb20dbf;hb=f64615efa6929c7b8d4e8750a861caf009614a1f;hp=93b71a242e3de51d17bafb10ae06ec96087b5900;hpb=a056ca4813c82f490dcd31ac97a64d6bf76d3dcc;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 93b71a242..b04f3e538 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts @@ -100,25 +100,30 @@ async function checkFFmpeg (CONFIG: { TRANSCODING: { ENABLED: boolean } }) { return checkFFmpegEncoders() } -// Optional encoders, if present, can be used to improve transcoding -// Here we ask ffmpeg if it detects their presence on the system, so that we can later use them -let supportedOptionalEncoders: Map +// Detect supported encoders by ffmpeg +let supportedEncoders: Map async function checkFFmpegEncoders (): Promise> { - if (supportedOptionalEncoders !== undefined) { - return supportedOptionalEncoders + if (supportedEncoders !== undefined) { + return supportedEncoders } const Ffmpeg = require('fluent-ffmpeg') const getAvailableEncodersPromise = promisify0(Ffmpeg.getAvailableEncoders) - const encoders = await getAvailableEncodersPromise() - const optionalEncoders = [ 'libfdk_aac' ] - supportedOptionalEncoders = new Map() + const availableEncoders = await getAvailableEncodersPromise() - for (const encoder of optionalEncoders) { - supportedOptionalEncoders.set(encoder, encoders[encoder] !== undefined) + const searchEncoders = [ + 'aac', + 'libfdk_aac', + 'libx264' + ] + + supportedEncoders = new Map() + + for (const searchEncoder of searchEncoders) { + supportedEncoders.set(searchEncoder, availableEncoders[searchEncoder] !== undefined) } - return supportedOptionalEncoders + return supportedEncoders } function checkNodeVersion () {