From 1896bca09e088b0da9d5e845407ecebae330618c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 28 Jan 2021 15:52:44 +0100 Subject: Support transcoding options/encoders by plugins --- server/initializers/checker-before-init.ts | 29 ----------------------------- server/initializers/config.ts | 2 ++ 2 files changed, 2 insertions(+), 29 deletions(-) (limited to 'server/initializers') diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 7945e8586..9c4e0048a 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts @@ -97,34 +97,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 -async function checkFFmpegEncoders (): Promise> { - 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() - - for (const searchEncoder of searchEncoders) { - supportedEncoders.set(searchEncoder, availableEncoders[searchEncoder] !== undefined) - } - - return supportedEncoders } function checkNodeVersion () { @@ -143,7 +115,6 @@ function checkNodeVersion () { export { checkFFmpeg, - checkFFmpegEncoders, checkMissedConfig, checkNodeVersion } diff --git a/server/initializers/config.ts b/server/initializers/config.ts index fc4a8b709..7322b89e2 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts @@ -188,6 +188,7 @@ const CONFIG = { get ALLOW_ADDITIONAL_EXTENSIONS () { return config.get('transcoding.allow_additional_extensions') }, get ALLOW_AUDIO_FILES () { return config.get('transcoding.allow_audio_files') }, get THREADS () { return config.get('transcoding.threads') }, + get PROFILE () { return config.get('transcoding.profile') }, RESOLUTIONS: { get '0p' () { return config.get('transcoding.resolutions.0p') }, get '240p' () { return config.get('transcoding.resolutions.240p') }, @@ -221,6 +222,7 @@ const CONFIG = { TRANSCODING: { get ENABLED () { return config.get('live.transcoding.enabled') }, get THREADS () { return config.get('live.transcoding.threads') }, + get PROFILE () { return config.get('live.transcoding.profile') }, RESOLUTIONS: { get '240p' () { return config.get('live.transcoding.resolutions.240p') }, -- cgit v1.2.3