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

{auto-editor-24.13.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.13.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>
@@ -60,10 +60,10 @@ The `--edit` option is how auto-editor makes automated cuts.
 For example, edit out motionlessness in a video by setting `--edit motion`.
 
 ```
-# cut out sections where percentage of motion is less than 2.
-auto-editor example.mp4 --edit motion:threshold=2%
+# cut out sections where the total motion is less than 2%.
+auto-editor example.mp4 --edit motion:threshold=0.02
 
-# --edit is set to "audio:threshold=4%" by default.
+# `--edit audio:threshold=0.04,stream=all` is used by defaut.
 auto-editor example.mp4
 
 # Different tracks can be set with different attribute.
@@ -73,34 +73,14 @@ auto-editor multi-track.mov --edit "(or audio:stream=0 audio:threshold=10%,strea
 Different editing methods can be used together.
 ```
 # 'threshold' is always the first argument for edit-method objects
-auto-editor example.mp4 --edit "(or audio:3% motion:6%)"
+auto-editor example.mp4 --edit "(or audio:0.03 motion:0.06)"
 ```
 
 You can also use `dB` unit, a volume unit familiar to video-editors (case sensitive):
 ```
-auto-editor example.mp4 --edit audio:threshold=-19dB
+auto-editor example.mp4 --edit audio:-19dB
 auto-editor example.mp4 --edit audio:-7dB
 auto-editor example.mp4 --edit motion:-19dB
-
-# The `dB` unit is a just a macro that expands into an S-expression:
-# '-19dB
-# > '(pow 10 (/ -19 20))
-# (eval '(pow 10 (/ -19 20)))
-# > 0.11220184543019636
-```
-
-### Working With Multiple Audio Tracks
-By default, only the first audio track will used for editing (track 0). You can change this with these commands.
-
-Use all audio tracks for editing:
-```
-auto-editor multi-track.mov --edit audio:stream=all
-```
-
-Use only the second, fourth, and sixth audio track:
-```
-# track numbers start at 0
-auto-editor so-many-tracks.mp4 --edit "(or audio:stream=1 audio:stream=3 audio:stream=5)"
 ```
 
 ### See What Auto-Editor Cuts Out
@@ -119,12 +99,10 @@ auto-editor example.mp4 --export premiere
 ```
 
 Auto-Editor can also export to:
-
 - DaVinci Resolve with `--export resolve`
 - Final Cut Pro with `--export final-cut-pro`
 - ShotCut with `--export shotcut`
-
-Other editors, like Sony Vegas, can understand the `premiere` format. If your favorite editor doesn't, you can use ` --export clip-sequence` which creates many video clips that can be imported and manipulated like normal.
+- Individual media clips with `--export clip-sequence`
 
 ### Naming Timelines
 By default, auto-editor will name the timeline to "Auto-Editor Media Group" if the export supports naming.
@@ -188,14 +166,11 @@ List all available options:
 auto-editor --help
 ```
 
-Use `--help` with a specific option for more information:
+Use `--help` with a specific option to learn more about it:
 
 ```
-auto-editor --scale --help
-  --scale NUM
-
-    default: 1.0
-    Scale the output video's resolution by NUM factor
+auto-editor -c:v --help
+auto-editor --margin --help
 ```
 
 <h3 align="center">Auto-Editor is available on all major platforms</h3>

{auto-editor-24.13.1 → auto_editor-24.24.1}/README.md

@@ -43,10 +43,10 @@ The `--edit` option is how auto-editor makes automated cuts.
 For example, edit out motionlessness in a video by setting `--edit motion`.
 
 ```
-# cut out sections where percentage of motion is less than 2.
-auto-editor example.mp4 --edit motion:threshold=2%
+# cut out sections where the total motion is less than 2%.
+auto-editor example.mp4 --edit motion:threshold=0.02
 
-# --edit is set to "audio:threshold=4%" by default.
+# `--edit audio:threshold=0.04,stream=all` is used by defaut.
 auto-editor example.mp4
 
 # Different tracks can be set with different attribute.
@@ -56,34 +56,14 @@ auto-editor multi-track.mov --edit "(or audio:stream=0 audio:threshold=10%,strea
 Different editing methods can be used together.
 ```
 # 'threshold' is always the first argument for edit-method objects
-auto-editor example.mp4 --edit "(or audio:3% motion:6%)"
+auto-editor example.mp4 --edit "(or audio:0.03 motion:0.06)"
 ```
 
 You can also use `dB` unit, a volume unit familiar to video-editors (case sensitive):
 ```
-auto-editor example.mp4 --edit audio:threshold=-19dB
+auto-editor example.mp4 --edit audio:-19dB
 auto-editor example.mp4 --edit audio:-7dB
 auto-editor example.mp4 --edit motion:-19dB
-
-# The `dB` unit is a just a macro that expands into an S-expression:
-# '-19dB
-# > '(pow 10 (/ -19 20))
-# (eval '(pow 10 (/ -19 20)))
-# > 0.11220184543019636
-```
-
-### Working With Multiple Audio Tracks
-By default, only the first audio track will used for editing (track 0). You can change this with these commands.
-
-Use all audio tracks for editing:
-```
-auto-editor multi-track.mov --edit audio:stream=all
-```
-
-Use only the second, fourth, and sixth audio track:
-```
-# track numbers start at 0
-auto-editor so-many-tracks.mp4 --edit "(or audio:stream=1 audio:stream=3 audio:stream=5)"
 ```
 
 ### See What Auto-Editor Cuts Out
@@ -102,12 +82,10 @@ auto-editor example.mp4 --export premiere
 ```
 
 Auto-Editor can also export to:
-
 - DaVinci Resolve with `--export resolve`
 - Final Cut Pro with `--export final-cut-pro`
 - ShotCut with `--export shotcut`
-
-Other editors, like Sony Vegas, can understand the `premiere` format. If your favorite editor doesn't, you can use ` --export clip-sequence` which creates many video clips that can be imported and manipulated like normal.
+- Individual media clips with `--export clip-sequence`
 
 ### Naming Timelines
 By default, auto-editor will name the timeline to "Auto-Editor Media Group" if the export supports naming.
@@ -171,14 +149,11 @@ List all available options:
 auto-editor --help
 ```
 
-Use `--help` with a specific option for more information:
+Use `--help` with a specific option to learn more about it:
 
 ```
-auto-editor --scale --help
-  --scale NUM
-
-    default: 1.0
-    Scale the output video's resolution by NUM factor
+auto-editor -c:v --help
+auto-editor --margin --help
 ```
 
 <h3 align="center">Auto-Editor is available on all major platforms</h3>

auto_editor-24.24.1/auto_editor/__init__.py

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

{auto-editor-24.13.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.13.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.13.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.13.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.13.1 → auto_editor-24.24.1}/auto_editor/formats/fcp11.py

@@ -140,7 +140,7 @@ def fcp11_write_xml(
             "ref": ref,
             "offset": fraction(clip.start),
             "duration": fraction(clip.dur),
-            "start": fraction(int(clip.offset // clip.speed)),
+            "start": fraction(clip.offset),
             "tcFormat": "NDF",
         }
         asset = SubElement(spine, "asset-clip", clip_properties)

{auto-editor-24.13.1 → auto_editor-24.24.1}/auto_editor/formats/fcp7.py

@@ -296,7 +296,7 @@ def fcp7_read_xml(path: str, ffmpeg: FFmpeg, log: Log) -> v3:
 
                 start = clipitem["start"]
                 dur = clipitem["end"] - start
-                offset = int(clipitem["in"] * speed)
+                offset = clipitem["in"]
 
                 vobjs[t].append(
                     TlVideo(start, dur, sources[file_id], offset, speed, stream=0)
@@ -324,7 +324,7 @@ def fcp7_read_xml(path: str, ffmpeg: FFmpeg, log: Log) -> v3:
 
                 start = clipitem["start"]
                 dur = clipitem["end"] - start
-                offset = int(clipitem["in"] * speed)
+                offset = clipitem["in"]
 
                 aobjs[t].append(
                     TlAudio(
@@ -414,8 +414,8 @@ def fcp7_write_xml(name: str, output: str, tl: v3, log: Log) -> None:
 
             _start = f"{clip.start}"
             _end = f"{clip.start + clip.dur}"
-            _in = f"{int(clip.offset / clip.speed)}"
-            _out = f"{int(clip.offset / clip.speed) + clip.dur}"
+            _in = f"{clip.offset}"
+            _out = f"{clip.offset + clip.dur}"
 
             clipitem = ET.SubElement(track, "clipitem", id=f"clipitem-{j+1}")
             ET.SubElement(clipitem, "name").text = src.path.stem
@@ -473,8 +473,8 @@ def fcp7_write_xml(name: str, output: str, tl: v3, log: Log) -> None:
 
                 _start = f"{aclip.start}"
                 _end = f"{aclip.start + aclip.dur}"
-                _in = f"{int(aclip.offset / aclip.speed)}"
-                _out = f"{int(aclip.offset / aclip.speed) + aclip.dur}"
+                _in = f"{aclip.offset}"
+                _out = f"{aclip.offset + aclip.dur}"
 
                 if not src.videos:
                     clip_item_num = j + 1

{auto-editor-24.13.1 → auto_editor-24.24.1}/auto_editor/formats/json.py

@@ -173,6 +173,30 @@ def read_v1(tl: Any, log: Log) -> v3:
     vtl: VSpace = []
     atl: ASpace = [[] for _ in range(len(src.audios))]
 
+    # Verify chunks
+    last_end: int | None = None
+    if type(chunks) is not list:
+        log.error("chunks key must be an array")
+
+    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]) not in (int, float) or chunk[0] < 0:
+            log.error(f"Invalid start at chunk {i}")
+        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]) 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:
+            log.error("First chunk must start with 0")
+        if i != 0 and chunk[0] != last_end:
+            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.13.1 → auto_editor-24.24.1}/auto_editor/formats/shotcut.py

@@ -92,7 +92,7 @@ def shotcut_write_mlt(output: str, tl: v3) -> None:
 
     for clip in clips:
         src = clip.src
-        length = to_timecode((clip.offset / clip.speed + clip.dur) / tb, "standard")
+        length = to_timecode((clip.offset + clip.dur) / tb, "standard")
 
         if clip.speed == 1:
             resource = f"{src.path}"
@@ -127,8 +127,8 @@ def shotcut_write_mlt(output: str, tl: v3) -> None:
 
     producers = 0
     for i, clip in enumerate(clips):
-        _in = to_timecode(clip.offset / clip.speed / tb, "standard")
-        _out = to_timecode((clip.offset / clip.speed + clip.dur) / tb, "standard")
+        _in = to_timecode(clip.offset / tb, "standard")
+        _out = to_timecode((clip.offset + clip.dur) / tb, "standard")
 
         tag_name = f"chain{i}"
         if clip.speed != 1:

{auto-editor-24.13.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
@@ -42,7 +42,7 @@ def clipify(chunks: Chunks, src: FileInfo, start: int = 0) -> list[Clip]:
             if dur == 0:
                 continue
 
-            offset = chunk[0]
+            offset = int(chunk[0] / chunk[2])
 
             if not (clips and clips[-1].start == round(start)):
                 clips.append(Clip(start, dur, offset, chunk[2], src))
@@ -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,7 +145,9 @@ def make_timeline(
     if inp is None:
         tb, res = Fraction(30), (1920, 1080)
     else:
-        tb = inp.get_fps() if args.frame_rate is None else args.frame_rate
+        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:
@@ -164,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)
 
@@ -228,7 +235,7 @@ def make_timeline(
             if dur == 0:
                 continue
 
-            offset = chunk[1]
+            offset = int(chunk[1] / chunk[3])
 
             if not (clips and clips[-1].start == round(start)):
                 clips.append(Clip(start, dur, offset, chunk[3], chunk[0]))

{auto-editor-24.13.1 → auto_editor-24.24.1}/auto_editor/preview.py

@@ -32,7 +32,8 @@ def all_cuts(tl: v3, in_len: int) -> list[int]:
     oe: list[tuple[int, int]] = []
 
     for clip in tl.a[0]:
-        oe.append((clip.offset, clip.offset + clip.dur))
+        old_offset = clip.offset * clip.speed
+        oe.append((round(old_offset * clip.speed), round(old_offset + clip.dur)))
 
     cut_lens = []
     i = 0

{auto-editor-24.13.1 → auto_editor-24.24.1}/auto_editor/render/audio.py

@@ -208,8 +208,8 @@ def make_new_audio(
                 del leng
 
             samp_list = samples[(clip.src, clip.stream)]
-            samp_start = clip.offset * sr // tb
-            samp_end = round((clip.offset + clip.dur * clip.speed) * sr / tb)
+            samp_start = round(clip.offset * clip.speed * sr / tb)
+            samp_end = round((clip.offset + clip.dur) * clip.speed * sr / tb)
             if samp_end > len(samp_list):
                 samp_end = len(samp_list)
 

{auto-editor-24.13.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
@@ -244,7 +241,7 @@ def render_av(
                 for lobj in layer:
                     if isinstance(lobj, TlVideo):
                         if index >= lobj.start and index < (lobj.start + lobj.dur):
-                            _i = lobj.offset + round((index - lobj.start) * lobj.speed)
+                            _i = round((lobj.offset + index - lobj.start) * lobj.speed)
                             obj_list.append(VideoFrame(_i, lobj.src))
                     elif index >= lobj.start and index < lobj.start + lobj.dur:
                         obj_list.append(lobj)

{auto-editor-24.13.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.13.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.13.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.13.1 → auto_editor-24.24.1}/auto_editor/utils/container.py

@@ -53,7 +53,7 @@ hevc_en = ["hevc", "libx265", "hevc_videotoolbox", "hevc_amf", "hevc_nvenc", "he
 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,
@@ -80,7 +80,7 @@ mp4: DictContainer = {
     "allow_subtitle": True,
     "allow_image": True,
     "vcodecs": h264_en + hevc_en + av1_en + ["vp9", "mpeg4", "mpeg2video", "mjpeg"],
-    "acodecs": aac_en + ["mp3", "opus", "flac", "vorbis", "libvorbis", "ac3", "mp2"],
+    "acodecs": aac_en + opus_en + ["mp3", "flac", "vorbis", "libvorbis", "ac3", "mp2"],
     "vstrict": True,
 }
 ogg: DictContainer = {
@@ -88,16 +88,16 @@ ogg: DictContainer = {
     "allow_audio": True,
     "allow_subtitle": True,
     "vcodecs": ["libtheora", "theora"],
-    "acodecs": ["libvorbis", "vorbis", "flac", "opus", "speex"],
+    "acodecs": opus_en + ["libvorbis", "vorbis", "flac", "speex"],
     "vstrict": True,
 }
 
 mka_audio = (
     ["libvorbis", "vorbis"]
     + aac_en
+    + opus_en
     + [
         "mp3",
-        "opus",
         "flac",
         "ac3",
         "mp2",
@@ -172,11 +172,11 @@ containers: dict[str, DictContainer] = {
     },
     "opus": {
         "allow_audio": True,
-        "acodecs": ["opus", "flac", "libvorbis", "vorbis", "speex"],
+        "acodecs": opus_en + ["flac", "libvorbis", "vorbis", "speex"],
     },
     "oga": {
         "allow_audio": True,
-        "acodecs": ["flac", "libvorbis", "vorbis", "opus", "speex"],
+        "acodecs": opus_en + ["flac", "libvorbis", "vorbis", "speex"],
     },
     "flac": {
         "allow_audio": True,
@@ -188,7 +188,7 @@ containers: dict[str, DictContainer] = {
         "allow_audio": True,
         "allow_subtitle": True,
         "vcodecs": ["vp9", "vp8"] + av1_en,
-        "acodecs": ["opus", "vorbis", "libvorbis"],
+        "acodecs": opus_en + ["vorbis", "libvorbis"],
         "scodecs": ["webvtt"],
         "vstrict": True,
         "sstrict": True,

{auto-editor-24.13.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.13.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.13.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.13.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>
@@ -60,10 +60,10 @@ The `--edit` option is how auto-editor makes automated cuts.
 For example, edit out motionlessness in a video by setting `--edit motion`.
 
 ```
-# cut out sections where percentage of motion is less than 2.
-auto-editor example.mp4 --edit motion:threshold=2%
+# cut out sections where the total motion is less than 2%.
+auto-editor example.mp4 --edit motion:threshold=0.02
 
-# --edit is set to "audio:threshold=4%" by default.
+# `--edit audio:threshold=0.04,stream=all` is used by defaut.
 auto-editor example.mp4
 
 # Different tracks can be set with different attribute.
@@ -73,34 +73,14 @@ auto-editor multi-track.mov --edit "(or audio:stream=0 audio:threshold=10%,strea
 Different editing methods can be used together.
 ```
 # 'threshold' is always the first argument for edit-method objects
-auto-editor example.mp4 --edit "(or audio:3% motion:6%)"
+auto-editor example.mp4 --edit "(or audio:0.03 motion:0.06)"
 ```
 
 You can also use `dB` unit, a volume unit familiar to video-editors (case sensitive):
 ```
-auto-editor example.mp4 --edit audio:threshold=-19dB
+auto-editor example.mp4 --edit audio:-19dB
 auto-editor example.mp4 --edit audio:-7dB
 auto-editor example.mp4 --edit motion:-19dB
-
-# The `dB` unit is a just a macro that expands into an S-expression:
-# '-19dB
-# > '(pow 10 (/ -19 20))
-# (eval '(pow 10 (/ -19 20)))
-# > 0.11220184543019636
-```
-
-### Working With Multiple Audio Tracks
-By default, only the first audio track will used for editing (track 0). You can change this with these commands.
-
-Use all audio tracks for editing:
-```
-auto-editor multi-track.mov --edit audio:stream=all
-```
-
-Use only the second, fourth, and sixth audio track:
-```
-# track numbers start at 0
-auto-editor so-many-tracks.mp4 --edit "(or audio:stream=1 audio:stream=3 audio:stream=5)"
 ```
 
 ### See What Auto-Editor Cuts Out
@@ -119,12 +99,10 @@ auto-editor example.mp4 --export premiere
 ```
 
 Auto-Editor can also export to:
-
 - DaVinci Resolve with `--export resolve`
 - Final Cut Pro with `--export final-cut-pro`
 - ShotCut with `--export shotcut`
-
-Other editors, like Sony Vegas, can understand the `premiere` format. If your favorite editor doesn't, you can use ` --export clip-sequence` which creates many video clips that can be imported and manipulated like normal.
+- Individual media clips with `--export clip-sequence`
 
 ### Naming Timelines
 By default, auto-editor will name the timeline to "Auto-Editor Media Group" if the export supports naming.
@@ -188,14 +166,11 @@ List all available options:
 auto-editor --help
 ```
 
-Use `--help` with a specific option for more information:
+Use `--help` with a specific option to learn more about it:
 
 ```
-auto-editor --scale --help
-  --scale NUM
-
-    default: 1.0
-    Scale the output video's resolution by NUM factor
+auto-editor -c:v --help
+auto-editor --margin --help
 ```
 
 <h3 align="center">Auto-Editor is available on all major platforms</h3>

{auto-editor-24.13.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.13.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.13.1/auto_editor/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "24.13.1"
-version = "24w13a"