typed-ffmpeg-compatible 3.3.1__py3-none-any.whl → 3.4.1__py3-none-any.whl

typed_ffmpeg/dag/io/output_args.py

@@ -1,11 +1,24 @@
 # NOTE: this file is auto-generated, do not modify
+
+
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
-from ...types import Boolean, Float, Func, Int, Int64, String, Time
+from ...codecs.schema import FFMpegEncoderOption
+from ...formats.schema import FFMpegMuxerOption
+from ...types import (
+    Boolean,
+    Float,
+    Func,
+    Int,
+    Int64,
+    String,
+    Time,
+)
+from ...utils.frozendict import merge
 
 if TYPE_CHECKING:
     from ..nodes import FilterableStream, OutputNode, OutputStream
@@ -115,7 +128,9 @@ class OutputArgs(ABC):
         dcodec: String = None,
         dn: Boolean = None,
         top: Int = None,
-        extra_options: dict[str, Any] = None,
+        encoder_options: FFMpegEncoderOption | None = None,
+        muxer_options: FFMpegMuxerOption | None = None,
+        extra_options: dict[str, Any] | None = None,
     ) -> OutputStream:
         """
         Output file URL
@@ -218,113 +233,116 @@ class OutputArgs(ABC):
             dcodec: alias for -c:d (select encoder/decoder for data streams)
             dn: disable data
             top: deprecated, use the setfield video filter
+            encoder_options: ffmpeg's encoder options
+            muxer_options: FFMpegMuxerOption | None = None,
             extra_options: the arguments for the output
 
         Returns:
             the output stream
         """
 
