Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Change ffmpeg option to ffmpeg_loglevel

azarzadavila4a49e4adff07
diff --git a/manim/scene/scene_file_writer.py b/manim/scene/scene_file_writer.py
index 6fba3cd9b..d2ad20d2b 100644
--- a/manim/scene/scene_file_writer.py
+++ b/manim/scene/scene_file_writer.py
@@ -391,7 +391,7 @@ class SceneFileWriter(object):
'-r', str(fps), # frames per second
'-i', '-', # The imput comes from a pipe
'-an', # Tells FFMPEG not to expect any audio
- '-loglevel', file_writer_config["ffmpeg"],
+ '-loglevel', file_writer_config["ffmpeg_loglevel"],
]
# TODO, the test for a transparent background should not be based on
# the file extension.
@@ -472,7 +472,7 @@ class SceneFileWriter(object):
'-f', 'concat',
'-safe', '0',
'-i', file_list,
- '-loglevel', file_writer_config["ffmpeg"],
+ '-loglevel', file_writer_config["ffmpeg_loglevel"],
]
if self.write_to_movie:
@@ -514,7 +514,7 @@ class SceneFileWriter(object):
"-map", "0:v:0",
# select audio stream from second file
"-map", "1:a:0",
- '-loglevel', file_writer_config["ffmpeg"],
+ '-loglevel', file_writer_config["ffmpeg_loglevel"],
# "-shortest",
temp_file_path,
]
diff --git a/manim/utils/config_utils.py b/manim/utils/config_utils.py
index 8d14786e5..f67a9a163 100644
--- a/manim/utils/config_utils.py
+++ b/manim/utils/config_utils.py
@@ -129,9 +129,9 @@ def _parse_file_writer_config(config_parser, args):
verbose = "CRITICAL" if verbose is None and quiet else verbose
verbose = default["verbose"] if verbose is None else verbose
fw_config["verbose"] = verbose
- ffmpeg = getattr(args, "ffmpeg")
- ffmpeg = default.get("ffmpeg", None) if ffmpeg is None else ffmpeg
- fw_config["ffmpeg"] = constants.VERBOSE_FFMPEG_MAP[verbose] if ffmpeg is None else ffmpeg
+ ffmpeg_loglevel = getattr(args, "ffmpeg_loglevel")
+ ffmpeg_loglevel = default.get("ffmpeg_loglevel", None) if ffmpeg_loglevel is None else ffmpeg_loglevel
+ fw_config["ffmpeg_loglevel"] = constants.VERBOSE_FFMPEG_MAP[verbose] if ffmpeg_loglevel is None else ffmpeg_loglevel
if verbose in ["DEBUG", "INFO"]:
progress_bar_v = True
else:
@@ -344,7 +344,7 @@ def _parse_cli(arg_list, input=True):
choices=constants.VERBOSE_CHOICES,
)
parser.add_argument(
- "-L", "--ffmpeg",
+ "-L", "--ffmpeg_loglevel",
type=str,
help="Log level for ffmpeg",
metavar="loglevel",