typed-ffmpeg-compatible 3.3__py3-none-any.whl → 3.4__py3-none-any.whl

typed_ffmpeg/codecs/schema.py

@@ -0,0 +1,17 @@
+from dataclasses import dataclass
+
+from ..common.serialize import Serializable
+from ..utils.frozendict import FrozenDict
+
+
+@dataclass(frozen=True, kw_only=True)
+class FFMpegCodecOption(Serializable):
+    kwargs: FrozenDict[str, str | int | float | bool] = FrozenDict({})
+
+
+@dataclass(frozen=True, kw_only=True)
+class FFMpegEncoderOption(FFMpegCodecOption): ...
+
+
+@dataclass(frozen=True, kw_only=True)
+class FFMpegDecoderOption(FFMpegCodecOption): ...

typed_ffmpeg/common/serialize.py

@@ -15,7 +15,7 @@ from enum import Enum
 from pathlib import Path
 from typing import Any
 
-from ..utils.forzendict import FrozenDict
+from ..utils.frozendict import FrozenDict
 
 CLASS_REGISTRY: dict[str, type[Serializable | Enum]] = {}
 """

typed_ffmpeg/compile/compile_cli.py

@@ -682,6 +682,8 @@ def get_stream_label(stream: Stream, context: DAGContext | None = None) -> str:
             if len(stream.node.output_typings) > 1:
                 return f"{get_node_label(stream.node, context)}#{stream.index}"
             return f"{get_node_label(stream.node, context)}"
+        case OutputNode():
+            return f"{get_node_label(stream.node, context)}"
         case _:
             raise FFMpegValueError(
                 f"Unknown node type: {stream.node.__class__.__name__}"

typed_ffmpeg/dag/global_runnable/global_args.py

@@ -1,10 +1,18 @@
 # NOTE: this file is auto-generated, do not modify
+
+
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any
 
-from ...types import Boolean, Float, Func, Int
+from ...types import (
+    Boolean,
+    Float,
+    Func,
+    Int,
+)
+from ...utils.frozendict import merge
 
 if TYPE_CHECKING:
     from ..nodes import GlobalNode, GlobalStream, OutputStream
@@ -73,7 +81,7 @@ class GlobalArgs(ABC):
         adrift_threshold: Func = None,
         qphist: Func = None,
         vsync: Func = None,
-        extra_options: dict[str, Any] = None,
+        extra_options: dict[str, Any] | None = None,
     ) -> GlobalStream:
         """
         Set global options.
