auto-editor 24.29.1__py3-none-any.whl → 24.31.1__py3-none-any.whl

auto_editor/render/video.py

@@ -17,8 +17,6 @@ from auto_editor.utils.types import color
 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
             ),
@@ -213,7 +205,7 @@ def render_av(
     if apply_video_later:
         cmd += ["-c:v", "mpeg4", "-qscale:v", "1"]
     else:
-        cmd += video_quality(args, ctr)
+        cmd += video_quality(args)
 
     # Setting SAR requires re-encoding so we do it here.
     if src is not None and src.videos and (sar := src.videos[0].sar) is not None:
@@ -293,7 +285,7 @@ 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",
@@ -301,21 +293,19 @@ def render_av(
                             ),
                             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/levels.py

@@ -2,15 +2,15 @@ from __future__ import annotations
 
 import sys
 from dataclasses import dataclass, field
+from fractions import Fraction
 from typing import TYPE_CHECKING
 
 import numpy as np
 
-from auto_editor.analyze import LevelError, Levels
-from auto_editor.ffwrapper import FFmpeg, initFileInfo
+from auto_editor.analyze import LevelError, Levels, iter_audio, iter_motion
+from auto_editor.ffwrapper import initFileInfo
 from auto_editor.lang.palet import env
 from auto_editor.lib.contracts import is_bool, is_nat, is_nat1, is_str, is_void, orc
-from auto_editor.output import Ensure
 from auto_editor.utils.bar import Bar
 from auto_editor.utils.cmdkw import (
     ParserError,
@@ -25,6 +25,7 @@ from auto_editor.utils.types import frame_rate
 from auto_editor.vanparse import ArgumentParser
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator
     from fractions import Fraction
 
     from numpy.typing import NDArray
@@ -35,8 +36,6 @@ class LevelArgs:
     input: list[str] = field(default_factory=list)
     edit: str = "audio"
     timebase: Fraction | None = None
-    ffmpeg_location: str | None = None
-    my_ffmpeg: bool = False
     help: bool = False
 
 
@@ -54,12 +53,6 @@ def levels_options(parser: ArgumentParser) -> ArgumentParser:
         type=frame_rate,
         help="Set custom timebase",
     )
-    parser.add_argument("--ffmpeg-location", help="Point to your custom ffmpeg file")
-    parser.add_argument(
-        "--my-ffmpeg",
-        flag=True,
-        help="Use the ffmpeg on your PATH instead of the one packaged",
-    )
     return parser
 
 
@@ -79,12 +72,21 @@ def print_arr(arr: NDArray) -> None:
     print("")
 
 
+def print_arr_gen(arr: Iterator[int | float]) -> None:
+    print("")
+    print("@start")
+    for a in arr:
+        if isinstance(a, float):
+            print(f"{a:.20f}")
+        else:
+            print(a)
+    print("")
+
+
 def main(sys_args: list[str] = sys.argv[1:]) -> None:
     parser = levels_options(ArgumentParser("levels"))
     args = parser.parse_args(LevelArgs, sys_args)
 
-    ffmpeg = FFmpeg(args.ffmpeg_location, args.my_ffmpeg)
-
     bar = Bar("none")
     temp = setup_tempdir(None, Log())
     log = Log(quiet=True, temp=temp)
@@ -96,7 +98,6 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
     src = sources[0]
 
     tb = src.get_fps() if args.timebase is None else args.timebase
-    ensure = Ensure(ffmpeg, bar, src.get_sr(), temp, log)
 
     if ":" in args.edit:
         method, attrs = args.edit.split(":", 1)
@@ -131,12 +132,12 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
             except ParserError as e:
                 log.error(e)
 
-        levels = Levels(ensure, src, tb, bar, temp, log)
+        levels = Levels(src, tb, bar, temp, log)
         try:
             if method == "audio":
-                print_arr(levels.audio(**obj))
+                print_arr_gen(iter_audio(src, tb, **obj))
             elif method == "motion":
-                print_arr(levels.motion(**obj))
+                print_arr_gen(iter_motion(src, tb, **obj))
             elif method == "subtitle":
                 print_arr(levels.subtitle(**obj))
             elif method == "none":

auto_editor/subcommands/repl.py

@@ -6,11 +6,10 @@ from fractions import Fraction
 
 import auto_editor
 from auto_editor.analyze import FileSetup, Levels
-from auto_editor.ffwrapper import FFmpeg, initFileInfo
+from auto_editor.ffwrapper import initFileInfo
 from auto_editor.lang.palet import ClosingError, Lexer, Parser, env, interpret
 from auto_editor.lib.data_structs import print_str
 from auto_editor.lib.err import MyError
-from auto_editor.output import Ensure
 from auto_editor.utils.bar import Bar
 from auto_editor.utils.func import setup_tempdir
 from auto_editor.utils.log import Log
@@ -48,12 +47,6 @@ def repl_options(parser: ArgumentParser) -> ArgumentParser:
         type=frame_rate,
         help="Set custom timebase",
     )
