From bd7121567ce671342b8e4f8ca482646a7b55785d Mon Sep 17 00:00:00 2001 From: Jonathan Baecker Date: Fri, 8 May 2020 12:47:06 +0200 Subject: [PATCH] remove s302m audio codec --- ffplayout/utils.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/ffplayout/utils.py b/ffplayout/utils.py index 14d64c88..484db7bc 100644 --- a/ffplayout/utils.py +++ b/ffplayout/utils.py @@ -983,14 +983,7 @@ def timed_source(probe, src, begin, dur, seek, out, first, last): def pre_audio_codec(): """ - when add_loudnorm is False we use a different audio encoder, - s302m has higher quality, but is experimental - and works not well together with the loudnorm filter + use libtwolame if is compiled in ffmpeg, when not use normal mp2 """ - if _pre_comp.add_loudnorm: - acodec = 'libtwolame' if 'libtwolame' in FF_LIBS['libs'] else 'mp2' - audio = ['-c:a', acodec, '-b:a', '384k', '-ar', '48000', '-ac', '2'] - else: - audio = ['-c:a', 's302m', '-strict', '-2', '-ar', '48000', '-ac', '2'] - - return audio + acodec = 'libtwolame' if 'libtwolame' in FF_LIBS['libs'] else 'mp2' + return ['-c:a', acodec, '-b:a', '384k', '-ar', '48000', '-ac', '2']