auto-editor 26.3.3__tar.gz → 27.1.0__tar.gz

{auto_editor-26.3.3 → auto_editor-27.1.0}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: auto-editor
-Version: 26.3.3
+Version: 27.1.0
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
-License: Unlicense
+License-Expression: Unlicense
 Project-URL: Bug Tracker, https://github.com/WyattBlue/auto-editor/issues
 Project-URL: Source Code, https://github.com/WyattBlue/auto-editor
 Project-URL: homepage, https://auto-editor.com
@@ -11,8 +11,9 @@ Keywords: video,audio,media,editor,editing,processing,nonlinear,automatic,silenc
 Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy<3.0,>=1.24
-Requires-Dist: pyav==14.2.*
+Requires-Dist: numpy<3.0,>=2
+Requires-Dist: basswood-av<16,>=15.0.0
+Dynamic: license-file
 
 <p align="center"><img src="https://auto-editor.com/img/auto-editor-banner.webp" title="Auto-Editor" width="700"></p>
 
@@ -175,9 +176,9 @@ auto-editor --margin --help
 
 ## Articles
  - [How to Install Auto-Editor](https://auto-editor.com/installing)
- - [All the Options (And What They Do)](https://auto-editor.com/options)
+ - [All the Options (And What They Do)](https://auto-editor.com/ref/options)
  - [Docs](https://auto-editor.com/docs)
- - [Blog](https://auto-editor.com/blog)
+ - [Blog](https://basswood-io.com/blog/)
 
 ## 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)

{auto_editor-26.3.3 → auto_editor-27.1.0}/README.md

@@ -159,9 +159,9 @@ auto-editor --margin --help
 
 ## Articles
  - [How to Install Auto-Editor](https://auto-editor.com/installing)
- - [All the Options (And What They Do)](https://auto-editor.com/options)
+ - [All the Options (And What They Do)](https://auto-editor.com/ref/options)
  - [Docs](https://auto-editor.com/docs)
- - [Blog](https://auto-editor.com/blog)
+ - [Blog](https://basswood-io.com/blog/)
 
 ## 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)

auto_editor-27.1.0/auto_editor/__init__.py

@@ -0,0 +1 @@
+__version__ = "27.1.0"

{auto_editor-26.3.3 → auto_editor-27.1.0}/auto_editor/__main__.py

@@ -75,7 +75,9 @@ class Args:
 
     # Audio Rendering
     audio_codec: str = "auto"
+    audio_layout: str | None = None
     audio_bitrate: str = "auto"
+    mix_audio_streams: bool = False
     keep_tracks_separate: bool = False
     audio_normalize: str = "#f"
 
@@ -335,16 +337,26 @@ def main_options(parser: ArgumentParser) -> ArgumentParser:
         metavar="ENCODER",
         help="Set audio codec for output media",
     )
+    parser.add_argument(
+        "--audio-layout",
+        "-channel-layout",
+        "-layout",
+        metavar="LAYOUT",
+        help="Set the audio layout for the output media/timeline",
+    )
     parser.add_argument(
         "--audio-bitrate",
         "-b:a",
         metavar="BITRATE",
         help="Set the number of bits per second for audio",
     )
+    parser.add_argument(
+        "--mix-audio-streams", flag=True, help="Mix all audio streams together into one"
+    )
     parser.add_argument(
         "--keep-tracks-separate",
         flag=True,
-        help="Don't mix all audio tracks into one when exporting",
+        help="Don't mix all audio streams into one when exporting (default)",
     )
     parser.add_argument(
         "--audio-normalize",
@@ -448,15 +460,15 @@ def main() -> None:
     if args.debug and not args.input:
         buf = StringIO()
         buf.write(f"OS: {plat.system()} {plat.release()} {plat.machine().lower()}\n")
-        buf.write(f"Python: {plat.python_version()}\nPyAV: ")
+        buf.write(f"Python: {plat.python_version()}\nAV: ")
         try:
-            import av
+            import bv
         except (ModuleNotFoundError, ImportError):
             buf.write("not found")
         else:
             try:
-                buf.write(f"{av.__version__} ")
-                license = av._core.library_meta["libavcodec"]["license"]
+                buf.write(f"{bv.__version__} ")
+                license = bv._core.library_meta["libavcodec"]["license"]
                 buf.write(f"({license})")
             except AttributeError:
                 buf.write("error")

{auto_editor-26.3.3 → auto_editor-27.1.0}/auto_editor/analyze.py

@@ -9,10 +9,10 @@ from math import ceil
 from tempfile import gettempdir
 from typing import TYPE_CHECKING
 
-import av
+import bv
 import numpy as np
-from av.audio.fifo import AudioFifo
-from av.subtitles.subtitle import AssSubtitle
+from bv.audio.fifo import AudioFifo
+from bv.subtitles.subtitle import AssSubtitle
 
 from auto_editor import __version__
 
@@ -72,7 +72,7 @@ def mut_remove_large(
             active = False
 
 
-def iter_audio(audio_stream: av.AudioStream, tb: Fraction) -> Iterator[np.float32]:
+def iter_audio(audio_stream: bv.AudioStream, tb: Fraction) -> Iterator[np.float32]:
     fifo = AudioFifo()
     sr = audio_stream.rate
 
@@ -80,10 +80,10 @@ def iter_audio(audio_stream: av.AudioStream, tb: Fraction) -> Iterator[np.float3
     accumulated_error = Fraction(0)
 
     # Resample so that audio data is between [-1, 1]
-    resampler = av.AudioResampler(av.AudioFormat("flt"), audio_stream.layout, sr)
+    resampler = bv.AudioResampler(bv.AudioFormat("flt"), audio_stream.layout, sr)
 
     container = audio_stream.container
-    assert isinstance(container, av.container.InputContainer)
+    assert isinstance(container, bv.container.InputContainer)
 
     for frame in container.decode(audio_stream):
         frame.pts = None  # Skip time checks
@@ -103,7 +103,7 @@ def iter_audio(audio_stream: av.AudioStream, tb: Fraction) -> Iterator[np.float3
 
 
 def iter_motion(
-    video: av.VideoStream, tb: Fraction, blur: int, width: int
+    video: bv.VideoStream, tb: Fraction, blur: int, width: int
 ) -> Iterator[np.float32]:
     video.thread_type = "AUTO"
 
@@ -113,7 +113,7 @@ def iter_motion(
     index = 0
     prev_index = -1
 
-    graph = av.filter.Graph()
+    graph = bv.filter.Graph()
     graph.link_nodes(
         graph.add_buffer(template=video),
         graph.add("scale", f"{width}:-1"),
@@ -123,7 +123,7 @@ def iter_motion(
     ).configure()
 
     container = video.container
-    assert isinstance(container, av.container.InputContainer)
+    assert isinstance(container, bv.container.InputContainer)
 
     for unframe in container.decode(video):
         if unframe.pts is None:
@@ -154,7 +154,7 @@ def iter_motion(
 
 @dataclass(slots=True)
 class Levels:
-    container: av.container.InputContainer
+    container: bv.container.InputContainer
     name: str
     mod_time: int
     tb: Fraction
@@ -258,7 +258,7 @@ class Levels:
         if audio.duration is not None and audio.time_base is not None:
             inaccurate_dur = int(audio.duration * audio.time_base * self.tb)
         elif container.duration is not None:
-            inaccurate_dur = int(container.duration / av.time_base * self.tb)
+            inaccurate_dur = int(container.duration / bv.time_base * self.tb)
         else:
             inaccurate_dur = 1024
 
@@ -343,15 +343,9 @@ class Levels:
         for packet in container.demux(subtitle_stream):
             if packet.pts is None or packet.duration is None:
                 continue
-            for subset in packet.decode():
-                # See definition of `AVSubtitle`
-                # in: https://ffmpeg.org/doxygen/trunk/avcodec_8h_source.html
-                start = float(packet.pts * subtitle_stream.time_base)
-                dur = float(packet.duration * subtitle_stream.time_base)
-
-                end = round((start + dur) * self.tb)
-                sub_length = max(sub_length, end)
+            sub_length = max(sub_length, packet.pts + packet.duration)
 
+        sub_length = round(sub_length * subtitle_stream.time_base * self.tb)
         result = np.zeros((sub_length), dtype=np.bool_)
         del sub_length
 
@@ -363,25 +357,25 @@ class Levels:
                 continue
             if early_exit:
                 break
-            for subset in packet.decode():
-                if max_count is not None and count >= max_count:
-                    early_exit = True
-                    break
 
-                start = float(packet.pts * subtitle_stream.time_base)
-                dur = float(packet.duration * subtitle_stream.time_base)
+            if max_count is not None and count >= max_count:
+                early_exit = True
+                break
+
+            start = float(packet.pts * subtitle_stream.time_base)
+            dur = float(packet.duration * subtitle_stream.time_base)
 
-                san_start = round(start * self.tb)
-                san_end = round((start + dur) * self.tb)
+            san_start = round(start * self.tb)
+            san_end = round((start + dur) * self.tb)
 
-                for sub in subset:
-                    if not isinstance(sub, AssSubtitle):
-                        continue
+            for sub in packet.decode():
+                if not isinstance(sub, AssSubtitle):
+                    continue
 
-                    line = sub.dialogue.decode(errors="ignore")
-                    if line and re.search(re_pattern, line):
-                        result[san_start:san_end] = 1
-                        count += 1
+                line = sub.dialogue.decode(errors="ignore")
+                if line and re.search(re_pattern, line):
+                    result[san_start:san_end] = 1
+                    count += 1
 
         container.seek(0)
         return result
@@ -391,8 +385,8 @@ def initLevels(
     src: FileInfo, tb: Fraction, bar: Bar, no_cache: bool, log: Log
 ) -> Levels:
     try:
-        container = av.open(src.path)
-    except av.FFmpegError as e:
+        container = bv.open(src.path)
+    except bv.FFmpegError as e:
         log.error(e)
 
     mod_time = int(src.path.stat().st_mtime)

{auto_editor-26.3.3 → auto_editor-27.1.0}/auto_editor/cmds/desc.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import sys
 from dataclasses import dataclass, field
 
-from auto_editor.ffwrapper import initFileInfo
+from auto_editor.ffwrapper import FileInfo
 from auto_editor.utils.log import Log
 from auto_editor.vanparse import ArgumentParser
 
@@ -22,7 +22,7 @@ def desc_options(parser: ArgumentParser) -> ArgumentParser:
 def main(sys_args: list[str] = sys.argv[1:]) -> None:
     args = desc_options(ArgumentParser("desc")).parse_args(DescArgs, sys_args)
     for path in args.input:
-        src = initFileInfo(path, Log())
+        src = FileInfo.init(path, Log())
         if src.description is not None:
             sys.stdout.write(f"\n{src.description}\n\n")
         else:

{auto_editor-26.3.3 → auto_editor-27.1.0}/auto_editor/cmds/info.py

@@ -5,8 +5,8 @@ import sys
 from dataclasses import dataclass, field
 from typing import Any, Literal, TypedDict
 
-from auto_editor.ffwrapper import initFileInfo
-from auto_editor.lang.json import dump
+from auto_editor.ffwrapper import FileInfo
+from auto_editor.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
@@ -102,7 +102,7 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
             file_info[file] = {"type": "timeline"}
             continue
 
-        src = initFileInfo(file, log)
+        src = FileInfo.init(file, log)
 
         if len(src.videos) + len(src.audios) + len(src.subtitles) == 0:
             file_info[file] = {"type": "unknown"}

{auto_editor-26.3.3 → auto_editor-27.1.0}/auto_editor/cmds/levels.py

@@ -5,11 +5,11 @@ from dataclasses import dataclass, field
 from fractions import Fraction
 from typing import TYPE_CHECKING
 
-import av
+import bv
 import numpy as np
 
 from auto_editor.analyze import *
-from auto_editor.ffwrapper import initFileInfo
+from auto_editor.ffwrapper import FileInfo
 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.utils.bar import initBar
@@ -87,7 +87,7 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
     bar = initBar("none")
     log = Log(quiet=True)
 
-    sources = [initFileInfo(path, log) for path in args.input]
+    sources = [FileInfo.init(path, log) for path in args.input]
     if len(sources) < 1:
         log.error("levels needs at least one input file")
 
@@ -134,7 +134,7 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
                 if (arr := levels.read_cache("audio", (obj["stream"],))) is not None:
                     print_arr(arr)
                 else:
-                    container = av.open(src.path, "r")
+                    container = bv.open(src.path, "r")
                     audio_stream = container.streams.audio[obj["stream"]]
 
                     values = []
@@ -155,7 +155,7 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
                 if (arr := levels.read_cache("motion", mobj)) is not None:
                     print_arr(arr)
                 else:
-                    container = av.open(src.path, "r")
+                    container = bv.open(src.path, "r")
                     video_stream = container.streams.video[obj["stream"]]
 
                     values = []

{auto_editor-26.3.3 → auto_editor-27.1.0}/auto_editor/cmds/repl.py

@@ -7,7 +7,7 @@ from os import environ
 
 import auto_editor
 from auto_editor.analyze import initLevels
-from auto_editor.ffwrapper import initFileInfo
+from auto_editor.ffwrapper import FileInfo
 from auto_editor.lang.palet import ClosingError, Lexer, Parser, env, interpret
 from auto_editor.lang.stdenv import make_standard_env
 from auto_editor.lib.data_structs import print_str
@@ -48,11 +48,6 @@ def repl_options(parser: ArgumentParser) -> ArgumentParser:
         type=frame_rate,
         help="Set custom timebase",
     )
-    parser.add_argument(
-        "--temp-dir",
-        metavar="PATH",
-        help="Set where the temporary directory is located",
-    )
     return parser
 
 
@@ -60,8 +55,8 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
     args = repl_options(ArgumentParser(None)).parse_args(REPL_Args, sys_args)
 
     if args.input:
-        log = Log(quiet=True, temp_dir=args.temp_dir)
-        sources = [initFileInfo(path, log) for path in args.input]
+        log = Log(quiet=True)
+        sources = [FileInfo.init(path, log) for path in args.input]
         src = sources[0]
         tb = src.get_fps() if args.timebase is None else args.timebase
         env["timebase"] = tb

auto_editor-27.1.0/auto_editor/cmds/subdump.py

@@ -0,0 +1,74 @@
+import sys
+from dataclasses import dataclass, field
+
+import bv
+from bv.subtitles.subtitle import AssSubtitle
+
+from auto_editor.json import dump
+from auto_editor.vanparse import ArgumentParser
+
+
+@dataclass(slots=True)
+class SubdumpArgs:
+    help: bool = False
+    input: list[str] = field(default_factory=list)
+    json: bool = False
+
+
+def main(sys_args: list[str] = sys.argv[1:]) -> None:
+    parser = ArgumentParser("subdump")
+    parser.add_required("input", nargs="*")
+    parser.add_argument("--json", flag=True)
+    args = parser.parse_args(SubdumpArgs, sys_args)
+
+    do_filter = True
+
+    if args.json:
+        data = {}
+        for input_file in args.input:
+            container = bv.open(input_file)
+            for s in range(len(container.streams.subtitles)):
+                entry_data = []
+
+                input_stream = container.streams.subtitles[s]
+                assert input_stream.time_base is not None
+                for packet in container.demux(input_stream):
+                    if (
+                        packet.dts is None
+                        or packet.pts is None
+                        or packet.duration is None
+                    ):
+                        continue
+
+                    start = packet.pts * input_stream.time_base
+                    end = start + packet.duration * input_stream.time_base
+
+                    startf = round(float(start), 3)
+                    endf = round(float(end), 3)
+
+                    if do_filter and endf - startf <= 0.02:
+                        continue
+
+                    for sub in packet.decode():
+                        if isinstance(sub, AssSubtitle):
+                            content = sub.dialogue.decode("utf-8", errors="ignore")
+                            entry_data.append([startf, endf, content])
+
+                data[f"{input_file}:{s}"] = entry_data
+            container.close()
+
+        dump(data, sys.stdout, indent=4)
+        return
+
+    for i, input_file in enumerate(args.input):
+        with bv.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 sub2 in container.decode(subtitles=s):
+                    if isinstance(sub2, AssSubtitle):
+                        print(sub2.ass.decode("utf-8", errors="ignore"))
+        print("------")
+
+
+if __name__ == "__main__":
+    main()