-        options = {
-            k: v
-            for k, v in {
-                "f": f,
-                "c": c,
-                "codec": codec,
-                "pre": pre,
-                "map": map,
-                "map_metadata": map_metadata,
-                "map_chapters": map_chapters,
-                "t": t,
-                "to": to,
-                "fs": fs,
-                "ss": ss,
-                "timestamp": timestamp,
-                "metadata": metadata,
-                "program": program,
-                "stream_group": stream_group,
-                "dframes": dframes,
-                "target": target,
-                "shortest": shortest,
-                "shortest_buf_duration": shortest_buf_duration,
-                "bitexact": bitexact,
-                "apad": apad,
-                "copyinkf": copyinkf,
-                "copypriorss": copypriorss,
-                "frames": frames,
-                "tag": tag,
-                "q": q,
-                "qscale": qscale,
-                "profile": profile,
-                "filter": filter,
-                "filter_script": filter_script,
-                "attach": attach,
-                "disposition": disposition,
-                "thread_queue_size": thread_queue_size,
-                "bits_per_raw_sample": bits_per_raw_sample,
-                "stats_enc_pre": stats_enc_pre,
-                "stats_enc_post": stats_enc_post,
-                "stats_mux_pre": stats_mux_pre,
-                "stats_enc_pre_fmt": stats_enc_pre_fmt,
-                "stats_enc_post_fmt": stats_enc_post_fmt,
-                "stats_mux_pre_fmt": stats_mux_pre_fmt,
-                "vframes": vframes,
-                "r": r,
-                "fpsmax": fpsmax,
-                "s": s,
-                "aspect": aspect,
-                "pix_fmt": pix_fmt,
-                "vn": vn,
-                "rc_override": rc_override,
-                "vcodec": vcodec,
-                "timecode": timecode,
-                "pass": _pass,
-                "passlogfile": passlogfile,
-                "vf": vf,
-                "intra_matrix": intra_matrix,
-                "inter_matrix": inter_matrix,
-                "chroma_intra_matrix": chroma_intra_matrix,
-                "vtag": vtag,
-                "fps_mode": fps_mode,
-                "force_fps": force_fps,
-                "streamid": streamid,
-                "force_key_frames": force_key_frames,
-                "b": b,
-                "autoscale": autoscale,
-                "fix_sub_duration_heartbeat": fix_sub_duration_heartbeat,
-                "aframes": aframes,
-                "aq": aq,
-                "ar": ar,
-                "ac": ac,
-                "an": an,
-                "acodec": acodec,
-                "ab": ab,
-                "atag": atag,
-                "sample_fmt": sample_fmt,
-                "channel_layout": channel_layout,
-                "ch_layout": ch_layout,
-                "af": af,
-                "sn": sn,
-                "scodec": scodec,
-                "stag": stag,
-                "muxdelay": muxdelay,
-                "muxpreload": muxpreload,
-                "sdp_file": sdp_file,
-                "time_base": time_base,
-                "enc_time_base": enc_time_base,
-                "bsf": bsf,
-                "apre": apre,
-                "vpre": vpre,
-                "spre": spre,
-                "fpre": fpre,
-                "max_muxing_queue_size": max_muxing_queue_size,
-                "muxing_queue_data_threshold": muxing_queue_data_threshold,
-                "dcodec": dcodec,
-                "dn": dn,
-                "top": top,
-            }.items()
-            if v is not None
-        }
-
         return self._output_node(
-            *streams, filename=filename, **options, **(extra_options or {})
+            *streams,
+            filename=filename,
+            **merge(
+                {
+                    "f": f,
+                    "c": c,
+                    "codec": codec,
+                    "pre": pre,
+                    "map": map,
+                    "map_metadata": map_metadata,
+                    "map_chapters": map_chapters,
+                    "t": t,
+                    "to": to,
+                    "fs": fs,
+                    "ss": ss,
+                    "timestamp": timestamp,
+                    "metadata": metadata,
+                    "program": program,
+                    "stream_group": stream_group,
+                    "dframes": dframes,
+                    "target": target,
+                    "shortest": shortest,
+                    "shortest_buf_duration": shortest_buf_duration,
+                    "bitexact": bitexact,
+                    "apad": apad,
+                    "copyinkf": copyinkf,
+                    "copypriorss": copypriorss,
+                    "frames": frames,
+                    "tag": tag,
+                    "q": q,
+                    "qscale": qscale,
+                    "profile": profile,
+                    "filter": filter,
+                    "filter_script": filter_script,
+                    "attach": attach,
+                    "disposition": disposition,
+                    "thread_queue_size": thread_queue_size,
+                    "bits_per_raw_sample": bits_per_raw_sample,
+                    "stats_enc_pre": stats_enc_pre,
+                    "stats_enc_post": stats_enc_post,
+                    "stats_mux_pre": stats_mux_pre,
+                    "stats_enc_pre_fmt": stats_enc_pre_fmt,
+                    "stats_enc_post_fmt": stats_enc_post_fmt,
+                    "stats_mux_pre_fmt": stats_mux_pre_fmt,
+                    "vframes": vframes,
+                    "r": r,
+                    "fpsmax": fpsmax,
+                    "s": s,
+                    "aspect": aspect,
+                    "pix_fmt": pix_fmt,
+                    "vn": vn,
+                    "rc_override": rc_override,
+                    "vcodec": vcodec,
+                    "timecode": timecode,
+                    "pass": _pass,
+                    "passlogfile": passlogfile,
+                    "vf": vf,
+                    "intra_matrix": intra_matrix,
+                    "inter_matrix": inter_matrix,
+                    "chroma_intra_matrix": chroma_intra_matrix,
+                    "vtag": vtag,
+                    "fps_mode": fps_mode,
+                    "force_fps": force_fps,
+                    "streamid": streamid,
+                    "force_key_frames": force_key_frames,
+                    "b": b,
+                    "autoscale": autoscale,
+                    "fix_sub_duration_heartbeat": fix_sub_duration_heartbeat,
+                    "aframes": aframes,
+                    "aq": aq,
+                    "ar": ar,
+                    "ac": ac,
+                    "an": an,
+                    "acodec": acodec,
+                    "ab": ab,
+                    "atag": atag,
+                    "sample_fmt": sample_fmt,
+                    "channel_layout": channel_layout,
+                    "ch_layout": ch_layout,
+                    "af": af,
+                    "sn": sn,
+                    "scodec": scodec,
+                    "stag": stag,
+                    "muxdelay": muxdelay,
+                    "muxpreload": muxpreload,
+                    "sdp_file": sdp_file,
+                    "time_base": time_base,
+                    "enc_time_base": enc_time_base,
+                    "bsf": bsf,
+                    "apre": apre,
+                    "vpre": vpre,
+                    "spre": spre,
+                    "fpre": fpre,
+                    "max_muxing_queue_size": max_muxing_queue_size,
+                    "muxing_queue_data_threshold": muxing_queue_data_threshold,
+                    "dcodec": dcodec,
+                    "dn": dn,
+                    "top": top,
+                },
+                encoder_options.kwargs if encoder_options else {},
+                muxer_options.kwargs if muxer_options else {},
+                extra_options,
+            ),
         ).stream()

typed_ffmpeg/dag/nodes.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any
 
 from ..exceptions import FFMpegTypeError, FFMpegValueError
 from ..schema import StreamType
-from ..utils.forzendict import FrozenDict
+from ..utils.frozendict import FrozenDict
 from ..utils.typing import override
 from .global_runnable.runnable import GlobalRunable
 from .io.output_args import OutputArgs

typed_ffmpeg/dag/schema.py

@@ -5,7 +5,7 @@ from functools import cached_property
 from typing import Literal
 
 from ..common.serialize import Serializable
-from ..utils.forzendict import FrozenDict
+from ..utils.frozendict import FrozenDict
 from ..utils.lazy_eval.schema import LazyValue
 from .utils import is_dag