X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fchecker-before-init.ts;h=b04f3e538750d8fa9630e5484e17eb089fb20dbf;hb=f64615efa6929c7b8d4e8750a861caf009614a1f;hp=d4140e3fa9863f6ff2ff8e409e82e613cf8a6939;hpb=fb7194043d0486ce0a6a40b2ffbdf32878c33a6f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index d4140e3fa..b04f3e538 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts @@ -38,7 +38,7 @@ function checkMissedConfig () { 'federation.videos.federate_unlisted', 'search.remote_uri.users', 'search.remote_uri.anonymous', 'search.search_index.enabled', 'search.search_index.url', 'search.search_index.disable_local_search', 'search.search_index.is_default_search', - 'live.enabled', 'live.allow_replay', 'live.max_duration', + 'live.enabled', 'live.allow_replay', 'live.max_duration', 'live.max_user_lives', 'live.max_instance_lives', 'live.transcoding.enabled', 'live.transcoding.threads', 'live.transcoding.resolutions.240p', 'live.transcoding.resolutions.360p', 'live.transcoding.resolutions.480p', 'live.transcoding.resolutions.720p', 'live.transcoding.resolutions.1080p', 'live.transcoding.resolutions.2160p' @@ -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 () {