From: Jorropo Date: Fri, 27 Jul 2018 18:41:05 +0000 (+0200) Subject: ffmpeg auto thread X-Git-Tag: delete~68 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=991feec9a3f371e28274884f7635dc2e57dca284;p=oweals%2Fpeertube.git ffmpeg auto thread Set thread count to 0 and ffmpeg will chose automaticaly --- diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index c77249a02..2edfb267e 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts @@ -29,6 +29,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { { value: 50 * 1024 * 1024 * 1024, label: '50GB' } ] transcodingThreadOptions = [ + { value: 0, label: 'auto (not optimized)' }, { value: 1, label: '1' }, { value: 2, label: '2' }, { value: 4, label: '4' }, diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts index f0e2c0af5..c170fc1a8 100644 --- a/server/helpers/ffmpeg-utils.ts +++ b/server/helpers/ffmpeg-utils.ts @@ -86,8 +86,10 @@ function transcode (options: TranscodeOptions) { return new Promise(async (res, rej) => { let command = ffmpeg(options.inputPath, { 'niceness': FFMPEG_NICE.TRANSCODING }) .output(options.outputPath) - .outputOption('-threads ' + CONFIG.TRANSCODING.THREADS) .preset(standard) + if (CONFIG.TRANSCODING.THREADS > 0) { + command.outputOption('-threads ' + CONFIG.TRANSCODING.THREADS) // if we don't set any threads ffmpeg will chose automatically + } let fps = await getVideoFileFPS(options.inputPath) if (options.resolution !== undefined) {