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

typed_ffmpeg/__init__.py

@@ -22,7 +22,7 @@ Example:
     ```
 """
 
-from . import codecs, compile, dag, filters, sources
+from . import codecs, compile, dag, filters, formats, sources
 from .base import afilter, filter_multi_output, input, merge_outputs, output, vfilter
 from .dag import Stream
 from .exceptions import FFMpegExecuteError, FFMpegTypeError, FFMpegValueError
@@ -32,6 +32,7 @@ from .streams import AudioStream, AVStream, SubtitleStream, VideoStream
 
 __all__ = [
     "codecs",
+    "formats",
     "sources",
     "filters",
     "input",

typed_ffmpeg/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.4'
-__version_tuple__ = version_tuple = (3, 4)
+__version__ = version = '3.5.0'
+__version_tuple__ = version_tuple = (3, 5, 0)

typed_ffmpeg/codecs/decoders.py

@@ -6512,15 +6512,25 @@ def mpl2() -> FFMpegDecoderOption:
     return FFMpegDecoderOption(kwargs=merge({}))
 
 
-def pjs() -> FFMpegDecoderOption:
+def pjs(
+    keep_ass_markup: bool | None = None,
+) -> FFMpegDecoderOption:
     """
     PJS subtitle
 
+    Args:
+        keep_ass_markup: Set if ASS tags must be escaped (default false)
 
     Returns:
         the set codec options
     """
-    return FFMpegDecoderOption(kwargs=merge({}))
+    return FFMpegDecoderOption(
+        kwargs=merge(
+            {
+                "keep_ass_markup": keep_ass_markup,
+            }
+        )
+    )
 
 
 def realtext() -> FFMpegDecoderOption:
@@ -6545,15 +6555,25 @@ def sami() -> FFMpegDecoderOption:
     return FFMpegDecoderOption(kwargs=merge({}))
 
 
-def stl() -> FFMpegDecoderOption:
+def stl(
+    keep_ass_markup: bool | None = None,
+) -> FFMpegDecoderOption:
     """
     Spruce subtitle format
 
+    Args:
+        keep_ass_markup: Set if ASS tags must be escaped (default false)
 
     Returns:
         the set codec options
     """
-    return FFMpegDecoderOption(kwargs=merge({}))
+    return FFMpegDecoderOption(
+        kwargs=merge(
+            {
+                "keep_ass_markup": keep_ass_markup,
+            }
+        )
+    )
 
 
 def srt() -> FFMpegDecoderOption:
@@ -6589,37 +6609,67 @@ def subviewer() -> FFMpegDecoderOption:
     return FFMpegDecoderOption(kwargs=merge({}))
 
 
-def subviewer1() -> FFMpegDecoderOption:
+def subviewer1(
+    keep_ass_markup: bool | None = None,
+) -> FFMpegDecoderOption:
     """
     SubViewer1 subtitle
 
+    Args:
+        keep_ass_markup: Set if ASS tags must be escaped (default false)
 
     Returns:
         the set codec options
     """
-    return FFMpegDecoderOption(kwargs=merge({}))
+    return FFMpegDecoderOption(
+        kwargs=merge(
+            {
+                "keep_ass_markup": keep_ass_markup,
+            }
+        )
+    )
 
 
-def text() -> FFMpegDecoderOption:
+def text(
+    keep_ass_markup: bool | None = None,
+) -> FFMpegDecoderOption:
     """
     Raw text subtitle
 
+    Args:
+        keep_ass_markup: Set if ASS tags must be escaped (default false)
 
     Returns:
         the set codec options
     """
-    return FFMpegDecoderOption(kwargs=merge({}))
+    return FFMpegDecoderOption(
+        kwargs=merge(
+            {
+                "keep_ass_markup": keep_ass_markup,
+            }
+        )
+    )
 
 
-def vplayer() -> FFMpegDecoderOption:
+def vplayer(
+    keep_ass_markup: bool | None = None,
+) -> FFMpegDecoderOption:
     """
     VPlayer subtitle
 
+    Args:
+        keep_ass_markup: Set if ASS tags must be escaped (default false)
 
     Returns:
         the set codec options
     """
-    return FFMpegDecoderOption(kwargs=merge({}))
+    return FFMpegDecoderOption(
+        kwargs=merge(
+            {
+                "keep_ass_markup": keep_ass_markup,
+            }
+        )
+    )
 
 
 def webvtt() -> FFMpegDecoderOption:

typed_ffmpeg/codecs/encoders.py

@@ -39,9 +39,7 @@ def alias_pix() -> FFMpegEncoderOption:
 
 
 def amv(
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -840,9 +838,7 @@ def flashsv2() -> FFMpegEncoderOption:
 
 
 def flv(
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -953,7 +949,7 @@ def flv(
 
 
 def gif(
-    gifflags: str | None | Literal["offsetting", "transdiff"] = None,
+    gifflags: str | None = None,
     gifimage: bool | None = None,
     global_palette: bool | None = None,
 ) -> FFMpegEncoderOption:
@@ -980,9 +976,7 @@ def gif(
 
 
 def h261(
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -1095,9 +1089,7 @@ def h261(
 def h263(
     obmc: bool | None = None,
     mb_info: int | None = None,
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -1240,9 +1232,7 @@ def h263p(
     aiv: bool | None = None,
     obmc: bool | None = None,
     structured_slices: bool | None = None,
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -1939,9 +1929,7 @@ def h264_vaapi(
     quality: int | None = None,
     coder: int | None | Literal["cavlc", "cabac", "vlc", "ac"] = None,
     aud: bool | None = None,
-    sei: str
-    | None
-    | Literal["identifier", "timing", "recovery_point", "a53_cc"] = None,
+    sei: str | None = None,
     profile: int
     | None
     | Literal["constrained_baseline", "main", "high", "high10"] = None,
@@ -2341,7 +2329,7 @@ def hevc_vaapi(
     | Literal[
         "1", "2", "2.1", "3", "3.1", "4", "4.1", "5", "5.1", "5.2", "6", "6.1", "6.2"
     ] = None,
-    sei: str | None | Literal["hdr", "a53_cc"] = None,
+    sei: str | None = None,
     tiles: str | None = None,
 ) -> FFMpegEncoderOption:
     """
@@ -2585,9 +2573,7 @@ def magicyuv(
 
 
 def mjpeg(
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -2738,9 +2724,7 @@ def mpeg1video(
     b_strategy: int | None = None,
     b_sensitivity: int | None = None,
     brd_scale: int | None = None,
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -2880,9 +2864,7 @@ def mpeg2video(
     video_format: int
     | None
     | Literal["component", "pal", "ntsc", "secam", "mac", "unspecified"] = None,
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -3069,9 +3051,7 @@ def mpeg4(
     b_strategy: int | None = None,
     b_sensitivity: int | None = None,
     brd_scale: int | None = None,
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -3257,9 +3237,7 @@ def mpeg4_v4l2m2m(
 
 
 def msmpeg4v2(
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -3370,9 +3348,7 @@ def msmpeg4v2(
 
 
 def msmpeg4(
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -3792,9 +3768,7 @@ def rpza(
 
 
 def rv10(
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -3905,9 +3879,7 @@ def rv10(
 
 
 def rv20(
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -4092,9 +4064,7 @@ def snow(
 
 
 def speedhq(
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -4604,9 +4574,7 @@ def libwebp(
 
 
 def wmv1(
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,
@@ -4717,9 +4685,7 @@ def wmv1(
 
 
 def wmv2(
-    mpv_flags: str
-    | None
-    | Literal["skip_rd", "strict_gop", "qp_rd", "cbp_rd", "naq", "mv0"] = None,
+    mpv_flags: str | None = None,
     luma_elim_threshold: int | None = None,
     chroma_elim_threshold: int | None = None,
     quantizer_noise_shaping: int | None = None,

typed_ffmpeg/dag/io/_input.py

@@ -5,6 +5,7 @@ from pathlib import Path
 from typing import Any
 
 from ...codecs.schema import FFMpegDecoderOption
+from ...formats.schema import FFMpegDemuxerOption
 from ...streams.av import AVStream
 from ...types import (
     Boolean,
@@ -74,6 +75,7 @@ def input(
     dn: Boolean = None,
     top: Int = None,
     decoder_options: FFMpegDecoderOption | None = None,
+    demuxer_options: FFMpegDemuxerOption | None = None,
     extra_options: dict[str, Any] | None = None,
 ) -> AVStream:
     """
@@ -134,6 +136,7 @@ def input(
         dn: disable data
         top: deprecated, use the setfield video filter
         decoder_options: ffmpeg's decoder options
+        demuxer_options: ffmpeg's demuxer options
         extra_options: ffmpeg's input file options
 
     Returns:
@@ -203,6 +206,7 @@ def input(
                 "top": top,
             },
             decoder_options.kwargs if decoder_options else {},
+            demuxer_options.kwargs if demuxer_options else {},
             extra_options,
         ),
     ).stream()

typed_ffmpeg/dag/io/_output.py

@@ -5,6 +5,7 @@ from pathlib import Path
 from typing import Any
 
 from ...codecs.schema import FFMpegEncoderOption
+from ...formats.schema import FFMpegMuxerOption
 from ...types import (
     Boolean,
     Float,
@@ -116,6 +117,7 @@ def output(
     dn: Boolean = None,
     top: Int = None,
     encoder_options: FFMpegEncoderOption | None = None,
+    muxer_options: FFMpegMuxerOption | None = None,
     extra_options: dict[str, Any] | None = None,
 ) -> OutputStream:
     """
@@ -220,6 +222,7 @@ def output(
         dn: disable data
         top: deprecated, use the setfield video filter
         encoder_options: ffmpeg's encoder options
+        muxer_options: ffmpeg's muxer options
         extra_options: the arguments for the output
 
     Returns:
@@ -327,6 +330,7 @@ def output(
                 "top": top,
             },
             encoder_options.kwargs if encoder_options else {},
+            muxer_options.kwargs if muxer_options else {},
             extra_options,
         ),
     ).stream()

typed_ffmpeg/dag/io/output_args.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 from ...codecs.schema import FFMpegEncoderOption
+from ...formats.schema import FFMpegMuxerOption
 from ...types import (
     Boolean,
     Float,
@@ -128,6 +129,7 @@ class OutputArgs(ABC):
         dn: Boolean = None,
         top: Int = None,
         encoder_options: FFMpegEncoderOption | None = None,
+        muxer_options: FFMpegMuxerOption | None = None,
         extra_options: dict[str, Any] | None = None,
     ) -> OutputStream:
         """
@@ -232,6 +234,7 @@ class OutputArgs(ABC):
             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:
@@ -339,6 +342,7 @@ class OutputArgs(ABC):
                     "top": top,
                 },
                 encoder_options.kwargs if encoder_options else {},
+                muxer_options.kwargs if muxer_options else {},
                 extra_options,
             ),
         ).stream()

typed_ffmpeg/formats/__init__.py

@@ -0,0 +1,3 @@
+from . import demuxers, muxers, schema
+
+__all__ = ["muxers", "demuxers", "schema"]