-    parser.add_argument("--ffmpeg-location", help="Point to your custom ffmpeg file")
-    parser.add_argument(
-        "--my-ffmpeg",
-        flag=True,
-        help="Use the ffmpeg on your PATH instead of the one packaged",
-    )
     parser.add_argument(
         "--temp-dir",
         metavar="PATH",
@@ -68,16 +61,14 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
     if args.input:
         temp = setup_tempdir(args.temp_dir, Log())
         log = Log(quiet=True, temp=temp)
-        ffmpeg = FFmpeg(args.ffmpeg_location, args.my_ffmpeg, False)
         strict = len(args.input) < 2
         sources = [initFileInfo(path, log) for path in args.input]
         src = sources[0]
         tb = src.get_fps() if args.timebase is None else args.timebase
         bar = Bar("modern")
-        ensure = Ensure(ffmpeg, bar, src.get_sr(), temp, log)
         env["timebase"] = tb
-        env["@levels"] = Levels(ensure, src, tb, bar, temp, log)
-        env["@filesetup"] = FileSetup(src, ensure, strict, tb, bar, temp, log)
+        env["@levels"] = Levels(src, tb, bar, temp, log)
+        env["@filesetup"] = FileSetup(src, strict, tb, bar, temp, log)
 
     print(f"Auto-Editor {auto_editor.version} ({auto_editor.__version__})")
     text = None

auto_editor/subcommands/subdump.py

@@ -1,7 +1,7 @@
 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:
@@ -9,13 +9,10 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
         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("------")
 
 

auto_editor/subcommands/test.py

@@ -628,11 +628,11 @@ def main(sys_args: list[str] | None = None):
             ("(string #\\a #\\b)", "ab"),
             ("(string #\\a #\\b #\\c)", "abc"),
             (
-                "(margin 0 (bool-array 0 0 0 1 0 0 0))",
+                "(margin (bool-array 0 0 0 1 0 0 0) 0)",
                 np.array([0, 0, 0, 1, 0, 0, 0], dtype=np.bool_),
             ),
             (
-                "(margin -2 2 (bool-array 0 0 1 1 0 0 0))",
+                "(margin (bool-array 0 0 1 1 0 0 0) -2 2)",
                 np.array([0, 0, 0, 0, 1, 1, 0], dtype=np.bool_),
             ),
             ("(equal? 3 3)", True),

auto_editor/utils/container.py

@@ -1,338 +1,96 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from typing import TypedDict
 
+import av
+from av.codec import Codec
+
 
 class DictContainer(TypedDict, total=False):
-    allow_video: bool
-    allow_audio: bool
-    allow_subtitle: bool
-    allow_image: bool
     max_videos: int | None
     max_audios: int | None
     max_subtitles: int | None
-    vcodecs: list[str] | None
-    acodecs: list[str] | None
-    scodecs: list[str] | None
-    vstrict: bool
-    sstrict: bool
-    disallow_v: list[str]
     samplerate: list[int] | None
 
 
 @dataclass(slots=True)
 class Container:
-    allow_video: bool = False
-    allow_audio: bool = False
-    allow_subtitle: bool = False
-    allow_image: bool = False
+    allow_image: bool
+    vcodecs: set[str]
+    acodecs: set[str]
+    scodecs: set[str]
+    default_vid: str
+    default_aud: str
+    default_sub: str
     max_videos: int | None = None
     max_audios: int | None = None
     max_subtitles: int | None = None
-    vcodecs: list[str] | None = None
-    acodecs: list[str] | None = None
-    scodecs: list[str] | None = None
-    vstrict: bool = False
-    sstrict: bool = False
-    disallow_v: list[str] = field(default_factory=list)
     samplerate: list[int] | None = None  # Any samplerate is allowed
 
 
-h264_en = [
-    "h264",
-    "libx264",
-    "libx264rgb",
-    "libopenh264",
-    "h264_videotoolbox",
-    "h264_amf",
-    "h264_nvenc",
-    "h264_qsv",
-]
-hevc_en = ["hevc", "libx265", "hevc_videotoolbox", "hevc_amf", "hevc_nvenc", "hevc_qsv"]
-av1_en = ["av1", "libaom-av1", "av1_nvenc", "av1_amf"]
-prores_en = ["prores", "prores_videotoolbox", "prores_aw", "prores_ks"]
-aac_en = ["aac", "aac_at", "libfdk_aac"]
-opus_en = ["opus", "libopus"]
-
-h265: DictContainer = {
-    "allow_video": True,
-    "vcodecs": hevc_en + ["mpeg4"] + h264_en,
-}
-h264: DictContainer = {
-    "allow_video": True,
-    "vcodecs": h264_en + ["mpeg4"] + hevc_en,
-}
-aac: DictContainer = {
-    "allow_audio": True,
-    "max_audios": 1,
-    "acodecs": aac_en,
-}
-ass: DictContainer = {
-    "allow_subtitle": True,
-    "scodecs": ["ass", "ssa"],
-    "max_subtitles": 1,
-    "sstrict": True,
-}
-mp4: DictContainer = {
-    "allow_video": True,
-    "allow_audio": True,
-    "allow_subtitle": True,
-    "allow_image": True,
-    "vcodecs": h264_en + hevc_en + av1_en + ["vp9", "mpeg4", "mpeg2video", "mjpeg"],
-    "acodecs": aac_en + opus_en + ["mp3", "flac", "vorbis", "libvorbis", "ac3", "mp2"],
-    "vstrict": True,
-}
-ogg: DictContainer = {
-    "allow_video": True,
-    "allow_audio": True,
-    "allow_subtitle": True,
-    "vcodecs": ["libtheora", "theora"],
-    "acodecs": opus_en + ["libvorbis", "vorbis", "flac", "speex"],
-    "vstrict": True,
+containers: dict[str, DictContainer] = {
+    "aac": {"max_audios": 1},
+    "adts": {"max_audios": 1},
+    "ass": {"max_subtitles": 1},
+    "ssa": {"max_subtitles": 1},
+    "apng": {"max_videos": 1},
+    "gif": {"max_videos": 1},
+    "wav": {"max_audios": 1},
+    "ast": {"max_audios": 1},
+    "mp3": {"max_audios": 1},
+    "flac": {"max_audios": 1},
+    "srt": {"max_subtitles": 1},
+    "vtt": {"max_subtitles": 1},
+    "swf": {"samplerate": [44100, 22050, 11025]},
 }
 
-mka_audio = (
-    ["libvorbis", "vorbis"]
-    + aac_en
-    + opus_en
-    + [
-        "mp3",
-        "flac",
-        "ac3",
-        "mp2",
-        "wmav2",
-        "pcm_s16le",
-        "pcm_alaw",
-        "pcm_f32le",
-        "pcm_f64le",
-        "pcm_mulaw",
-        "pcm_s16be",
-        "pcm_s24be",
-        "pcm_s24le",
-        "pcm_s32be",
-        "pcm_s32le",
-        "pcm_u8",
-    ]
-)
 
-containers: dict[str, DictContainer] = {
-    # Aliases section
-    "aac": aac,
-    "adts": aac,
-    "ass": ass,
-    "ssa": ass,
-    "264": h264,
-    "h264": h264,
-    "265": h265,
-    "h265": h265,
-    "hevc": h265,
-    "mp4": mp4,
-    "m4a": mp4,
-    "ogg": ogg,
-    "ogv": ogg,
-    "apng": {
-        "allow_video": True,
-        "max_videos": 1,
-        "vcodecs": ["apng"],
-        "vstrict": True,
-    },
-    "gif": {
-        "allow_video": True,
-        "max_videos": 1,
-        "vcodecs": ["gif"],
-        "vstrict": True,
-    },
-    "wav": {
-        "allow_audio": True,
-        "max_audios": 1,
-        "acodecs": [
-            "pcm_s16le",
-            "mp3",
-            "mp2",
-            "wmav2",
-            "pcm_alaw",
-            "pcm_f32le",
-            "pcm_f64le",
-            "pcm_mulaw",
-            "pcm_s24le",
-            "pcm_s32le",
-            "pcm_u8",
-        ],
-    },
-    "ast": {
-        "allow_audio": True,
-        "max_audios": 1,
-        "acodecs": ["pcm_s16be_planar"],
-    },
-    "mp3": {
-        "allow_audio": True,
-        "max_audios": 1,
-        "acodecs": ["mp3"],
-    },
-    "opus": {
-        "allow_audio": True,
-        "acodecs": opus_en + ["flac", "libvorbis", "vorbis", "speex"],
-    },
-    "oga": {
-        "allow_audio": True,
-        "acodecs": opus_en + ["flac", "libvorbis", "vorbis", "speex"],
-    },
-    "flac": {
-        "allow_audio": True,
-        "max_audios": 1,
-        "acodecs": ["flac"],
-    },
-    "webm": {
-        "allow_video": True,
-        "allow_audio": True,
-        "allow_subtitle": True,
-        "vcodecs": ["vp9", "vp8"] + av1_en,
-        "acodecs": opus_en + ["vorbis", "libvorbis"],
-        "scodecs": ["webvtt"],
-        "vstrict": True,
-        "sstrict": True,
-    },
-    "srt": {
-        "allow_subtitle": True,
-        "scodecs": ["srt"],
-        "max_subtitles": 1,
-        "sstrict": True,
-    },
-    "vtt": {
-        "allow_subtitle": True,
-        "scodecs": ["webvtt"],
-        "max_subtitles": 1,
-        "sstrict": True,
-    },
-    "avi": {
-        "allow_video": True,
-        "allow_audio": True,
-        "vcodecs": ["mpeg4"] + h264_en + ["prores", "mjpeg", "mpeg2video", "rawvideo"],
-        "acodecs": ["mp3"]
-        + aac_en
-        + [
-            "flac",
-            "vorbis",
-            "libvorbis",
-            "mp2",
-            "wmav2",
-            "pcm_s16le",
-            "pcm_alaw",
-            "pcm_f32le",
-            "pcm_f64le",
-            "pcm_mulaw",
-            "pcm_s24le",
-            "pcm_s32le",
-            "pcm_u8",
-        ],
-        "disallow_v": hevc_en + ["apng", "gif"],
-    },
-    "wmv": {
-        "allow_video": True,
-        "allow_audio": True,
-        "vcodecs": ["msmpeg4v3"]
-        + h264_en
-        + ["mpeg4", "mpeg2video", "mjpeg", "rawvideo"],
-        "acodecs": ["wmav2"]
-        + aac_en
-        + [
-            "mp3",
-            "flac",
-            "vorbis",
-            "libvorbis",
-            "ac3",
-            "mp2",
-            "pcm_s16le",
-            "pcm_alaw",
-            "pcm_f32le",
-            "pcm_f64le",
-            "pcm_mulaw",
-            "pcm_s24le",
-            "pcm_s32le",
-            "pcm_u8",
-        ],
-        "vstrict": True,
-    },
-    "mkv": {
-        "allow_video": True,
-        "allow_audio": True,
-        "allow_subtitle": True,
-        "allow_image": True,
-        "vcodecs": h264_en
-        + hevc_en
-        + prores_en
-        + [
-            "vp9",
-            "vp8",
-            "mpeg4",
-            "mpeg2video",
-            "msmpeg4v3",
-            "mjpeg",
-            "gif",
-            "rawvideo",
-        ],
-        "acodecs": mka_audio,
-        "disallow_v": ["apng"],
-    },
-    "mka": {
-        "allow_audio": True,
-        "acodecs": mka_audio,
-    },
-    "mov": {
-        "allow_video": True,
-        "allow_audio": True,
-        "allow_subtitle": True,
-        "vcodecs": h264_en
-        + hevc_en
-        + prores_en
-        + [
-            "mpeg4",
-            "mpeg2video",
-            "msmpeg4v3",
-            "mjpeg",
-            "gif",
-            "flv1",
-            "dvvideo",
-            "rawvideo",
-        ],
-        "acodecs": aac_en
-        + [
-            "mp3",
-            "vorbis",
-            "libvorbis",
-            "ac3",
-            "mp2",
-            "wmav2",
-            "pcm_s16le",
-            "pcm_alaw",
-            "pcm_f32be",
-            "pcm_f32le",
-            "pcm_f64be",
-            "pcm_f64le",
-            "pcm_mulaw",
-            "pcm_s16be",
-            "pcm_s24be",
-            "pcm_s24le",
-            "pcm_s32be",
-            "pcm_s32le",
-            "pcm_s8",
-            "pcm_u8",
-        ],
-        "disallow_v": ["apng", "vp9", "vp8"],
-    },
-    "swf": {
-        "allow_video": True,
-        "allow_audio": True,
-        "vcodecs": ["flv1", "mjpeg"],
-        "acodecs": ["mp3"],
-        "vstrict": True,
-        "samplerate": [44100, 22050, 11025],
-    },
-}
+def codec_type(x: str) -> str:
+    if x in ("vp9", "vp8", "h264", "hevc", "av1", "gif", "apng"):
+        return "video"
+    if x in ("aac", "flac", "mp3"):
+        return "audio"
+    if x in ("ass", "ssa", "srt"):
+        return "subtitle"
+
+    try:
+        return Codec(x, "r").type
+    except Exception:
+        try:
+            return Codec(x, "w").type
+        except Exception:
+            return ""
+
+
+def container_constructor(ext: str) -> Container:
+    with av.open(f".{ext}", "w") as container:
+        codecs = container.supported_codecs
+        if ext == "webm":
+            vdefault = "vp9"
+        else:
+            vdefault = container.default_video_codec
+        adefault = container.default_audio_codec
+        sdefault = container.default_subtitle_codec
+
+    vcodecs = set()
+    acodecs = set()
+    scodecs = set()
+
+    for codec in codecs:
+        kind = codec_type(codec)
+        if kind == "video":
+            vcodecs.add(codec)
+            if codec == "h264":
+                vcodecs.add("libx264")
+        if kind == "audio":
+            acodecs.add(codec)
+        if kind == "subtitle":
+            scodecs.add(codec)
 
+    allow_image = ext in ("mp4", "mkv")
+    kwargs = containers[ext] if ext in containers else {}
 
-def container_constructor(key: str) -> Container:
-    if key in containers:
-        return Container(**containers[key])
-    return Container(allow_video=True, allow_audio=True, allow_subtitle=True)
+    return Container(
+        allow_image, vcodecs, acodecs, scodecs, vdefault, adefault, sdefault, **kwargs
+    )