add --force-5718

This commit is contained in:
Martin Sekera 2019-07-15 00:51:32 +02:00
parent aa907484ec
commit 9b2477a39b
2 changed files with 5 additions and 4 deletions

View file

@ -55,6 +55,7 @@ if __name__ == "__main__":
main.add_option("cut", "Start timestamp and the duration of the portion to use. Uses native ffmpeg <c>-ss<.> and <c>-to<.> format, so it's either seconds from start or <M>[<HH>:]<MM>:<SS>[.<<m>...]<.>. Example: <W>--<g>cut<.> <M>25 10<.> uses 10 seconds of video starting at 25s, <W>--<g>cut<.> <M>1:10:45 13:9.5<.> uses video from 4245s to 5034.5s.", over.callback.strings, abbr="X", count=2) main.add_option("cut", "Start timestamp and the duration of the portion to use. Uses native ffmpeg <c>-ss<.> and <c>-to<.> format, so it's either seconds from start or <M>[<HH>:]<MM>:<SS>[.<<m>...]<.>. Example: <W>--<g>cut<.> <M>25 10<.> uses 10 seconds of video starting at 25s, <W>--<g>cut<.> <M>1:10:45 13:9.5<.> uses video from 4245s to 5034.5s.", over.callback.strings, abbr="X", count=2)
main.add_option("fps", "Override input framerate.", float, abbr="f", count=1) main.add_option("fps", "Override input framerate.", float, abbr="f", count=1)
main.add_option("output", "Force an output filename. Note that this overrides <W>--<g>container<.> as we're relying on ffmpeg's container detection by reading the suffix. Pass an empty string to use the container's default suffix.", str, [""], count=1) main.add_option("output", "Force an output filename. Note that this overrides <W>--<g>container<.> as we're relying on ffmpeg's container detection by reading the suffix. Pass an empty string to use the container's default suffix.", str, [""], count=1)
main.add_option("force-5718", "Force bug #5718 workaround for <W>--<g>audio<.> <M>opus<.>", bool)
main.add_option("move-source", "Move source file to this directory after conversion. Pass an empty string to disable.", str, ["processed"], count=1) main.add_option("move-source", "Move source file to this directory after conversion. Pass an empty string to disable.", str, ["processed"], count=1)
main.add_option("dump-commands", "Print ffmpeg commands that would be executed. If <W>--<g>normalize<.> is in effect, the normalization pre-pass will still be performed so that the proper volume correction can be computed.", bool, [False], abbr="D", in_cfg_file=False) main.add_option("dump-commands", "Print ffmpeg commands that would be executed. If <W>--<g>normalize<.> is in effect, the normalization pre-pass will still be performed so that the proper volume correction can be computed.", bool, [False], abbr="D", in_cfg_file=False)
main.add_option("probe", "Print the raw dict (JSON-esque) output of ffprobe and exit.", bool, [False], abbr="p", in_cfg_file=False) main.add_option("probe", "Print the raw dict (JSON-esque) output of ffprobe and exit.", bool, [False], abbr="p", in_cfg_file=False)
@ -338,7 +339,7 @@ if __name__ == "__main__":
command.sub_opus.NORMALIZE = info.normalize_command command.sub_opus.NORMALIZE = info.normalize_command
# workaround of https://trac.ffmpeg.org/ticket/5718 # workaround of https://trac.ffmpeg.org/ticket/5718
if info.audio_channel_layout == "5.1(side)": if info.audio_channel_layout == "5.1(side)" or main.cfg.force_5718:
main.print("applying <y>#5718 workaround<.>", main.print.tl.warn) main.print("applying <y>#5718 workaround<.>", main.print.tl.warn)
command.sub_opus.sequence.append("-filter:a") command.sub_opus.sequence.append("-filter:a")
command.sub_opus.sequence.append("channelmap=channel_layout=5.1") command.sub_opus.sequence.append("channelmap=channel_layout=5.1")

View file

@ -2,7 +2,7 @@
# encoding: utf-8 # encoding: utf-8
major = 1 # VERSION_MAJOR_IDENTIFIER major = 1 # VERSION_MAJOR_IDENTIFIER
minor = 113 # VERSION_MINOR_IDENTIFIER minor = 114 # VERSION_MINOR_IDENTIFIER
# VERSION_LAST_MM 1.113 # VERSION_LAST_MM 1.114
patch = 1 # VERSION_PATCH_IDENTIFIER patch = 0 # VERSION_PATCH_IDENTIFIER
str = ".".join(str(v) for v in (major, minor, patch)) str = ".".join(str(v) for v in (major, minor, patch))