typed-ffmpeg-compatible 3.2.3__py3-none-any.whl → 3.2.5__py3-none-any.whl

typed_ffmpeg/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.2.3'
-__version_tuple__ = version_tuple = (3, 2, 3)
+__version__ = version = '3.2.5'
+__version_tuple__ = version_tuple = (3, 2, 5)

typed_ffmpeg/compile/compile_cli.py

@@ -38,6 +38,7 @@ from ..exceptions import FFMpegValueError
 from ..schema import Default
 from ..streams.audio import AudioStream
 from ..streams.av import AVStream
+from ..streams.subtitle import SubtitleStream
 from ..streams.video import VideoStream
 from ..utils.escaping import escape
 from ..utils.lazy_eval.schema import LazyValue
@@ -140,20 +141,24 @@ def parse_stream_selector(
     stream = mapping[stream_label]
 
     if isinstance(stream, AVStream):
-        if selector.count(":") == 1:
-            stream_label, stream_type = selector.split(":", 1)
-            return stream.video if stream_type == "v" else stream.audio
-        elif selector.count(":") == 2:
-            stream_label, stream_type, stream_index = selector.split(":", 2)
-            return (
-                stream.video_stream(int(stream_index))
-                if stream_type == "v"
-                else stream.audio_stream(int(stream_index))
-            )
-        else:
-            return stream
-    else:
-        return stream
+        if ":" in selector:
+            if selector.count(":") == 1:
+                stream_label, stream_type = selector.split(":", 1)
+                stream_index = None
+            elif selector.count(":") == 2:
+                stream_label, stream_type, _stream_index = selector.split(":", 2)
+                stream_index = int(_stream_index)
+
+            match stream_type:
+                case "v":
+                    return stream.video_stream(stream_index)
+                case "a":
+                    return stream.audio_stream(stream_index)
+                case "s":
+                    return stream.subtitle_stream(stream_index)
+                case _:
+                    raise FFMpegValueError(f"Unknown stream type: {stream_type}")
+    return stream
 
 
 def _is_filename(token: str) -> bool:
@@ -309,7 +314,8 @@ def parse_filter_complex(
     Returns:
         Updated stream mapping with new filter outputs added
     """
-    filter_units = filter_complex.split(";")
+    # Use re.split with negative lookbehind to handle escaped semicolons
+    filter_units = re.split(r"(?<!\\);", filter_complex)
 
     for filter_unit in filter_units:
         pattern = re.compile(
@@ -335,11 +341,12 @@ def parse_filter_complex(
 
         # Parse filter parameters into key-value pairs
         filter_params = {}
+        param_str = param_str and param_str.strip()
         if param_str:
-            param_parts = param_str.strip().split(":")
+            param_parts = re.split(r"(?<!\\):", param_str)
             for part in param_parts:
                 if "=" in part:
-                    key, value = part.split("=", 1)
+                    key, value = re.split(r"(?<!\\)=", part, 1)
                     filter_params[key.strip()] = value.strip()
 
         assert isinstance(filter_name, str), f"Expected filter name, got {filter_name}"
@@ -369,12 +376,17 @@ def parse_filter_complex(
         for idx, (output_label, output_typing) in enumerate(
             zip(output_labels, filter_node.output_typings)
         ):
-            if output_typing == StreamType.video:
-                stream_mapping[output_label] = VideoStream(node=filter_node, index=idx)
-            elif output_typing == StreamType.audio:
-                stream_mapping[output_label] = AudioStream(node=filter_node, index=idx)
-            else:
-                raise FFMpegValueError(f"Unknown stream type: {output_typing}")
+            match output_typing:
+                case StreamType.video:
+                    stream_mapping[output_label] = VideoStream(
+                        node=filter_node, index=idx
+                    )
+                case StreamType.audio:
+                    stream_mapping[output_label] = AudioStream(
+                        node=filter_node, index=idx
+                    )
+                case _:
+                    raise FFMpegValueError(f"Unknown stream type: {output_typing}")
 
     return stream_mapping
 
@@ -606,6 +618,7 @@ def get_stream_label(stream: Stream, context: DAGContext | None = None) -> str:
     For input streams, labels follow FFmpeg's stream specifier syntax:
     - Video streams: "0:v" (first input, video stream)
     - Audio streams: "0:a" (first input, audio stream)
+    - Subtitle streams: "0:s" (first input, subtitle stream)
     - AV streams: "0" (first input, all streams)
 
     For filter outputs, labels use the filter's label:
@@ -647,6 +660,12 @@ def get_stream_label(stream: Stream, context: DAGContext | None = None) -> str:
                             f"{get_node_label(stream.node, context)}:a:{stream.index}"
                         )
                     return f"{get_node_label(stream.node, context)}:a"
+                case SubtitleStream():
+                    if stream.index is not None:
+                        return (
+                            f"{get_node_label(stream.node, context)}:s:{stream.index}"
+                        )
+                    return f"{get_node_label(stream.node, context)}:s"
                 case _:
                     raise FFMpegValueError(
                         f"Unknown stream type: {stream.__class__.__name__}"

typed_ffmpeg/compile/compile_python.py

@@ -17,6 +17,7 @@ from ..dag.nodes import (
 from ..dag.schema import Node, Stream
 from ..streams.audio import AudioStream
 from ..streams.av import AVStream
+from ..streams.subtitle import SubtitleStream
 from ..streams.video import VideoStream
 from .context import DAGContext
 from .validate import validate
@@ -107,12 +108,19 @@ def get_input_var_name(
                         return f"{get_output_var_name(stream.node, context)}[{stream.index}]"
                     else:
                         return f"{get_output_var_name(stream.node, context)}"
+        case SubtitleStream():
+            match stream.node:
+                case InputNode():
+                    if stream.index is not None:
+                        return f"{get_output_var_name(stream.node, context)}.subtitle_stream({stream.index})"
+                    else:
+                        return f"{get_output_var_name(stream.node, context)}.subtitle"
         case OutputStream():
             return f"{get_output_var_name(stream.node, context)}"
         case GlobalStream():
             return f"{get_output_var_name(stream.node, context)}"
-        case _:
-            raise ValueError(f"Unknown node type: {type(stream.node)}")
+
+    raise ValueError(f"Unknown stream type: {type(stream)}")  # pragma: no cover
 
 
 def get_output_var_name(node: Node, context: DAGContext) -> str:

typed_ffmpeg/streams/av.py

@@ -1,5 +1,6 @@
 from ..dag.nodes import InputNode
 from .audio import AudioStream
+from .subtitle import SubtitleStream
 from .video import VideoStream
 
 
@@ -30,7 +31,17 @@ class AVStream(AudioStream, VideoStream):
         """
         return AudioStream(node=self.node, index=self.index)
 
-    def video_stream(self, index: int) -> VideoStream:
+    @property
+    def subtitle(self) -> SubtitleStream:
+        """
+        Get the subtitle stream from the input node.
+
+        Returns:
+            SubtitleStream: The subtitle stream from the input node.
+        """
+        return SubtitleStream(node=self.node, index=self.index)
+
+    def video_stream(self, index: int | None = None) -> VideoStream:
         """
         Get the video stream from the input node with a specified index.
 
@@ -42,7 +53,7 @@ class AVStream(AudioStream, VideoStream):
         """
         return VideoStream(node=self.node, index=index)
 
-    def audio_stream(self, index: int) -> AudioStream:
+    def audio_stream(self, index: int | None = None) -> AudioStream:
         """
         Get the audio stream from the input node with a specified index.
 
@@ -53,3 +64,15 @@ class AVStream(AudioStream, VideoStream):
             AudioStream: The audio stream from the input node.
         """
         return AudioStream(node=self.node, index=index)
+
+    def subtitle_stream(self, index: int | None = None) -> SubtitleStream:
+        """
+        Get the subtitle stream from the input node with a specified index.
+
+        Args:
+            index: The index of the subtitle stream.
+
+        Returns:
+            SubtitleStream: The subtitle stream from the input node.
+        """
+        return SubtitleStream(node=self.node, index=index)

typed_ffmpeg/streams/subtitle.py

@@ -0,0 +1,7 @@
+from ..dag.nodes import FilterableStream
+
+
+class SubtitleStream(FilterableStream):
+    """
+    A stream that contains subtitle data.
+    """

{typed_ffmpeg_compatible-3.2.3.dist-info → typed_ffmpeg_compatible-3.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: typed-ffmpeg-compatible
-Version: 3.2.3
+Version: 3.2.5
 Summary: Modern Python FFmpeg wrappers offer comprehensive support for complex filters, complete with detailed typing and documentation.
 Author-email: lucemia <lucemia@gmail.com>
 License-Expression: MIT

{typed_ffmpeg_compatible-3.2.3.dist-info → typed_ffmpeg_compatible-3.2.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 typed_ffmpeg/__init__.py,sha256=n1SZfENc9xhZ0eA3ZzkBNPuIY-Pt3-rOwB8-uUj5olU,1592
-typed_ffmpeg/_version.py,sha256=P9n86yqDQj4uxDqvcIKGlJWsA9YZ7G1BSuEXNqVACeI,511
+typed_ffmpeg/_version.py,sha256=VJzOHz1iq5b2MvgVxeYYraqogSncMB5aG1qIW2TvKks,511
 typed_ffmpeg/base.py,sha256=C5Tqbx2I0c-09D7aXKZoGkspu-lAAeAhuOns5zr3PXQ,6304
 typed_ffmpeg/exceptions.py,sha256=D4SID6WOwkjVV8O8mAjrEDHWn-8BRDnK_jteaDof1SY,2474
 typed_ffmpeg/filters.py,sha256=_lBpGZgPHK3KgGVrw-TCdQEsBRuEXVIgwggYNGd80MU,110076
@@ -13,9 +13,9 @@ typed_ffmpeg/common/cache.py,sha256=j0JvfX7jewLpdJWxgo7Pwze0BkUJdYGHX2uGR8BZ-9M,
 typed_ffmpeg/common/schema.py,sha256=qM8yfMX9UU3EAQSNsTrr-SAmyqKx8eQCXTtu3RJWkEk,19673
 typed_ffmpeg/common/serialize.py,sha256=dLim0DBP5CdJ1JiMV9xEmmh1XMSIhBOWs61EopAL15s,7719
 typed_ffmpeg/compile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-typed_ffmpeg/compile/compile_cli.py,sha256=--2j1QPPOB2pEQzqFM4VpINokbJilcegtRqTRF2_Jfg,31588
+typed_ffmpeg/compile/compile_cli.py,sha256=4XCkBC2WGP-P03XWVI3tgoBs--oQLvhuqyocSk8HhMw,32491
 typed_ffmpeg/compile/compile_json.py,sha256=YCiTyfAnUVSbFr7BiQpmJYs13K5sa-xo77Iih33mb6I,992
-typed_ffmpeg/compile/compile_python.py,sha256=oo4e8Ldwk0OkrZtHucfuGR5JDFF8xY8omNKPMDyUpQ8,11506
+typed_ffmpeg/compile/compile_python.py,sha256=zxaG9DC0r8lO_cOV9HBN6cnxy3-wCZyvo3-4M47F84E,11914
 typed_ffmpeg/compile/context.py,sha256=macQ3HhEJ73j_WbWYtU9GCQCzcB_KQGAPimcuU-WOac,10946
 typed_ffmpeg/compile/validate.py,sha256=QsWksdvlRwWw6hnatFo-ABakms1qDXRbEmvMQGRLrD8,9579
 typed_ffmpeg/dag/__init__.py,sha256=qAApSNqjbZ1DtUaV5bSku9RwG7MpMPa1HJO764cSBt4,849
@@ -37,8 +37,9 @@ typed_ffmpeg/ffprobe/schema.py,sha256=PBgBWYGO8wKnI0Lae9oCJ1Nprhv2ciPkdLrumzPVll
 typed_ffmpeg/ffprobe/xml2json.py,sha256=1TSuxR7SYc-M_-JmE-1khHGbXCapgW0Oap9kzL0nwNg,2455
 typed_ffmpeg/streams/__init__.py,sha256=Nt9uWpcVI1sQLl5Qt_kBCBcWOGZA1vczCQ0qvFbSko0,141
 typed_ffmpeg/streams/audio.py,sha256=2oNRhb5UetWtlPG3NW73AjUZoFPl303yMv-6W1sGWt0,259054
-typed_ffmpeg/streams/av.py,sha256=Nu6M7uV4aMNQf_kxADZuBdpDwFx_B7Z7x0p5j32n9iA,1500
+typed_ffmpeg/streams/av.py,sha256=q7zqNyr44vBT7tiR2nKUGTf3g93HtNVA_WSwCiysmgI,2240
 typed_ffmpeg/streams/channel_layout.py,sha256=hGagaoc1tnWS8K1yiITp4f_92qq5e7C_zB15bHOL0DI,1162
+typed_ffmpeg/streams/subtitle.py,sha256=zhbRKUYH0C972Hurm4hK_dqLvT4Y6v_VNZFzQrkCm9A,141
 typed_ffmpeg/streams/video.py,sha256=cQwHfew75YO_dbZjmpUYd-nXt1JHN0M7suFKKe5UH5s,453576
 typed_ffmpeg/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 typed_ffmpeg/utils/escaping.py,sha256=m6CTEBwWZTFdtZHTHW-3pQCgkpdZb9f9ynoO-gsD7uM,2937
@@ -50,9 +51,9 @@ typed_ffmpeg/utils/view.py,sha256=QCSlQoQkRBI-T0sWjiywGgM9DlKd8Te3CB2ZYX-pEVU,34
 typed_ffmpeg/utils/lazy_eval/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 typed_ffmpeg/utils/lazy_eval/operator.py,sha256=QWybd-UH3VdDa8kgWkqAMi3WV0b0WF1d1JixQr6is2E,4136
 typed_ffmpeg/utils/lazy_eval/schema.py,sha256=WSg-E3MS3itN1AT6Dq4Z9btnRHEReuN3o6zruXou7h4,9623
-typed_ffmpeg_compatible-3.2.3.dist-info/licenses/LICENSE,sha256=8Aaya5i_09Cou2i3QMxTwz6uHGzi_fGA4uhkco07-A4,1066
-typed_ffmpeg_compatible-3.2.3.dist-info/METADATA,sha256=HwRj91ZONWRkUUACimtXw8TNwhZveMe358-cYoBYaUU,8385
-typed_ffmpeg_compatible-3.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-typed_ffmpeg_compatible-3.2.3.dist-info/entry_points.txt,sha256=kUQvZ27paV-07qtkIFV-emKsYtjFOTw9kknBRSXPs04,45
-typed_ffmpeg_compatible-3.2.3.dist-info/top_level.txt,sha256=vuASJGVRQiNmhWY1pt0RXESWSNkknWXqWLIRAU7H_L4,13
-typed_ffmpeg_compatible-3.2.3.dist-info/RECORD,,
+typed_ffmpeg_compatible-3.2.5.dist-info/licenses/LICENSE,sha256=8Aaya5i_09Cou2i3QMxTwz6uHGzi_fGA4uhkco07-A4,1066
+typed_ffmpeg_compatible-3.2.5.dist-info/METADATA,sha256=GSSr2eBSGWwgMrZZBx4wgAcRx6bas71nQjLxF8GVJPA,8385
+typed_ffmpeg_compatible-3.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+typed_ffmpeg_compatible-3.2.5.dist-info/entry_points.txt,sha256=kUQvZ27paV-07qtkIFV-emKsYtjFOTw9kknBRSXPs04,45
+typed_ffmpeg_compatible-3.2.5.dist-info/top_level.txt,sha256=vuASJGVRQiNmhWY1pt0RXESWSNkknWXqWLIRAU7H_L4,13
+typed_ffmpeg_compatible-3.2.5.dist-info/RECORD,,