auto-editor 24.25.1__tar.gz → 24.29.1__tar.gz

{auto_editor-24.25.1/auto_editor.egg-info → auto_editor-24.29.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-editor
-Version: 24.25.1
+Version: 24.29.1
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
 License: Unlicense
@@ -11,8 +11,8 @@ Keywords: video,audio,media,editor,editing,processing,nonlinear,automatic,silenc
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy>=1.22.0
-Requires-Dist: pyav==12.1.0
+Requires-Dist: numpy>=1.23.0
+Requires-Dist: pyav==12.2.*
 Requires-Dist: ae-ffmpeg==1.2.*
 
 <p align="center"><img src="https://auto-editor.com/img/auto-editor-banner.webp" title="Auto-Editor" width="700"></p>
@@ -182,6 +182,3 @@ auto-editor --margin --help
 
 ## Copyright
 Auto-Editor is under the [Public Domain](https://github.com/WyattBlue/auto-editor/blob/master/LICENSE) and includes all directories besides the ones listed below. Auto-Editor was created by [these people.](https://auto-editor.com/blog/thank-you-early-testers)
-
-ae-ffmpeg is under the [LGPLv3 License](https://github.com/WyattBlue/auto-editor/blob/master/ae-ffmpeg/LICENSE.txt). The ffmpeg and ffprobe programs were created by the FFmpeg team.
-

{auto_editor-24.25.1 → auto_editor-24.29.1}/README.md

@@ -165,6 +165,3 @@ auto-editor --margin --help
 
 ## Copyright
 Auto-Editor is under the [Public Domain](https://github.com/WyattBlue/auto-editor/blob/master/LICENSE) and includes all directories besides the ones listed below. Auto-Editor was created by [these people.](https://auto-editor.com/blog/thank-you-early-testers)
-
-ae-ffmpeg is under the [LGPLv3 License](https://github.com/WyattBlue/auto-editor/blob/master/ae-ffmpeg/LICENSE.txt). The ffmpeg and ffprobe programs were created by the FFmpeg team.
-

auto_editor-24.29.1/auto_editor/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "24.29.1"
+version = "24w29a"

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/__main__.py

@@ -311,10 +311,10 @@ def main() -> None:
 
         import av
 
-        print(f"Python Version: {plat.python_version()}")
-        print(f"Platform: {plat.system()} {plat.release()} {plat.machine().lower()}")
-        print(f"PyAV Version: {av.__version__}")
-        print(f"Auto-Editor Version: {auto_editor.version}")
+        print(f"OS: {plat.system()} {plat.release()} {plat.machine().lower()}")
+        print(f"Python: {plat.python_version()}")
+        print(f"PyAV: {av.__version__}")
+        print(f"Auto-Editor: {auto_editor.version}")
         return
 
     if not args.input:

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/analyze.py

@@ -9,22 +9,6 @@ from typing import TYPE_CHECKING
 import numpy as np
 
 from auto_editor import version
-from auto_editor.lang.json import Lexer, Parser, dump
-from auto_editor.lib.contracts import (
-    is_bool,
-    is_nat,
-    is_nat1,
-    is_str,
-    is_threshold,
-    is_void,
-    orc,
-)
-from auto_editor.lib.data_structs import Sym
-from auto_editor.utils.cmdkw import (
-    Required,
-    pAttr,
-    pAttrs,
-)
 from auto_editor.utils.subtitle_tools import convert_ass_to_text
 from auto_editor.wavfile import read
 
@@ -41,35 +25,6 @@ if TYPE_CHECKING:
     from auto_editor.utils.log import Log
 
 
-audio_builder = pAttrs(
-    "audio",
-    pAttr("threshold", 0.04, is_threshold),
-    pAttr("stream", 0, orc(is_nat, Sym("all"), "all")),
-    pAttr("mincut", 6, is_nat),
-    pAttr("minclip", 3, is_nat),
-)
-motion_builder = pAttrs(
-    "motion",
-    pAttr("threshold", 0.02, is_threshold),
-    pAttr("stream", 0, is_nat),
-    pAttr("blur", 9, is_nat),
-    pAttr("width", 400, is_nat1),
-)
-subtitle_builder = pAttrs(
-    "subtitle",
-    pAttr("pattern", Required, is_str),
-    pAttr("stream", 0, is_nat),
-    pAttr("ignore-case", False, is_bool),
-    pAttr("max-count", None, orc(is_nat, is_void)),
-)
-
-builder_map = {
-    "audio": audio_builder,
-    "motion": motion_builder,
-    "subtitle": subtitle_builder,
-}
-
-
 @dataclass(slots=True)
 class FileSetup:
     src: FileInfo
@@ -90,10 +45,6 @@ def link_nodes(*nodes: FilterContext) -> None:
         c.link_to(n)
 
 
-def to_threshold(arr: np.ndarray, t: int | float) -> NDArray[np.bool_]:
-    return np.fromiter((x >= t for x in arr), dtype=np.bool_)
-
-
 def mut_remove_small(
     arr: NDArray[np.bool_], lim: int, replace: int, with_: int
 ) -> None:
@@ -193,63 +144,43 @@ class Levels:
 
     def read_cache(self, tag: str, obj: dict[str, Any]) -> None | np.ndarray:
         workfile = os.path.join(
-            os.path.dirname(self.temp), f"ae-{version}", "cache.json"
+            os.path.dirname(self.temp), f"ae-{version}", "cache.npz"
         )
 
         try:
-            with open(workfile, encoding="utf-8") as file:
-                cache = Parser(Lexer(workfile, file)).expr()
-        except Exception:
+            npzfile = np.load(workfile, allow_pickle=False)
+        except Exception as e:
+            self.log.debug(e)
             return None
 
-        if f"{self.src.path.resolve()}" not in cache:
+        key = f"{self.src.path}:{obj_tag(tag, self.tb, obj)}"
+        if key not in npzfile.files:
             return None
 
-        key = obj_tag(tag, self.tb, obj)
-
-        if key not in (root := cache[f"{self.src.path.resolve()}"]):
-            return None
-
-        return np.asarray(root[key]["arr"], dtype=root[key]["type"])
+        self.log.debug("Using cache")
+        return npzfile[key]
 
     def cache(self, tag: str, obj: dict[str, Any], arr: np.ndarray) -> np.ndarray:
         workdur = os.path.join(os.path.dirname(self.temp), f"ae-{version}")
-        workfile = os.path.join(workdur, "cache.json")
         if not os.path.exists(workdur):
             os.mkdir(workdur)
 
-        key = obj_tag(tag, self.tb, obj)
-
-        try:
-            with open(workfile, encoding="utf-8") as file:
-                json_object = Parser(Lexer(workfile, file)).expr()
-        except Exception:
-            json_object = {}
-
-        entry = {"type": str(arr.dtype), "arr": arr.tolist()}
-        src_key = f"{self.src.path}"
-
-        if src_key in json_object:
-            json_object[src_key][key] = entry
-        else:
-            json_object[src_key] = {key: entry}
-
-        with open(os.path.join(workdur, "cache.json"), "w", encoding="utf-8") as file:
-            dump(json_object, file)
+        tag = obj_tag(tag, self.tb, obj)
+        np.savez(os.path.join(workdur, "cache.npz"), **{f"{self.src.path}:{tag}": arr})
 
         return arr
 
-    def audio(self, s: int) -> NDArray[np.float64]:
-        if s > len(self.src.audios) - 1:
-            raise LevelError(f"audio: audio stream '{s}' does not exist.")
+    def audio(self, stream: int) -> NDArray[np.float64]:
+        if stream > len(self.src.audios) - 1:
+            raise LevelError(f"audio: audio stream '{stream}' does not exist.")
 
-        if (arr := self.read_cache("audio", {"stream": s})) is not None:
+        if (arr := self.read_cache("audio", {"stream": stream})) is not None:
             return arr
 
-        sr, samples = read(self.ensure.audio(self.src, s))
+        sr, samples = read(self.ensure.audio(self.src, stream))
 
         if len(samples) == 0:
-            raise LevelError(f"audio: stream '{s}' has no samples.")
+            raise LevelError(f"audio: stream '{stream}' has no samples.")
 
         def get_max_volume(s: np.ndarray) -> float:
             return max(float(np.max(s)), -float(np.min(s)))
@@ -262,7 +193,7 @@ class Levels:
 
         if samp_per_ticks < 1:
             self.log.error(
-                f"audio: stream '{s}'\n  Samplerate ({sr}) must be greater than "
+                f"audio: stream '{stream}'\n  Samplerate ({sr}) must be greater than "
                 f"or equal to timebase ({self.tb})\n"
                 "  Try `-fps 30` and/or `--sample-rate 48000`"
             )
@@ -289,11 +220,11 @@ class Levels:
             threshold_list[i] = get_max_volume(samples[start:end]) / max_volume
 
         self.bar.end()
-        return self.cache("audio", {"stream": s}, threshold_list)
+        return self.cache("audio", {"stream": stream}, threshold_list)
 
     def subtitle(
         self,
-        patterns: str,
+        pattern: str,
         stream: int,
         ignore_case: bool,
         max_count: int | None,
@@ -303,8 +234,7 @@ class Levels:
 
         try:
             flags = re.IGNORECASE if ignore_case else 0
-            pattern = re.compile(patterns, flags)
-            del patterns  # make sure we don't accidentally use it
+            re_pattern = re.compile(pattern, flags)
         except re.error as e:
             self.log.error(e)
 
@@ -362,7 +292,7 @@ class Levels:
                     else:
                         continue
 
-                    if line and re.search(pattern, line):
+                    if line and re.search(re_pattern, line):
                         result[san_start:san_end] = 1
                         count += 1
 
@@ -370,22 +300,22 @@ class Levels:
 
         return result
 
-    def motion(self, s: int, blur: int, width: int) -> NDArray[np.float64]:
+    def motion(self, stream: int, blur: int, width: int) -> NDArray[np.float64]:
         import av
 
-        if s >= len(self.src.videos):
-            raise LevelError(f"motion: video stream '{s}' does not exist.")
+        if stream >= len(self.src.videos):
+            raise LevelError(f"motion: video stream '{stream}' does not exist.")
 
-        mobj = {"stream": s, "width": width, "blur": blur}
+        mobj = {"stream": stream, "width": width, "blur": blur}
         if (arr := self.read_cache("motion", mobj)) is not None:
             return arr
 
         container = av.open(f"{self.src.path}", "r")
 
-        stream = container.streams.video[s]
-        stream.thread_type = "AUTO"
+        video = container.streams.video[stream]
+        video.thread_type = "AUTO"
 
-        inaccurate_dur = 1 if stream.duration is None else stream.duration
+        inaccurate_dur = 1 if video.duration is None else video.duration
         self.bar.start(inaccurate_dur, "Analyzing motion")
 
         prev_frame = None
@@ -395,7 +325,7 @@ class Levels:
 
         graph = av.filter.Graph()
         link_nodes(
-            graph.add_buffer(template=stream),
+            graph.add_buffer(template=video),
             graph.add("scale", f"{width}:-1"),
             graph.add("format", "gray"),
             graph.add("gblur", f"sigma={blur}"),
@@ -405,7 +335,7 @@ class Levels:
 
         threshold_list = np.zeros((1024), dtype=np.float64)
 
-        for unframe in container.decode(stream):
+        for unframe in container.decode(video):
             graph.push(unframe)
             frame = graph.pull()
 

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/edit.py

@@ -160,7 +160,7 @@ def edit_media(
         if path_ext == ".xml":
             from auto_editor.formats.fcp7 import fcp7_read_xml
 
-            tl = fcp7_read_xml(paths[0], ffmpeg, log)
+            tl = fcp7_read_xml(paths[0], log)
             assert tl.src is not None
             sources: list[FileInfo] = [tl.src]
             src: FileInfo | None = tl.src
@@ -168,7 +168,7 @@ def edit_media(
         elif path_ext == ".mlt":
             from auto_editor.formats.shotcut import shotcut_read_mlt
 
-            tl = shotcut_read_mlt(paths[0], ffmpeg, log)
+            tl = shotcut_read_mlt(paths[0], log)
             assert tl.src is not None
             sources = [tl.src]
             src = tl.src
@@ -209,7 +209,7 @@ def edit_media(
     else:
         samplerate = args.sample_rate
 
-    ensure = Ensure(ffmpeg, samplerate, temp, log)
+    ensure = Ensure(ffmpeg, bar, samplerate, temp, log)
 
     if tl is None:
         tl = make_timeline(sources, ensure, args, samplerate, bar, temp, log)

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/ffwrapper.py

@@ -11,6 +11,8 @@ from shutil import which
 from subprocess import PIPE, Popen
 from typing import Any
 
+import av
+
 from auto_editor.utils.func import get_stdout
 from auto_editor.utils.log import Log
 
@@ -190,10 +192,12 @@ class FileInfo:
 
 
 def initFileInfo(path: str, log: Log) -> FileInfo:
-    import av
-
     try:
         cont = av.open(path, "r")
+    except av.error.FileNotFoundError:
+        log.error(f"Could not find '{path}'")
+    except av.error.IsADirectoryError:
+        log.error(f"Expected a media file, but got a directory: {path}")
     except av.error.InvalidDataError:
         log.error(f"Invalid data when processing: {path}")
 

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/formats/fcp7.py

@@ -7,7 +7,7 @@ from math import ceil
 from typing import TYPE_CHECKING
 from xml.etree.ElementTree import Element
 
-from auto_editor.ffwrapper import FFmpeg, FileInfo, initFileInfo
+from auto_editor.ffwrapper import FileInfo, initFileInfo
 from auto_editor.timeline import ASpace, TlAudio, TlVideo, VSpace, v3
 
 from .utils import Validator, show
@@ -177,7 +177,7 @@ def read_filters(clipitem: Element, log: Log) -> float:
     return 1.0
 
 
-def fcp7_read_xml(path: str, ffmpeg: FFmpeg, log: Log) -> v3:
+def fcp7_read_xml(path: str, log: Log) -> v3:
     def xml_bool(val: str) -> bool:
         if val == "TRUE":
             return True

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/formats/shotcut.py

@@ -9,7 +9,6 @@ from auto_editor.utils.func import aspect_ratio, to_timecode
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
-    from auto_editor.ffwrapper import FFmpeg
     from auto_editor.timeline import TlAudio, TlVideo
     from auto_editor.utils.log import Log
 
@@ -22,7 +21,7 @@ https://mltframework.org/docs/mltxml/
 """
 
 
-def shotcut_read_mlt(path: str, ffmpeg: FFmpeg, log: Log) -> v3:
+def shotcut_read_mlt(path: str, log: Log) -> v3:
     raise NotImplementedError
 
 

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/lang/palet.py

@@ -18,12 +18,7 @@ from typing import TYPE_CHECKING
 import numpy as np
 from numpy import logical_and, logical_not, logical_or, logical_xor
 
-from auto_editor.analyze import (
-    LevelError,
-    mut_remove_large,
-    mut_remove_small,
-    to_threshold,
-)
+from auto_editor.analyze import LevelError, mut_remove_large, mut_remove_small
 from auto_editor.lib.contracts import *
 from auto_editor.lib.data_structs import *
 from auto_editor.lib.err import MyError
@@ -690,6 +685,9 @@ def palet_map(proc: Proc, seq: Any) -> Any:
         return Quoted(tuple(map(proc, seq.val)))
     if isinstance(seq, list | range):
         return list(map(proc, seq))
+    elif isinstance(seq, np.ndarray):
+        vectorized_proc = np.vectorize(proc)
+        return vectorized_proc(seq)
     return proc(seq)
 
 
@@ -1469,6 +1467,26 @@ def edit_all() -> np.ndarray:
     return env["@levels"].all()
 
 
+def audio_levels(stream: int) -> np.ndarray:
+    if "@levels" not in env:
+        raise MyError("Can't use `audio` if there's no input media")
+
+    try:
+        return env["@levels"].audio(stream)
+    except LevelError as e:
+        raise MyError(e)
+
+
+def motion_levels(stream: int, blur: int = 9, width: int = 400) -> np.ndarray:
+    if "@levels" not in env:
+        raise MyError("Can't use `motion` if there's no input media")
+
+    try:
+        return env["@levels"].motion(stream, blur, width)
+    except LevelError as e:
+        raise MyError(e)
+
+
 def edit_audio(
     threshold: float = 0.04,
     stream: object = Sym("all"),
@@ -1491,7 +1509,7 @@ def edit_audio(
 
     try:
         for s in stream_range:
-            audio_list = to_threshold(levels.audio(s), threshold)
+            audio_list = levels.audio(s) >= threshold
             if stream_data is None:
                 stream_data = audio_list
             else:
@@ -1521,7 +1539,7 @@ def edit_motion(
     levels = env["@levels"]
     strict = env["@filesetup"].strict
     try:
-        return to_threshold(levels.motion(stream, blur, width), threshold)
+        return levels.motion(stream, blur, width) >= threshold
     except LevelError as e:
         return raise_(e) if strict else levels.all()
 
@@ -1582,7 +1600,7 @@ def my_eval(env: Env, node: object) -> Any:
                     return ref(oper, my_eval(env, node[1]))
 
             raise MyError(
-                f"Tried to run: {print_str(oper)} with args: {print_str(node[1:])}"
+                f"{print_str(oper)} is not a function. Tried to run with args: {print_str(node[1:])}"
             )
 
         if type(oper) is Syntax:
@@ -1617,10 +1635,12 @@ env.update({
     # edit procedures
     "none": Proc("none", edit_none, (0, 0)),
     "all/e": Proc("all/e", edit_all, (0, 0)),
+    "audio-levels": Proc("audio-levels", audio_levels, (1, 1), is_nat),
     "audio": Proc("audio", edit_audio, (0, 4),
         is_threshold, orc(is_nat, Sym("all")), is_nat,
         {"threshold": 0, "stream": 1, "minclip": 2, "mincut": 2}
     ),
+    "motion-levels": Proc("motion-levels", motion_levels, (1, 3), is_nat, is_nat1, {"blur": 1, "width": 2}),
     "motion": Proc("motion", edit_motion, (0, 4),
         is_threshold, is_nat, is_nat1,
         {"threshold": 0, "stream": 1, "blur": 1, "width": 2}

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/lib/contracts.py

@@ -5,6 +5,8 @@ from dataclasses import dataclass
 from fractions import Fraction
 from typing import Any
 
+from numpy import float64
+
 from .data_structs import Sym, print_str
 from .err import MyError
 
@@ -41,7 +43,7 @@ def check_contract(c: object, val: object) -> bool:
         return val is True
     if c is False:
         return val is False
-    if type(c) in (int, float, Fraction, complex, str, Sym):
+    if type(c) in (int, float, float64, Fraction, complex, str, Sym):
         return val == c
     raise MyError(f"Invalid contract, got: {print_str(c)}")
 
@@ -163,17 +165,21 @@ is_int = Contract("int?", lambda v: type(v) is int)
 is_nat = Contract("nat?", lambda v: type(v) is int and v > -1)
 is_nat1 = Contract("nat1?", lambda v: type(v) is int and v > 0)
 int_not_zero = Contract("(or/c (not/c 0) int?)", lambda v: v != 0 and is_int(v))
-is_num = Contract("number?", lambda v: type(v) in (int, float, Fraction, complex))
-is_real = Contract("real?", lambda v: type(v) in (int, float, Fraction))
-is_float = Contract("float?", lambda v: type(v) is float)
+is_num = Contract(
+    "number?", lambda v: type(v) in (int, float, float64, Fraction, complex)
+)
+is_real = Contract("real?", lambda v: type(v) in (int, float, float64, Fraction))
+is_float = Contract("float?", lambda v: type(v) in (float, float64))
 is_frac = Contract("frac?", lambda v: type(v) is Fraction)
 is_str = Contract("string?", lambda v: type(v) is str)
 any_p = Contract("any", lambda v: True)
 is_void = Contract("void?", lambda v: v is None)
-is_int_or_float = Contract("(or/c int? float?)", lambda v: type(v) in (int, float))
+is_int_or_float = Contract(
+    "(or/c int? float?)", lambda v: type(v) in (int, float, float64)
+)
 is_threshold = Contract(
     "threshold?",
-    lambda v: type(v) in (int, float) and v >= 0 and v <= 1,  # type: ignore
+    lambda v: type(v) in (int, float, float64) and v >= 0 and v <= 1,  # type: ignore
 )
 is_proc = Contract("procedure?", lambda v: isinstance(v, Proc | Contract))
 

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/make_layers.py

@@ -38,7 +38,7 @@ def clipify(chunks: Chunks, src: FileInfo, start: int = 0) -> list[Clip]:
     clips: list[Clip] = []
     i = 0
     for chunk in chunks:
-        if chunk[2] != 99999:
+        if chunk[2] > 0 and chunk[2] < 99999.0:
             dur = round((chunk[1] - chunk[0]) / chunk[2])
             if dur == 0:
                 continue
@@ -296,22 +296,4 @@ def make_timeline(
     else:
         v1_compatiable = None
 
-    tl = v3(inp, tb, sr, res, args.background, vtl, atl, v1_compatiable)
-
-    # Additional monotonic check, o(n^2) time complexity so disable by default.
-
-    # if len(sources) != 1:
-    #     return tl
-
-    # last_i = 0
-    # for index in range(tl.end):
-    #     for layer in tl.v:
-    #         for lobj in layer:
-    #             if index >= lobj.start and index < (lobj.start + lobj.dur):
-    #                 _i = round((lobj.offset + index - lobj.start) * lobj.speed)
-    #                 if (_i < last_i):
-    #                     print(_i, last_i)
-    #                     raise ValueError("not monotonic")
-    #                 last_i = _i
-
-    return tl
+    return v3(inp, tb, sr, res, args.background, vtl, atl, v1_compatiable)

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/output.py

@@ -4,7 +4,11 @@ import os.path
 from dataclasses import dataclass, field
 from fractions import Fraction
 
+import av
+from av.audio.resampler import AudioResampler
+
 from auto_editor.ffwrapper import FFmpeg, FileInfo
+from auto_editor.utils.bar import Bar
 from auto_editor.utils.container import Container
 from auto_editor.utils.log import Log
 from auto_editor.utils.types import Args
@@ -13,6 +17,7 @@ from auto_editor.utils.types import Args
 @dataclass(slots=True)
 class Ensure:
     _ffmpeg: FFmpeg
+    _bar: Bar
     _sr: int
     temp: str
     log: Log
@@ -31,12 +36,42 @@ class Ensure:
         out_path = os.path.join(self.temp, f"{label:x}.wav")
 
         if first_time:
+            sample_rate = self._sr
+            bar = self._bar
             self.log.debug(f"Making external audio: {out_path}")
-            self.log.conwrite("Extracting audio")
 
-            cmd = ["-i", f"{src.path}", "-map", f"0:a:{stream}"]
-            cmd += ["-ac", "2", "-ar", f"{self._sr}", "-rf64", "always", out_path]
-            self._ffmpeg.run(cmd)
+            in_container = av.open(src.path, "r")
+            out_container = av.open(
+                out_path, "w", format="wav", options={"rf64": "always"}
+            )
+            astream = in_container.streams.audio[stream]
+
+            if astream.duration is None or astream.time_base is None:
+                dur = 1
+            else:
+                dur = int(astream.duration * astream.time_base)
+
+            bar.start(dur, "Extracting audio")
+
+            # PyAV always uses "stereo" layout, which is what we want.
+            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
+            for i, frame in enumerate(in_container.decode(astream)):
+                if i % 1500 == 0:
+                    bar.tick(0 if frame.time is None else frame.time)
+
+                for new_frame in resampler.resample(frame):
+                    for packet in output_astream.encode(new_frame):
+                        out_container.mux_one(packet)
+
+            for packet in output_astream.encode():
+                out_container.mux_one(packet)
+
+            out_container.close()
+            in_container.close()
+            bar.end()
 
         return out_path
 

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/render/video.py

@@ -103,8 +103,8 @@ def make_image_cache(tl: v3) -> dict[tuple[FileInfo, int], np.ndarray]:
                                 graph.add("scale", f"{obj.width}:-1"),
                                 graph.add("buffersink"),
                             )
-                            graph.push(frame)
-                            frame = graph.pull()
+                            graph.vpush(frame)
+                            frame = graph.vpull()
                         img_cache[(obj.src, obj.width)] = frame.to_ndarray(
                             format="rgb24"
                         )
@@ -122,7 +122,7 @@ def render_av(
     log: Log,
 ) -> tuple[str, bool]:
     src = tl.src
-    cns: dict[FileInfo, av.InputContainer] = {}
+    cns: dict[FileInfo, av.container.InputContainer] = {}
     decoders: dict[FileInfo, Iterator[av.VideoFrame]] = {}
     seek_cost: dict[FileInfo, int] = {}
     tous: dict[FileInfo, int] = {}
@@ -302,8 +302,8 @@ def render_av(
                             graph.add("pad", f"{width}:{height}:-1:-1:color={bg}"),
                             graph.add("buffersink"),
                         )
-                        graph.push(frame)
-                        frame = graph.pull()
+                        graph.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)
@@ -315,8 +315,8 @@ def render_av(
                         ),
                         graph.add("buffersink"),
                     )
-                    graph.push(frame)
-                    frame = graph.pull()
+                    graph.vpush(frame)
+                    frame = graph.vpull()
                 elif isinstance(obj, TlImage):
                     img = img_cache[(obj.src, obj.width)]
                     array = frame.to_ndarray(format="rgb24")
@@ -355,8 +355,8 @@ def render_av(
                     frame = av.VideoFrame.from_ndarray(array, format="rgb24")
 
             if scale_graph is not None and frame.width != target_width:
-                scale_graph.push(frame)
-                frame = scale_graph.pull()
+                scale_graph.vpush(frame)
+                frame = scale_graph.vpull()
 
             if frame.format.name != target_pix_fmt:
                 frame = frame.reformat(format=target_pix_fmt)

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/subcommands/levels.py

@@ -6,12 +6,19 @@ from typing import TYPE_CHECKING
 
 import numpy as np
 
-from auto_editor.analyze import LevelError, Levels, builder_map
+from auto_editor.analyze import LevelError, Levels
 from auto_editor.ffwrapper import FFmpeg, 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, parse_with_palet
+from auto_editor.utils.cmdkw import (
+    ParserError,
+    Required,
+    parse_with_palet,
+    pAttr,
+    pAttrs,
+)
 from auto_editor.utils.func import setup_tempdir
 from auto_editor.utils.log import Log
 from auto_editor.utils.types import frame_rate
@@ -57,6 +64,8 @@ def levels_options(parser: ArgumentParser) -> ArgumentParser:
 
 
 def print_arr(arr: NDArray) -> None:
+    print("")
+    print("@start")
     if arr.dtype == np.float64:
         for a in arr:
             sys.stdout.write(f"{a:.20f}\n")
@@ -66,6 +75,8 @@ def print_arr(arr: NDArray) -> None:
     else:
         for a in arr:
             sys.stdout.write(f"{a}\n")
+    sys.stdout.flush()
+    print("")
 
 
 def main(sys_args: list[str] = sys.argv[1:]) -> None:
@@ -85,44 +96,49 @@ 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, src.get_sr(), temp, log)
+    ensure = Ensure(ffmpeg, bar, src.get_sr(), temp, log)
 
     if ":" in args.edit:
         method, attrs = args.edit.split(":", 1)
     else:
         method, attrs = args.edit, ""
 
-    for src in sources:
-        print("")
-        print("@start")
+    audio_builder = pAttrs("audio", pAttr("stream", 0, is_nat))
+    motion_builder = pAttrs(
+        "motion",
+        pAttr("stream", 0, is_nat),
+        pAttr("blur", 9, is_nat),
+        pAttr("width", 400, is_nat1),
+    )
+    subtitle_builder = pAttrs(
+        "subtitle",
+        pAttr("pattern", Required, is_str),
+        pAttr("stream", 0, is_nat),
+        pAttr("ignore-case", False, is_bool),
+        pAttr("max-count", None, orc(is_nat, is_void)),
+    )
 
-        levels = Levels(ensure, src, tb, bar, temp, log)
+    builder_map = {
+        "audio": audio_builder,
+        "motion": motion_builder,
+        "subtitle": subtitle_builder,
+    }
 
+    for src in sources:
         if method in builder_map:
-            builder = builder_map[method]
-
             try:
-                obj = parse_with_palet(attrs, builder, env)
+                obj = parse_with_palet(attrs, builder_map[method], env)
             except ParserError as e:
                 log.error(e)
 
-            if "threshold" in obj:
-                del obj["threshold"]
-
+        levels = Levels(ensure, src, tb, bar, temp, log)
         try:
             if method == "audio":
-                print_arr(levels.audio(obj["stream"]))
+                print_arr(levels.audio(**obj))
             elif method == "motion":
-                print_arr(levels.motion(obj["stream"], obj["blur"], obj["width"]))
+                print_arr(levels.motion(**obj))
             elif method == "subtitle":
-                print_arr(
-                    levels.subtitle(
-                        obj["pattern"],
-                        obj["stream"],
-                        obj["ignore_case"],
-                        obj["max_count"],
-                    )
-                )
+                print_arr(levels.subtitle(**obj))
             elif method == "none":
                 print_arr(levels.none())
             elif method == "all/e":
@@ -132,8 +148,6 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
         except LevelError as e:
             log.error(e)
 
-    sys.stdout.flush()
-    print("")
     log.cleanup()
 
 

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/subcommands/repl.py

@@ -73,8 +73,8 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
         sources = [initFileInfo(path, log) for path in args.input]
         src = sources[0]
         tb = src.get_fps() if args.timebase is None else args.timebase
-        ensure = Ensure(ffmpeg, src.get_sr(), temp, log)
-        bar = Bar("none")
+        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)

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/subcommands/test.py

@@ -340,11 +340,19 @@ def main(sys_args: list[str] | None = None):
     def track_tests():
         return run.main(["resources/multi-track.mov"], ["--keep_tracks_seperate"])
 
-    def json_tests():
+    def export_json_tests():
         out = run.main(["example.mp4"], ["--export_as_json"])
         out2 = run.main([out], [])
         return out, out2
 
+    def import_v1_tests():
+        with open("v1.json", "w") as file:
+            file.write(
+                """{"version": "1", "source": "example.mp4", "chunks": [ [0, 26, 1.0], [26, 34, 0] ]}"""
+            )
+
+        return run.main(["v1.json"], [])
+
     def premiere_named_export():
         run.main(["example.mp4"], ["--export", 'premiere:name="Foo Bar"'])
 
@@ -524,9 +532,7 @@ def main(sys_args: list[str] | None = None):
     #  Issue 280
     def SAR():
         out = run.main(["resources/SAR-2by3.mp4"], [])
-
-        # It's working, PyAV just can't detect the changes.
-        # assert checker.check(out).videos[0].sar == Fraction(2, 3)
+        assert checker.check(out).videos[0].sar == Fraction(2, 3)
 
         return out
 
@@ -711,7 +717,8 @@ def main(sys_args: list[str] | None = None):
                 edit_positive_tests,
                 audio_norm_f,
                 audio_norm_ebu,
-                json_tests,
+                export_json_tests,
+                import_v1_tests,
                 high_speed_test,
                 video_speed,
                 multi_track_edit,

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/validate_input.py

@@ -67,20 +67,17 @@ def download_video(my_input: str, args: Args, ffmpeg: FFmpeg, log: Log) -> str:
 
 
 def valid_input(inputs: list[str], ffmpeg: FFmpeg, args: Args, log: Log) -> list[str]:
-    new_inputs = []
+    result = []
 
     for my_input in inputs:
-        if os.path.isfile(my_input):
+        if my_input.startswith("http://") or my_input.startswith("https://"):
+            result.append(download_video(my_input, args, ffmpeg, log))
+        else:
             _, ext = os.path.splitext(my_input)
             if ext == "":
-                log.error("File must have an extension.")
-            new_inputs.append(my_input)
-
-        elif my_input.startswith("http://") or my_input.startswith("https://"):
-            new_inputs.append(download_video(my_input, args, ffmpeg, log))
-        else:
-            if os.path.isdir(my_input):
-                log.error("Input must be a file or a URL, not a directory.")
-            log.error(f"Could not find '{my_input}'")
+                if os.path.isdir(my_input):
+                    log.error("Input must be a file or a URL, not a directory.")
+                log.error("Input file must have an extension.")
+            result.append(my_input)
 
-    return new_inputs
+    return result

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor/vanparse.py

@@ -119,7 +119,7 @@ def to_key(op: Options | Required) -> str:
     return op.names[0][:2].replace("-", "") + op.names[0][2:].replace("-", "_")
 
 
-def print_option_help(program_name: str | None, ns_obj: T, option: Options) -> None:
+def print_option_help(name: str | None, ns_obj: object, option: Options) -> None:
     text = StringIO()
     text.write(
         f"  {', '.join(option.names)} {'' if option.metavar is None else option.metavar}\n\n"
@@ -145,8 +145,8 @@ def print_option_help(program_name: str | None, ns_obj: T, option: Options) -> N
 
     from auto_editor.help import data
 
-    if program_name is not None and option.names[0] in data[program_name]:
-        text.write(indent(data[program_name][option.names[0]], "    ") + "\n")
+    if name is not None and option.names[0] in data[name]:
+        text.write(indent(data[name][option.names[0]], "    ") + "\n")
     else:
         text.write(f"    {option.help}\n\n")
 

{auto_editor-24.25.1 → auto_editor-24.29.1/auto_editor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-editor
-Version: 24.25.1
+Version: 24.29.1
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
 License: Unlicense
@@ -11,8 +11,8 @@ Keywords: video,audio,media,editor,editing,processing,nonlinear,automatic,silenc
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy>=1.22.0
-Requires-Dist: pyav==12.1.0
+Requires-Dist: numpy>=1.23.0
+Requires-Dist: pyav==12.2.*
 Requires-Dist: ae-ffmpeg==1.2.*
 
 <p align="center"><img src="https://auto-editor.com/img/auto-editor-banner.webp" title="Auto-Editor" width="700"></p>
@@ -182,6 +182,3 @@ auto-editor --margin --help
 
 ## Copyright
 Auto-Editor is under the [Public Domain](https://github.com/WyattBlue/auto-editor/blob/master/LICENSE) and includes all directories besides the ones listed below. Auto-Editor was created by [these people.](https://auto-editor.com/blog/thank-you-early-testers)
-
-ae-ffmpeg is under the [LGPLv3 License](https://github.com/WyattBlue/auto-editor/blob/master/ae-ffmpeg/LICENSE.txt). The ffmpeg and ffprobe programs were created by the FFmpeg team.
-

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor.egg-info/SOURCES.txt

@@ -1,9 +1,6 @@
 LICENSE
 README.md
 pyproject.toml
-ae-ffmpeg/setup.py
-ae-ffmpeg/ae_ffmpeg/__init__.py
-ae-ffmpeg/ae_ffmpeg/py.typed
 auto_editor/__init__.py
 auto_editor/__main__.py
 auto_editor/analyze.py

auto_editor-24.29.1/auto_editor.egg-info/requires.txt

@@ -0,0 +1,3 @@
+numpy>=1.23.0
+pyav==12.2.*
+ae-ffmpeg==1.2.*

{auto_editor-24.25.1 → auto_editor-24.29.1}/auto_editor.egg-info/top_level.txt

@@ -1,4 +1,3 @@
-ae-ffmpeg
 auto_editor
 changelogs
 dist

{auto_editor-24.25.1 → auto_editor-24.29.1}/pyproject.toml

@@ -9,8 +9,8 @@ license = { text = "Unlicense" }
 authors = [{ name = "WyattBlue", email = "wyattblue@auto-editor.com" }]
 requires-python = ">=3.10"
 dependencies = [
-    "numpy>=1.22.0",
-    "pyav==12.1.0",
+    "numpy>=1.23.0",
+    "pyav==12.2.*",
     "ae-ffmpeg==1.2.*",
 ]
 keywords = [

auto_editor-24.25.1/ae-ffmpeg/ae_ffmpeg/__init__.py

@@ -1,16 +0,0 @@
-__version__ = "1.2.0"
-
-import os.path
-from platform import machine, system
-
-
-def get_path() -> str:
-    _os = system()
-    _arch = machine().lower()
-    _interdir = _os if _os != "Darwin" else f"{_os}-{_arch}"
-    program = "ffmpeg.exe" if _os == "Windows" else "ffmpeg"
-
-    dirpath = os.path.dirname(os.path.realpath(__file__))
-    file_path = os.path.join(dirpath, _interdir, program)
-
-    return file_path if os.path.isfile(file_path) else "ffmpeg"

auto_editor-24.25.1/ae-ffmpeg/setup.py

@@ -1,65 +0,0 @@
-import re
-
-from setuptools import find_packages, setup
-
-
-def pip_version():
-    with open("ae_ffmpeg/__init__.py") as f:
-        version_content = f.read()
-
-    version_match = re.search(
-        r"^__version__ = ['\"]([^'\"]*)['\"]", version_content, re.M
-    )
-
-    if version_match:
-        return version_match.group(1)
-
-    raise ValueError("Unable to find version string.")
-
-
-with open("README.md") as f:
-    long_description = f.read()
-
-setup(
-    name="ae-ffmpeg",
-    version=pip_version(),
-    description="Static FFmpeg binaries for Auto-Editor",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    license="LGPLv3",
-    url="https://auto-editor.com",
-    project_urls={
-        "Bug Tracker": "https://github.com/WyattBlue/auto-editor/issues",
-        "Source Code": "https://github.com/WyattBlue/auto-editor",
-    },
-    author="WyattBlue",
-    author_email="wyattblue@auto-editor.com",
-    keywords="video audio media",
-    packages=find_packages(),
-    package_data={
-        "ae_ffmpeg": [
-            "LICENSE.txt",
-            "Windows/ffmpeg.exe",
-            "Windows/ffprobe.exe",
-            "Windows/libopenh264.dll",
-            "Darwin-x86_64/ffmpeg",
-            "Darwin-x86_64/ffprobe",
-            "Darwin-arm64/ffmpeg",
-            "Darwin-arm64/ffprobe",
-            "py.typed",
-        ],
-    },
-    include_package_data=True,
-    zip_safe=False,
-    python_requires=">=3.8",
-    classifiers=[
-        "Topic :: Multimedia :: Sound/Audio",
-        "Topic :: Multimedia :: Video",
-        "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
-        "Intended Audience :: Developers",
-        "Operating System :: MacOS :: MacOS X",
-        "Operating System :: Microsoft :: Windows",
-        "Development Status :: 5 - Production/Stable",
-        "Programming Language :: Python :: 3",
-    ],
-)

auto_editor-24.25.1/auto_editor/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "24.25.1"
-version = "24w25a"

auto_editor-24.25.1/auto_editor.egg-info/requires.txt

@@ -1,3 +0,0 @@
-numpy>=1.22.0
-pyav==12.1.0
-ae-ffmpeg==1.2.*