Deprecate --keep-tracks-separate

Author: WyattBlue

auto_editor/__main__.py

@@ -76,6 +76,7 @@ class Args:
     # Audio Rendering
     audio_codec: str = "auto"
     audio_bitrate: str = "auto"
+    mix_audio_streams: bool = False
     keep_tracks_separate: bool = False
     audio_normalize: str = "#f"
 
@@ -341,10 +342,13 @@ def speed_range(val: str) -> tuple[float, str, str]:
         metavar="BITRATE",
         help="Set the number of bits per second for audio",
     )
+    parser.add_argument(
+        "--mix-audio-streams", flag=True, help="Mix all audio streams together into one"
+    )
     parser.add_argument(
         "--keep-tracks-separate",
         flag=True,
-        help="Don't mix all audio tracks into one when exporting",
+        help="Don't mix all audio streams into one when exporting (default)",
     )
     parser.add_argument(
         "--audio-normalize",

auto_editor/cmds/test.py

@@ -277,7 +277,7 @@ def test_silent_threshold(self):
             assert container.duration / av.time_base == 6.552
 
     def test_track(self):
-        out = self.main(["resources/multi-track.mov"], ["--keep_tracks_seperate"], "te")
+        out = self.main(["resources/multi-track.mov"], []) + ".mov"
         assert len(fileinfo(out).audios) == 2
 
     def test_export_json(self):
@@ -361,30 +361,24 @@ def test_multi_track_edit(self):
             ["--edit", "audio:stream=1"],
             "multi-track_ALTERED.mov",
         )
-        assert len(fileinfo(out).audios) == 1
+        assert len(fileinfo(out).audios) == 2
 
     def test_concat(self):
         out = self.main(["example.mp4"], ["--cut-out", "0,171"], "hmm.mp4")
         self.main(["example.mp4", out], ["--debug"])
 
     def test_concat_mux_tracks(self):
-        out = self.main(
-            ["example.mp4", "resources/multi-track.mov"], [], "concat_mux.mov"
-        )
+        inputs = ["example.mp4", "resources/multi-track.mov"]
+        out = self.main(inputs, ["--mix-audio-streams"], "concat_mux.mov")
         assert len(fileinfo(out).audios) == 1
 
     def test_concat_multi_tracks(self):
         out = self.main(
-            ["resources/multi-track.mov", "resources/multi-track.mov"],
-            ["--keep-tracks-separate"],
-            "out.mov",
+            ["resources/multi-track.mov", "resources/multi-track.mov"], [], "out.mov"
         )
         assert len(fileinfo(out).audios) == 2
-        out = self.main(
-            ["example.mp4", "resources/multi-track.mov"],
-            ["--keep-tracks-separate"],
-            "out.mov",
-        )
+        inputs = ["example.mp4", "resources/multi-track.mov"]
+        out = self.main(inputs, [], "out.mov")
         assert len(fileinfo(out).audios) == 2
 
     def test_frame_rate(self):

auto_editor/edit.py

@@ -162,6 +162,10 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
     bar = initBar(args.progress)
     tl = None
 
+    if args.keep_tracks_separate:
+        log.deprecated("--keep-tracks-separate is deprecated.")
+        args.keep_tracks_separate = False
+
     if paths:
         path_ext = splitext(paths[0])[1].lower()
         if path_ext == ".xml":
@@ -273,9 +277,6 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
     args.video_codec = set_video_codec(args.video_codec, src, out_ext, ctr, log)
     args.audio_codec = set_audio_codec(args.audio_codec, src, out_ext, ctr, log)
 
-    if args.keep_tracks_separate and ctr.max_audios == 1:
-        log.warning(f"'{out_ext}' container doesn't support multiple audio tracks.")
-
     def make_media(tl: v3, output_path: str) -> None:
         assert src is not None
 
@@ -293,17 +294,6 @@ def make_media(tl: v3, output_path: str) -> None:
 
         output = av.open(output_path, "w", container_options=options)
 
-        if ctr.default_sub != "none" and not args.sn:
-            sub_paths = make_new_subtitles(tl, log)
-        else:
-            sub_paths = []
-
-        if ctr.default_aud != "none":
-            ensure = Ensure(bar, samplerate, log)
-            audio_paths = make_new_audio(tl, ctr, ensure, args, bar, log)
-        else:
-            audio_paths = []
-
         # Setup video
         if ctr.default_vid != "none" and tl.v:
             vframes = render_av(output, tl, args, log)
@@ -313,6 +303,16 @@ def make_media(tl: v3, output_path: str) -> None:
             output_stream, vframes = None, iter([])
 
         # Setup audio
+        if ctr.default_aud != "none":
+            ensure = Ensure(bar, samplerate, log)
+            audio_paths = make_new_audio(tl, ctr, ensure, args, bar, log)
+        else:
+            audio_paths = []
+
+        if len(audio_paths) > 1 and ctr.max_audios == 1:
+            log.warning("Dropping extra audio streams (container only allows one)")
+            audio_paths = audio_paths[0:1]
+
         if audio_paths:
             try:
                 audio_encoder = av.Codec(args.audio_codec, "w")
@@ -350,6 +350,11 @@ def make_media(tl: v3, output_path: str) -> None:
             audio_gen_frames.append(audio_input.decode(audio=0))
 
         # Setup subtitles
+        if ctr.default_sub != "none" and not args.sn:
+            sub_paths = make_new_subtitles(tl, log)
+        else:
+            sub_paths = []
+
         subtitle_streams = []
         subtitle_inputs = []
         sub_gen_frames = []

auto_editor/render/audio.py

@@ -372,7 +372,7 @@ def make_new_audio(
     except PermissionError:
         pass
 
-    if not (args.keep_tracks_separate and ctr.max_audios is None) and len(output) > 1:
+    if args.mix_audio_streams and len(output) > 1:
         new_a_file = f"{Path(temp, 'new_audio.wav')}"
         mix_audio_files(sr, output, new_a_file)
         return [new_a_file]