Fix #410 arg type options (#411)

* fix template * fix * fix * add extra_options * add comment * add missing snapshot * update snapshot
livingbio · Jan 3, 2025 · 0c4152a · 0c4152a
1 parent 20b04ae
commit 0c4152a
Show file tree

Hide file tree

Showing 21 changed files with 2,177 additions and 416 deletions.
diff --git a/src/ffmpeg/dag/global_runnable/global_args.py b/src/ffmpeg/dag/global_runnable/global_args.py
@@ -63,6 +63,7 @@ def global_args(
         adrift_threshold: Func = None,
         qphist: Func = None,
         vsync: Func = None,
+        extra_options: dict[str, Any] = None,
         **kwargs: Any,
     ) -> GlobalStream:
         """
@@ -114,6 +115,7 @@ def global_args(
             adrift_threshold: deprecated, does nothing
             qphist: deprecated, does nothing
             vsync: set video sync method globally; deprecated, use -fps_mode
+            extra_options: Additional options
             **kwargs: Additional options
 
         Returns:
@@ -173,6 +175,7 @@ def global_args(
                     }.items()
                     if v is not None
                 }
+                | (extra_options or {})
                 | kwargs
             ),
         ).stream()
diff --git a/src/ffmpeg/dag/io/_input.py b/src/ffmpeg/dag/io/_input.py
@@ -64,6 +64,7 @@ def input(
     dcodec: String = None,
     dn: Boolean = None,
     top: Int = None,
+    extra_options: dict[str, Any] = None,
     **kwargs: Any
 ) -> AVStream:
     """
@@ -123,6 +124,7 @@ def input(
         dcodec: alias for -c:d (select encoder/decoder for data streams)
         dn: disable data
         top: deprecated, use the setfield video filter
+        extra_options: ffmpeg's input file options
         **kwargs: ffmpeg's input file options
 
     Returns:
@@ -194,4 +196,4 @@ def input(
         if v is not None
     }
 
-    return InputNode(filename=str(filename), kwargs=tuple((options | kwargs).items())).stream()
+    return InputNode(filename=str(filename), kwargs=tuple((options | (extra_options or {}) | kwargs).items())).stream()
diff --git a/src/ffmpeg/dag/io/_output.py b/src/ffmpeg/dag/io/_output.py
@@ -105,6 +105,7 @@ def output(
     dcodec: String = None,
     dn: Boolean = None,
     top: Int = None,
+    extra_options: dict[str, Any] = None,
     **kwargs: Any
 ) -> OutputStream:
     """
@@ -208,6 +209,7 @@ def output(
         dcodec: alias for -c:d (select encoder/decoder for data streams)
         dn: disable data
         top: deprecated, use the setfield video filter
+        extra_options: the arguments for the output
         **kwargs: the arguments for the output
 
     Returns:
@@ -315,4 +317,6 @@ def output(
         if v is not None
     }
 
-    return OutputNode(inputs=streams, filename=str(filename), kwargs=tuple((options | kwargs).items())).stream()
+    return OutputNode(
+        inputs=streams, filename=str(filename), kwargs=tuple((options | (extra_options or {}) | kwargs).items())
+    ).stream()
diff --git a/src/ffmpeg/dag/io/output_args.py b/src/ffmpeg/dag/io/output_args.py
@@ -114,6 +114,7 @@ def output(
         dcodec: String = None,
         dn: Boolean = None,
         top: Int = None,
+        extra_options: dict[str, Any] = None,
         **kwargs: Any,
     ) -> OutputStream:
         """
@@ -217,6 +218,7 @@ def output(
             dcodec: alias for -c:d (select encoder/decoder for data streams)
             dn: disable data
             top: deprecated, use the setfield video filter
+            extra_options: the arguments for the output
             **kwargs: the arguments for the output
 
         Returns:
@@ -324,4 +326,4 @@ def output(
             if v is not None
         }
 
-        return self._output_node(*streams, filename=filename, **options, **kwargs).stream()
+        return self._output_node(*streams, filename=filename, **options, **(extra_options or {}), **kwargs).stream()