changed: add overall option first before per-stream options

tikuma-lsuhsc · tikuma-lsuhsc · commit c6e403227f78 · 2023-12-08T23:39:40.000-06:00
diff --git a/src/ffmpegio/utils/parser.py b/src/ffmpegio/utils/parser.py
@@ -159,11 +159,19 @@ def finalize_input(key, val):
         return key, val
 
     def opts2args(opts, finalize):
-        args = []
+        # FFmpeg applies the last of the repeated options regardless of overall/per-stream
+        # need to parse per-stream options and group repeated options together and
+        # apply the overall option first
+
+        opts_parsed = {}
         for itm in opts.items():
-            key, val = finalize(*itm)
+            k, v = finalize(*itm)
+            oname, *sspec = k.split(":", 1)
+            if oname not in opts_parsed:
+                opts_parsed[oname] = o = {}
+            o[sspec[0] if len(sspec) else None] = v
 
-            karg = f"-{key}"
+        def set_arg(karg, val):
             if not isinstance(val, (str, Graph, Chain, Filter)) and isinstance(
                 val, abc.Sequence
             ):
@@ -173,12 +181,21 @@ def opts2args(opts, finalize):
                 args.append(karg)
                 if val is not FLAG:
                     args.append(str(val))
+
+        args = []
+        for key, vals in opts_parsed.items():
+            kbase = f"-{key}"
+            if None in vals:
+                val = val = vals.pop(None)
+                set_arg(kbase, val)
+            for st, val in vals.items():
+                set_arg(f"{kbase}:{st}", val)
+
         return args
 
     def inputs2args(inputs):
         args = []
         for url, opts in inputs:
-
             # resolve url enumeration if it's a device
             url, opts = devices.resolve_source(url, opts)
 
@@ -195,7 +212,6 @@ def inputs2args(inputs):
     def outputs2args(outputs):
         args = []
         for url, opts in outputs:
-
             # resolve url enumeration if it's a device
             url, opts = devices.resolve_sink(url, opts)
 