@@ -131,58 +139,54 @@ class GlobalArgs(ABC):
         """
 
         return self._global_node(
-            **(
+            **merge(
                 {
-                    k: v
-                    for k, v in {
-                        "loglevel": loglevel,
-                        "v": v,
-                        "report": report,
-                        "max_alloc": max_alloc,
-                        "cpuflags": cpuflags,
-                        "cpucount": cpucount,
-                        "hide_banner": hide_banner,
-                        "y": y,
-                        "n": n,
-                        "ignore_unknown": ignore_unknown,
-                        "copy_unknown": copy_unknown,
-                        "recast_media": recast_media,
-                        "benchmark": benchmark,
-                        "benchmark_all": benchmark_all,
-                        "progress": progress,
-                        "stdin": stdin,
-                        "timelimit": timelimit,
-                        "dump": dump,
-                        "hex": hex,
-                        "frame_drop_threshold": frame_drop_threshold,
-                        "copyts": copyts,
-                        "start_at_zero": start_at_zero,
-                        "copytb": copytb,
-                        "dts_delta_threshold": dts_delta_threshold,
-                        "dts_error_threshold": dts_error_threshold,
-                        "xerror": xerror,
-                        "abort_on": abort_on,
-                        "filter_threads": filter_threads,
-                        "filter_complex": filter_complex,
-                        "filter_complex_threads": filter_complex_threads,
-                        "lavfi": lavfi,
-                        "filter_complex_script": filter_complex_script,
-                        "auto_conversion_filters": auto_conversion_filters,
-                        "stats": stats,
-                        "stats_period": stats_period,
-                        "debug_ts": debug_ts,
-                        "max_error_rate": max_error_rate,
-                        "vstats": vstats,
-                        "vstats_file": vstats_file,
-                        "vstats_version": vstats_version,
-                        "init_hw_device": init_hw_device,
-                        "filter_hw_device": filter_hw_device,
-                        "adrift_threshold": adrift_threshold,
-                        "qphist": qphist,
-                        "vsync": vsync,
-                    }.items()
-                    if v is not None
-                }
-                | (extra_options or {})
-            ),
+                    "loglevel": loglevel,
+                    "v": v,
+                    "report": report,
+                    "max_alloc": max_alloc,
+                    "cpuflags": cpuflags,
+                    "cpucount": cpucount,
+                    "hide_banner": hide_banner,
+                    "y": y,
+                    "n": n,
+                    "ignore_unknown": ignore_unknown,
+                    "copy_unknown": copy_unknown,
+                    "recast_media": recast_media,
+                    "benchmark": benchmark,
+                    "benchmark_all": benchmark_all,
+                    "progress": progress,
+                    "stdin": stdin,
+                    "timelimit": timelimit,
+                    "dump": dump,
+                    "hex": hex,
+                    "frame_drop_threshold": frame_drop_threshold,
+                    "copyts": copyts,
+                    "start_at_zero": start_at_zero,
+                    "copytb": copytb,
+                    "dts_delta_threshold": dts_delta_threshold,
+                    "dts_error_threshold": dts_error_threshold,
+                    "xerror": xerror,
+                    "abort_on": abort_on,
+                    "filter_threads": filter_threads,
+                    "filter_complex": filter_complex,
+                    "filter_complex_threads": filter_complex_threads,
+                    "lavfi": lavfi,
+                    "filter_complex_script": filter_complex_script,
+                    "auto_conversion_filters": auto_conversion_filters,
+                    "stats": stats,
+                    "stats_period": stats_period,
+                    "debug_ts": debug_ts,
+                    "max_error_rate": max_error_rate,
+                    "vstats": vstats,
+                    "vstats_file": vstats_file,
+                    "vstats_version": vstats_version,
+                    "init_hw_device": init_hw_device,
+                    "filter_hw_device": filter_hw_device,
+                    "adrift_threshold": adrift_threshold,
+                    "qphist": qphist,
+                    "vsync": vsync,
+                },
+                extra_options,
+            )
         ).stream()

typed_ffmpeg/dag/io/_input.py

@@ -4,9 +4,17 @@
 from pathlib import Path
 from typing import Any
 
+from ...codecs.schema import FFMpegDecoderOption
 from ...streams.av import AVStream
-from ...types import Boolean, Double, Float, Int, String, Time
-from ...utils.forzendict import FrozenDict
+from ...types import (
+    Boolean,
+    Double,
+    Float,
+    Int,
+    String,
+    Time,
+)
+from ...utils.frozendict import merge
 from ..nodes import InputNode
 
 
@@ -65,7 +73,8 @@ def input(
     dcodec: String = None,
     dn: Boolean = None,
     top: Int = None,
-    extra_options: dict[str, Any] = None,
+    decoder_options: FFMpegDecoderOption | None = None,
+    extra_options: dict[str, Any] | None = None,
 ) -> AVStream:
     """
     Input file URL (ffmpeg ``-i`` option)
