X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fchecker-before-init.ts;h=cac24f0b664f22bde5e1ed8552d84e72151771d4;hb=9162476fe9fe022ff24bd42ff828aca7c68129ef;hp=7945e85863fec6230da58ce09d03235dc96d33f3;hpb=b7085c713220c9c5a96c9bb77330c2ba6ae9274e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts
index 7945e8586..cac24f0b6 100644
--- a/server/initializers/checker-before-init.ts
+++ b/server/initializers/checker-before-init.ts
@@ -22,6 +22,7 @@ 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.profile',
     'transcoding.resolutions.0p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', 'transcoding.resolutions.480p',
     'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.1440p', 'transcoding.resolutions.2160p',
     'import.videos.http.enabled', 'import.videos.torrent.enabled', 'auto_blacklist.videos.of_users.enabled',
@@ -39,7 +40,7 @@ function checkMissedConfig () {
     '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.enabled', 'live.transcoding.threads', 'live.transcoding.profile',
     'live.transcoding.resolutions.240p', 'live.transcoding.resolutions.360p', 'live.transcoding.resolutions.480p',
     'live.transcoding.resolutions.720p', 'live.transcoding.resolutions.1080p', 'live.transcoding.resolutions.1440p',
     'live.transcoding.resolutions.2160p'
@@ -97,34 +98,6 @@ async function checkFFmpeg (CONFIG: { TRANSCODING: { ENABLED: boolean } }) {
       throw new Error('Unavailable encode codec ' + codec + ' in FFmpeg')
     }
   }
-
-  return checkFFmpegEncoders()
-}
-
-// Detect supported encoders by ffmpeg
-let supportedEncoders: Map<string, boolean>
-async function checkFFmpegEncoders (): Promise<Map<string, boolean>> {
-  if (supportedEncoders !== undefined) {
-    return supportedEncoders
-  }
-
-  const Ffmpeg = require('fluent-ffmpeg')
-  const getAvailableEncodersPromise = promisify0(Ffmpeg.getAvailableEncoders)
-  const availableEncoders = await getAvailableEncodersPromise()
-
-  const searchEncoders = [
-    'aac',
-    'libfdk_aac',
-    'libx264'
-  ]
-
-  supportedEncoders = new Map<string, boolean>()
-
-  for (const searchEncoder of searchEncoders) {
-    supportedEncoders.set(searchEncoder, availableEncoders[searchEncoder] !== undefined)
-  }
-
-  return supportedEncoders
 }
 
 function checkNodeVersion () {
@@ -134,8 +107,8 @@ function checkNodeVersion () {
 
   logger.debug('Checking NodeJS version %s.', v)
 
-  if (major < 10) {
-    logger.warn('Your NodeJS version %s is deprecated. Please use Node 10.', v)
+  if (major <= 10) {
+    logger.warn('Your NodeJS version %s is deprecated. Please upgrade.', v)
   }
 }
 
@@ -143,7 +116,6 @@ function checkNodeVersion () {
 
 export {
   checkFFmpeg,
-  checkFFmpegEncoders,
   checkMissedConfig,
   checkNodeVersion
 }