X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fchecker-before-init.ts;h=b04f3e538750d8fa9630e5484e17eb089fb20dbf;hb=ca5c612bfdd225433bcc6ace01c8024df3f674ba;hp=a75f2cec2a82e43666d818f53cba3557db5d3b3c;hpb=c2777c1dfe688c8fab1ef2fed50e360100fa9198;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index a75f2cec2..b04f3e538 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts @@ -22,6 +22,8 @@ function checkMissedConfig () { 'signup.filters.cidr.whitelist', 'signup.filters.cidr.blacklist', 'redundancy.videos.strategies', 'redundancy.videos.check_interval', 'transcoding.enabled', 'transcoding.threads', 'transcoding.allow_additional_extensions', 'transcoding.hls.enabled', + 'transcoding.resolutions.0p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', 'transcoding.resolutions.480p', + 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.2160p', 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'auto_blacklist.videos.of_users.enabled', 'trending.videos.interval_days', 'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route', @@ -31,8 +33,17 @@ function checkMissedConfig () { 'tracker.enabled', 'tracker.private', 'tracker.reject_too_many_announces', 'history.videos.max_age', 'views.videos.remote.max_age', 'rates_limit.login.window', 'rates_limit.login.max', 'rates_limit.ask_send_email.window', 'rates_limit.ask_send_email.max', - 'theme.default' + 'theme.default', + 'remote_redundancy.videos.accept_from', + '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.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' ] + const requiredAlternatives = [ [ // set [ 'redis.hostname', 'redis.port' ], // alternative @@ -89,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() + + const searchEncoders = [ + 'aac', + 'libfdk_aac', + 'libx264' + ] + + supportedEncoders = new Map() - for (const encoder of optionalEncoders) { - supportedOptionalEncoders.set(encoder, encoders[encoder] !== undefined) + for (const searchEncoder of searchEncoders) { + supportedEncoders.set(searchEncoder, availableEncoders[searchEncoder] !== undefined) } - return supportedOptionalEncoders + return supportedEncoders } function checkNodeVersion () {