@@ -124,6 +133,7 @@ def input(
         dcodec: alias for -c:d (select encoder/decoder for data streams)
         dn: disable data
         top: deprecated, use the setfield video filter
+        decoder_options: ffmpeg's decoder options
         extra_options: ffmpeg's input file options
 
     Returns:
@@ -135,66 +145,64 @@ def input(
     <AVStream:input.mp4:0>
     ```
     """
-
-    options = {
-        k: v
-        for k, v in {
-            "f": f,
-            "c": c,
-            "codec": codec,
-            "t": t,
-            "to": to,
-            "ss": ss,
-            "sseof": sseof,
-            "seek_timestamp": seek_timestamp,
-            "accurate_seek": accurate_seek,
-            "isync": isync,
-            "itsoffset": itsoffset,
-            "itsscale": itsscale,
-            "re": re,
-            "readrate": readrate,
-            "readrate_initial_burst": readrate_initial_burst,
-            "bitexact": bitexact,
-            "tag": tag,
-            "reinit_filter": reinit_filter,
-            "dump_attachment": dump_attachment,
-            "stream_loop": stream_loop,
-            "discard": discard,
-            "thread_queue_size": thread_queue_size,
-            "find_stream_info": find_stream_info,
-            "r": r,
-            "s": s,
-            "pix_fmt": pix_fmt,
-            "display_rotation": display_rotation,
-            "display_hflip": display_hflip,
-            "display_vflip": display_vflip,
-            "vn": vn,
-            "vcodec": vcodec,
-            "vtag": vtag,
-            "hwaccel": hwaccel,
-            "hwaccel_device": hwaccel_device,
-            "hwaccel_output_format": hwaccel_output_format,
-            "autorotate": autorotate,
-            "ar": ar,
-            "ac": ac,
-            "an": an,
-            "acodec": acodec,
-            "sample_fmt": sample_fmt,
-            "channel_layout": channel_layout,
-            "ch_layout": ch_layout,
-            "guess_layout_max": guess_layout_max,
-            "sn": sn,
-            "scodec": scodec,
-            "fix_sub_duration": fix_sub_duration,
-            "canvas_size": canvas_size,
-            "bsf": bsf,
-            "dcodec": dcodec,
-            "dn": dn,
-            "top": top,
-        }.items()
-        if v is not None
-    }
-
     return InputNode(
-        filename=str(filename), kwargs=FrozenDict(options | (extra_options or {}))
+        filename=str(filename),
+        kwargs=merge(
+            {
+                "f": f,
+                "c": c,
+                "codec": codec,
+                "t": t,
+                "to": to,
+                "ss": ss,
+                "sseof": sseof,
+                "seek_timestamp": seek_timestamp,
+                "accurate_seek": accurate_seek,
+                "isync": isync,
+                "itsoffset": itsoffset,
+                "itsscale": itsscale,
+                "re": re,
+                "readrate": readrate,
+                "readrate_initial_burst": readrate_initial_burst,
+                "bitexact": bitexact,
+                "tag": tag,
+                "reinit_filter": reinit_filter,
+                "dump_attachment": dump_attachment,
+                "stream_loop": stream_loop,
+                "discard": discard,
+                "thread_queue_size": thread_queue_size,
+                "find_stream_info": find_stream_info,
+                "r": r,
+                "s": s,
+                "pix_fmt": pix_fmt,
+                "display_rotation": display_rotation,
+                "display_hflip": display_hflip,
+                "display_vflip": display_vflip,
+                "vn": vn,
+                "vcodec": vcodec,
+                "vtag": vtag,
+                "hwaccel": hwaccel,
+                "hwaccel_device": hwaccel_device,
+                "hwaccel_output_format": hwaccel_output_format,
+                "autorotate": autorotate,
+                "ar": ar,
+                "ac": ac,
+                "an": an,
+                "acodec": acodec,
+                "sample_fmt": sample_fmt,
+                "channel_layout": channel_layout,
+                "ch_layout": ch_layout,
+                "guess_layout_max": guess_layout_max,
+                "sn": sn,
+                "scodec": scodec,
+                "fix_sub_duration": fix_sub_duration,
+                "canvas_size": canvas_size,
+                "bsf": bsf,
+                "dcodec": dcodec,
+                "dn": dn,
+                "top": top,
+            },
+            decoder_options.kwargs if decoder_options else {},
+            extra_options,
+        ),
     ).stream()

typed_ffmpeg/dag/io/_output.py

@@ -4,8 +4,17 @@
 from pathlib import Path
 from typing import Any
 
-from ...types import Boolean, Float, Func, Int, Int64, String, Time
-from ...utils.forzendict import FrozenDict
+from ...codecs.schema import FFMpegEncoderOption
+from ...types import (
+    Boolean,
+    Float,
+    Func,
+    Int,
+    Int64,
+    String,
+    Time,
+)
+from ...utils.frozendict import merge
 from ..nodes import FilterableStream, OutputNode, OutputStream
 
 
@@ -106,7 +115,8 @@ def output(
     dcodec: String = None,
     dn: Boolean = None,
     top: Int = None,
-    extra_options: dict[str, Any] = None,
+    encoder_options: FFMpegEncoderOption | None = None,
+    extra_options: dict[str, Any] | None = None,
 ) -> OutputStream:
     """
     Output file URL
@@ -209,115 +219,114 @@ def output(
         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
         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 OutputNode(
         inputs=streams,
         filename=str(filename),
-        kwargs=FrozenDict(options | (extra_options or {})),
+        kwargs=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 {},
+            extra_options,
+        ),
     ).stream()