Use PyAV 12.3.0

Author: WyattBlue

auto_editor/analyze.py

@@ -16,7 +16,6 @@
     from fractions import Fraction
     from typing import Any
 
-    from av.filter import FilterContext
     from numpy.typing import NDArray
 
     from auto_editor.ffwrapper import FileInfo
@@ -40,11 +39,6 @@ class LevelError(Exception):
     pass
 
 
-def link_nodes(*nodes: FilterContext) -> None:
-    for c, n in zip(nodes, nodes[1:]):
-        c.link_to(n)
-
-
 def mut_remove_small(
     arr: NDArray[np.bool_], lim: int, replace: int, with_: int
 ) -> None:
@@ -239,7 +233,7 @@ def subtitle(
             self.log.error(e)
 
         import av
-        from av.subtitles.subtitle import AssSubtitle, TextSubtitle
+        from av.subtitles.subtitle import AssSubtitle
 
         try:
             container = av.open(self.src.path, "r")
@@ -287,8 +281,6 @@ def subtitle(
                 for sub in subset:
                     if isinstance(sub, AssSubtitle):
                         line = convert_ass_to_text(sub.ass.decode(errors="ignore"))
-                    elif isinstance(sub, TextSubtitle):
-                        line = sub.text.decode(errors="ignore")
                     else:
                         continue
 
@@ -324,14 +316,13 @@ def motion(self, stream: int, blur: int, width: int) -> NDArray[np.float64]:
         index = 0
 
         graph = av.filter.Graph()
-        link_nodes(
+        graph.link_nodes(
             graph.add_buffer(template=video),
             graph.add("scale", f"{width}:-1"),
             graph.add("format", "gray"),
             graph.add("gblur", f"sigma={blur}"),
             graph.add("buffersink"),
-        )
-        graph.configure()
+        ).configure()
 
         threshold_list = np.zeros((1024), dtype=np.float64)
 

auto_editor/output.py

@@ -57,7 +57,7 @@ def audio(self, src: FileInfo, stream: int) -> str:
             output_astream = out_container.add_stream("pcm_s16le", rate=sample_rate)
             assert isinstance(output_astream, av.audio.stream.AudioStream)
 
-            resampler = AudioResampler(format="s16", layout="stereo", rate=sample_rate)  # type: ignore
+            resampler = AudioResampler(format="s16", layout="stereo", rate=sample_rate)
             for i, frame in enumerate(in_container.decode(astream)):
                 if i % 1500 == 0:
                     bar.tick(0 if frame.time is None else frame.time)

auto_editor/render/video.py

@@ -17,8 +17,6 @@
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
-    from av.filter import FilterContext
-
     from auto_editor.ffwrapper import FFmpeg, FileInfo
     from auto_editor.timeline import v3
     from auto_editor.utils.bar import Bar
@@ -33,11 +31,6 @@ class VideoFrame:
     src: FileInfo
 
 
-def link_nodes(*nodes: FilterContext) -> None:
-    for c, n in zip(nodes, nodes[1:]):
-        c.link_to(n)
-
-
 # From: github.com/PyAV-Org/PyAV/blob/main/av/video/frame.pyx
 allowed_pix_fmt = {
     "yuv420p",
@@ -98,12 +91,11 @@ def make_image_cache(tl: v3) -> dict[tuple[FileInfo, int], np.ndarray]:
                     for frame in cn.decode(my_stream):
                         if obj.width != 0:
                             graph = av.filter.Graph()
-                            link_nodes(
+                            graph.link_nodes(
                                 graph.add_buffer(template=my_stream),
                                 graph.add("scale", f"{obj.width}:-1"),
                                 graph.add("buffersink"),
-                            )
-                            graph.vpush(frame)
+                            ).vpush(frame)
                             frame = graph.vpull()
                         img_cache[(obj.src, obj.width)] = frame.to_ndarray(
                             format="rgb24"
@@ -177,7 +169,7 @@ def render_av(
         target_width = max(round(tl.res[0] * args.scale), 2)
         target_height = max(round(tl.res[1] * args.scale), 2)
         scale_graph = av.filter.Graph()
-        link_nodes(
+        scale_graph.link_nodes(
             scale_graph.add(
                 "buffer", video_size="1x1", time_base="1/1", pix_fmt=target_pix_fmt
             ),
@@ -293,29 +285,27 @@ def render_av(
                     if (frame.width, frame.height) != tl.res:
                         width, height = tl.res
                         graph = av.filter.Graph()
-                        link_nodes(
+                        graph.link_nodes(
                             graph.add_buffer(template=my_stream),
                             graph.add(
                                 "scale",
                                 f"{width}:{height}:force_original_aspect_ratio=decrease:eval=frame",
                             ),
                             graph.add("pad", f"{width}:{height}:-1:-1:color={bg}"),
                             graph.add("buffersink"),
-                        )
-                        graph.vpush(frame)
+                        ).vpush(frame)
                         frame = graph.vpull()
                 elif isinstance(obj, TlRect):
                     graph = av.filter.Graph()
                     x, y = apply_anchor(obj.x, obj.y, obj.width, obj.height, obj.anchor)
-                    link_nodes(
+                    graph.link_nodes(
                         graph.add_buffer(template=my_stream),
                         graph.add(
                             "drawbox",
                             f"x={x}:y={y}:w={obj.width}:h={obj.height}:color={obj.fill}:t=fill",
                         ),
                         graph.add("buffersink"),
-                    )
-                    graph.vpush(frame)
+                    ).vpush(frame)
                     frame = graph.vpull()
                 elif isinstance(obj, TlImage):
                     img = img_cache[(obj.src, obj.width)]

auto_editor/subcommands/subdump.py

@@ -1,21 +1,18 @@
 import sys
 
 import av
-from av.subtitles.subtitle import AssSubtitle, TextSubtitle
+from av.subtitles.subtitle import AssSubtitle
 
 
 def main(sys_args: list[str] = sys.argv[1:]) -> None:
     for i, input_file in enumerate(sys_args):
         with av.open(input_file) as container:
             for s in range(len(container.streams.subtitles)):
                 print(f"file: {input_file} ({s}:{container.streams.subtitles[s].name})")
-                for packet in container.demux(subtitles=s):
-                    for subset in packet.decode():
-                        for sub in subset.rects:
-                            if isinstance(sub, AssSubtitle):
-                                print(sub.ass.decode("utf-8", errors="ignore"))
-                            elif isinstance(sub, TextSubtitle):
-                                print(sub.text.decode("utf-8", errors="ignore"))
+                for subset in container.decode(subtitles=s):
+                    for sub in subset:
+                        if isinstance(sub, AssSubtitle):
+                            print(sub.ass.decode("utf-8", errors="ignore"))
         print("------")
 
 

pyproject.toml

@@ -10,7 +10,7 @@ authors = [{ name = "WyattBlue", email = "[email protected]" }]
 requires-python = ">=3.10"
 dependencies = [
     "numpy>=1.23.0",
-    "pyav==12.2.*",
+    "pyav==12.3.*",
     "ae-ffmpeg==1.2.*",
 ]
 keywords = [