auto-editor 24.19.1__tar.gz → 24.24.1__tar.gz

{auto_editor-24.19.1/auto_editor.egg-info → auto_editor-24.24.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-editor
-Version: 24.19.1
+Version: 24.24.1
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
 License: Unlicense
@@ -12,7 +12,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.22.0
-Requires-Dist: pyav==12.0.5
+Requires-Dist: pyav==12.1.0
 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>

auto_editor-24.24.1/auto_editor/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "24.24.1"
+version = "24w24a"

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor/__main__.py

@@ -4,7 +4,7 @@ import sys
 
 import auto_editor
 from auto_editor.utils.func import setup_tempdir
-from auto_editor.utils.log import Log
+from auto_editor.utils.log import Log, Timer
 from auto_editor.utils.types import (
     Args,
     bitrate,
@@ -312,8 +312,7 @@ def main() -> None:
     if args.debug and args.input == []:
         import platform as plat
 
-        is64bit = "64-bit" if sys.maxsize > 2**32 else "32-bit"
-        print(f"Python Version: {plat.python_version()} {is64bit}")
+        print(f"Python Version: {plat.python_version()}")
         print(f"Platform: {plat.system()} {plat.release()} {plat.machine().lower()}")
         print(f"FFmpeg Version: {ffmpeg.version}\nFFmpeg Path: {ffmpeg.path}")
         print(f"Auto-Editor Version: {auto_editor.version}")
@@ -323,13 +322,15 @@ def main() -> None:
         log.error("You need to give auto-editor an input file.")
 
     temp = setup_tempdir(args.temp_dir, Log())
-    log = Log(args.debug, args.quiet, temp=temp)
+    log = Log(args.debug, args.quiet, temp)
+    log.machine = args.progress == "machine"
     log.debug(f"Temp Directory: {temp}")
 
     paths = valid_input(args.input, ffmpeg, args, log)
+    timer = Timer(args.quiet or log.machine)
 
     try:
-        edit_media(paths, ffmpeg, args, temp, log)
+        edit_media(paths, ffmpeg, args, temp, timer, log)
     except KeyboardInterrupt:
         log.error("Keyboard Interrupt")
     log.cleanup()

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor/analyze.py

@@ -170,8 +170,6 @@ class Levels:
         # If there's no audio, get length in video metadata.
         import av
 
-        av.logging.set_level(av.logging.PANIC)
-
         with av.open(f"{self.src.path}") as cn:
             if len(cn.streams.video) < 1:
                 self.log.error("Could not get media duration")
@@ -227,11 +225,7 @@ class Levels:
         except Exception:
             json_object = {}
 
-        entry = {
-            "type": str(arr.dtype),
-            "arr": arr.tolist(),
-        }
-
+        entry = {"type": str(arr.dtype), "arr": arr.tolist()}
         src_key = f"{self.src.path}"
 
         if src_key in json_object:
@@ -344,13 +338,10 @@ class Levels:
     def motion(self, s: int, blur: int, width: int) -> NDArray[np.float64]:
         import av
 
-        av.logging.set_level(av.logging.PANIC)
-
-        mobj = {"stream": s, "width": width, "blur": blur}
-
         if s >= len(self.src.videos):
             raise LevelError(f"motion: video stream '{s}' does not exist.")
 
+        mobj = {"stream": s, "width": width, "blur": blur}
         if (arr := self.read_cache("motion", mobj)) is not None:
             return arr
 

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor/edit.py

@@ -150,9 +150,8 @@ def parse_export(export: str, log: Log) -> dict[str, Any]:
 
 
 def edit_media(
-    paths: list[str], ffmpeg: FFmpeg, args: Args, temp: str, log: Log
+    paths: list[str], ffmpeg: FFmpeg, args: Args, temp: str, timer: Timer, log: Log
 ) -> None:
-    timer = Timer(args.quiet)
     bar = Bar(args.progress)
     tl = None
 
@@ -223,7 +222,7 @@ def edit_media(
                 cmd.extend([os.path.join(temp, f"{s}s.{sub.ext}")])
             ffmpeg.run(cmd)
 
-        tl = make_timeline(sources, ffmpeg, ensure, args, samplerate, bar, temp, log)
+        tl = make_timeline(sources, ensure, args, samplerate, bar, temp, log)
 
     if export["export"] == "timeline":
         from auto_editor.formats.json import make_json_timeline

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor/ffwrapper.py

@@ -192,8 +192,6 @@ class FileInfo:
 def initFileInfo(path: str, log: Log) -> FileInfo:
     import av
 
-    av.logging.set_level(av.logging.PANIC)
-
     try:
         cont = av.open(path, "r")
     except av.error.InvalidDataError:

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor/formats/json.py

@@ -181,11 +181,11 @@ def read_v1(tl: Any, log: Log) -> v3:
     for i, chunk in enumerate(chunks):
         if type(chunk) is not list or len(chunk) != 3:
             log.error(f"Invalid chunk at chunk {i}")
-        if type(chunk[0]) is not int or chunk[0] < 0:
+        if type(chunk[0]) not in (int, float) or chunk[0] < 0:
             log.error(f"Invalid start at chunk {i}")
-        if type(chunk[1]) is not int or chunk[1] <= chunk[0]:
+        if type(chunk[1]) not in (int, float) or chunk[1] <= chunk[0]:
             log.error(f"Invalid end at chunk {i}")
-        if type(chunk[2]) is not float or chunk[2] < 0.0 or chunk[2] > 99999.0:
+        if type(chunk[2]) not in (int, float) or chunk[2] < 0.0 or chunk[2] > 99999.0:
             log.error(f"Invalid speed at chunk {i}")
 
         if i == 0 and chunk[0] != 0:
@@ -194,6 +194,9 @@ def read_v1(tl: Any, log: Log) -> v3:
             log.error(f"Invalid start at chunk {i}")
         last_end = chunk[1]
 
+        if type(chunk[0]) is float or type(chunk[1]) is float or type(chunk[2]) is int:
+            chunks[i] = (int(chunk[0]), int(chunk[1]), float(chunk[2]))
+
     for c in clipify(chunks, src):
         if src.videos:
             if len(vtl) == 0:

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor/make_layers.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, NamedTuple
 import numpy as np
 
 from auto_editor.analyze import FileSetup, Levels
-from auto_editor.ffwrapper import FFmpeg, FileInfo
+from auto_editor.ffwrapper import FileInfo
 from auto_editor.lang.palet import Lexer, Parser, env, interpret, is_boolarr
 from auto_editor.lib.data_structs import print_str
 from auto_editor.lib.err import MyError
@@ -110,9 +110,29 @@ def run_interpreter_for_edit_option(
     return result
 
 
+def make_sane_timebase(fps: Fraction) -> Fraction:
+    tb = round(fps, 2)
+    ntsc = Fraction(30_000, 1001)
+    film_ntsc = Fraction(24_000, 1001)
+    if tb == round(ntsc, 2):
+        return ntsc
+    if tb == round(film_ntsc, 2):
+        return film_ntsc
+    return tb
+
+
+def parse_time(val: str, arr: NDArray, tb: Fraction) -> int:  # raises: `CoerceError`
+    if val == "start":
+        return 0
+    if val == "end":
+        return len(arr)
+
+    num = time(val, tb)
+    return num if num >= 0 else num + len(arr)
+
+
 def make_timeline(
     sources: list[FileInfo],
-    ffmpeg: FFmpeg,
     ensure: Ensure,
     args: Args,
     sr: int,
@@ -125,14 +145,9 @@ def make_timeline(
     if inp is None:
         tb, res = Fraction(30), (1920, 1080)
     else:
-        tb = round(inp.get_fps() if args.frame_rate is None else args.frame_rate, 2)
-        ntsc = Fraction(30_000, 1001)
-        film_ntsc = Fraction(24_000, 1001)
-        if tb == round(ntsc, 2):
-            tb = ntsc
-        elif tb == round(film_ntsc, 2):
-            tb = film_ntsc
-
+        tb = make_sane_timebase(
+            inp.get_fps() if args.frame_rate is None else args.frame_rate
+        )
         res = inp.get_res() if args.resolution is None else args.resolution
 
     try:
@@ -171,36 +186,21 @@ def make_timeline(
         speed_hash[len(speed_map) - 1] = speed
         return len(speed_map) - 1
 
-    def parse_time(val: str, arr: NDArray) -> int:
-        if val == "start":
-            return 0
-        if val == "end":
-            return len(arr)
-        try:
-            num = time(val, tb)
-            return num if num >= 0 else num + len(arr)
-        except CoerceError as e:
-            log.error(e)
-
-    def mut_set_range(arr: NDArray, _ranges: list[list[str]], index: float) -> None:
-        for _range in _ranges:
-            assert len(_range) == 2
-            pair = [parse_time(val, arr) for val in _range]
-            arr[pair[0] : pair[1]] = index
-
     try:
-        if len(args.cut_out) > 0:
+        for _range in args.cut_out:
             # always cut out even if 'silent_speed' is not 99,999
-            mut_set_range(speed_index, args.cut_out, get_speed_index(99_999))
+            pair = [parse_time(val, speed_index, tb) for val in _range]
+            speed_index[pair[0] : pair[1]] = get_speed_index(99_999)
 
-        if len(args.add_in) > 0:
+        for _range in args.add_in:
             # set to 'video_speed' index
-            mut_set_range(speed_index, args.add_in, 1.0)
+            pair = [parse_time(val, speed_index, tb) for val in _range]
+            speed_index[pair[0] : pair[1]] = 1
 
         for speed_range in args.set_speed_for_range:
-            speed = speed_range[0]
-            _range = list(speed_range[1:])
-            mut_set_range(speed_index, [_range], get_speed_index(speed))
+            start_in = parse_time(speed_range[1], speed_index, tb)
+            end_in = parse_time(speed_range[2], speed_index, tb)
+            speed_index[start_in:end_in] = get_speed_index(speed_range[0])
     except CoerceError as e:
         log.error(e)
 

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor/render/video.py

@@ -27,9 +27,6 @@ if TYPE_CHECKING:
     from auto_editor.utils.types import Args
 
 
-av.logging.set_level(av.logging.PANIC)
-
-
 @dataclass(slots=True)
 class VideoFrame:
     index: int

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor/subcommands/info.py

@@ -7,6 +7,7 @@ from typing import Any, Literal, TypedDict
 
 from auto_editor.ffwrapper import initFileInfo
 from auto_editor.lang.json import dump
+from auto_editor.make_layers import make_sane_timebase
 from auto_editor.timeline import v3
 from auto_editor.utils.func import aspect_ratio
 from auto_editor.utils.log import Log
@@ -68,6 +69,7 @@ class MediaJson(TypedDict, total=False):
     subtitle: list[SubtitleJson]
     container: ContainerJson
     type: Literal["media", "timeline", "unknown"]
+    recommendedTimebase: str
     version: Literal["v1", "v3"]
     clips: int
 
@@ -108,6 +110,7 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
 
         file_info[file] = {
             "type": "media",
+            "recommendedTimebase": "30/1",
             "video": [],
             "audio": [],
             "subtitle": [],
@@ -117,6 +120,12 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
             },
         }
 
+        if src.videos:
+            recTb = make_sane_timebase(src.videos[0].fps)
+            file_info[file]["recommendedTimebase"] = (
+                f"{recTb.numerator}/{recTb.denominator}"
+            )
+
         for track, v in enumerate(src.videos):
             w, h = v.width, v.height
 

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor/subcommands/subdump.py

@@ -1,7 +1,7 @@
 import sys
 
 import av
-from av.subtitles.subtitle import SubtitleSet
+from av.subtitles.subtitle import AssSubtitle, TextSubtitle
 
 
 def main(sys_args: list[str] = sys.argv[1:]) -> None:
@@ -10,12 +10,12 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
             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 item in packet.decode():
-                        if type(item) is SubtitleSet and item:
-                            if item[0].type == b"ass":
-                                print(item[0].ass.decode("utf-8"))
-                            elif item[0].type == b"text":
-                                print(item[0].text)
+                    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"))
         print("------")
 
 

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor/utils/bar.py

@@ -67,9 +67,9 @@ class Bar:
 
         if self.machine:
             index = min(index, self.total)
-            raw = int(self.begin_time + rate)
+            secs_til_eta = round(self.begin_time + rate - time(), 2)
             print(
-                f"{self.title}~{index}~{self.total}~{self.begin_time}~{raw}",
+                f"{self.title}~{index}~{self.total}~{secs_til_eta}",
                 end="\r",
                 flush=True,
             )

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor/utils/log.py

@@ -24,7 +24,7 @@ class Timer:
 
 
 class Log:
-    __slots__ = ("is_debug", "quiet", "temp")
+    __slots__ = ("is_debug", "quiet", "temp", "machine")
 
     def __init__(
         self, show_debug: bool = False, quiet: bool = False, temp: str | None = None
@@ -32,6 +32,7 @@ class Log:
         self.is_debug = show_debug
         self.quiet = quiet
         self.temp = temp
+        self.machine = False
 
     def debug(self, message: object) -> None:
         if self.is_debug:
@@ -55,7 +56,9 @@ class Log:
                 self.debug(f"Failed to delete temp dir:\n{e}")
 
     def conwrite(self, message: str) -> None:
-        if not self.quiet:
+        if self.machine:
+            print(message, flush=True)
+        elif not self.quiet:
             buffer = " " * (get_terminal_size().columns - len(message) - 3)
             sys.stdout.write(f"  {message}{buffer}\r")
 

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor/utils/types.py

@@ -164,8 +164,9 @@ def margin(val: str) -> tuple[str, str]:
     return vals[0], vals[1]
 
 
-def time_range(val: str) -> list[str]:
-    return _comma_coerce("time_range", val, 2)
+def time_range(val: str) -> tuple[str, str]:
+    a = _comma_coerce("time_range", val, 2)
+    return a[0], a[1]
 
 
 def speed_range(val: str) -> tuple[float, str, str]:
@@ -231,8 +232,8 @@ class Args:
     extras: str | None = None
     sn: bool = False
     no_seek: bool = False
-    cut_out: list[list[str]] = field(default_factory=list)
-    add_in: list[list[str]] = field(default_factory=list)
+    cut_out: list[tuple[str, str]] = field(default_factory=list)
+    add_in: list[tuple[str, str]] = field(default_factory=list)
     set_speed_for_range: list[tuple[float, str, str]] = field(default_factory=list)
     frame_rate: Fraction | None = None
     sample_rate: int | None = None

{auto_editor-24.19.1 → auto_editor-24.24.1/auto_editor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-editor
-Version: 24.19.1
+Version: 24.24.1
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
 License: Unlicense
@@ -12,7 +12,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.22.0
-Requires-Dist: pyav==12.0.5
+Requires-Dist: pyav==12.1.0
 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>

{auto_editor-24.19.1 → auto_editor-24.24.1}/auto_editor.egg-info/requires.txt

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

{auto_editor-24.19.1 → auto_editor-24.24.1}/pyproject.toml

@@ -10,7 +10,7 @@ authors = [{ name = "WyattBlue", email = "wyattblue@auto-editor.com" }]
 requires-python = ">=3.10"
 dependencies = [
     "numpy>=1.22.0",
-    "pyav==12.0.5",
+    "pyav==12.1.0",
     "ae-ffmpeg==1.2.*",
 ]
 keywords = [

auto_editor-24.19.1/auto_editor/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "24.19.1"
-version = "24w19a"