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

{auto-editor-24.9.1/auto_editor.egg-info → auto_editor-24.19.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-editor
-Version: 24.9.1
+Version: 24.19.1
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
 License: Unlicense
@@ -12,8 +12,8 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.22.0
-Requires-Dist: pyav==12.0.2
-Requires-Dist: ae-ffmpeg==1.1.*
+Requires-Dist: pyav==12.0.5
+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.9.1 → auto_editor-24.19.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.9.1 → auto_editor-24.19.1}/ae-ffmpeg/ae_ffmpeg/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.1.2"
+__version__ = "1.2.0"
 
 import os.path
 from platform import machine, system

auto_editor-24.19.1/auto_editor/__init__.py

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

{auto-editor-24.9.1 → auto_editor-24.19.1}/auto_editor/edit.py

@@ -177,11 +177,11 @@ def edit_media(
         elif path_ext == ".json":
             from auto_editor.formats.json import read_json
 
-            tl = read_json(paths[0], ffmpeg, log)
+            tl = read_json(paths[0], log)
             sources = [] if tl.src is None else [tl.src]
             src = tl.src
         else:
-            sources = [initFileInfo(path, ffmpeg, log) for path in paths]
+            sources = [initFileInfo(path, log) for path in paths]
             src = None if not sources else sources[0]
 
     del paths

{auto-editor-24.9.1 → auto_editor-24.19.1}/auto_editor/ffwrapper.py

@@ -135,10 +135,10 @@ class VideoStream:
     sar: Fraction
     time_base: Fraction | None
     pix_fmt: str | None
-    color_range: str | None
-    color_space: str | None
-    color_primaries: str | None
-    color_transfer: str | None
+    color_range: int
+    color_space: int
+    color_primaries: int
+    color_transfer: int
     bitrate: int
     lang: str | None
 
@@ -189,7 +189,7 @@ class FileInfo:
         return f"@{self.path.name}"
 
 
-def initFileInfo(path: str, ffmpeg: FFmpeg, log: Log) -> FileInfo:
+def initFileInfo(path: str, log: Log) -> FileInfo:
     import av
 
     av.logging.set_level(av.logging.PANIC)
@@ -203,14 +203,11 @@ def initFileInfo(path: str, ffmpeg: FFmpeg, log: Log) -> FileInfo:
     audios: tuple[AudioStream, ...] = ()
     subtitles: tuple[SubtitleStream, ...] = ()
 
-    _dir = os.path.dirname(ffmpeg.path)
-    _ext = os.path.splitext(ffmpeg.path)[1]
-    ffprobe = os.path.join(_dir, f"ffprobe{_ext}")
-
-    for i, v in enumerate(cont.streams.video):
-        vdur = 0.0
+    for v in cont.streams.video:
         if v.duration is not None and v.time_base is not None:
             vdur = float(v.duration * v.time_base)
+        else:
+            vdur = 0.0
 
         fps = v.average_rate
         if (fps is None or fps < 1) and v.name in ("png", "mjpeg", "webp"):
@@ -218,36 +215,11 @@ def initFileInfo(path: str, ffmpeg: FFmpeg, log: Log) -> FileInfo:
         if fps is None or fps == 0:
             fps = Fraction(30)
 
-        _sar = c_range = c_space = c_primary = c_transfer = None
-        try:
-            _raw = get_stdout(
-                [
-                    ffprobe,
-                    "-v",
-                    "error",
-                    "-select_streams",
-                    f"v:{i}",
-                    "-show_entries",
-                    "stream=sample_aspect_ratio:stream=color_range:stream=color_space:stream=color_primaries:stream=color_transfer",
-                    "-of",
-                    "default=noprint_wrappers=1:nokey=1",
-                    path,
-                ]
-            )
-            _sar, c_range, c_space, c_primary, c_transfer = _raw.strip().split("\n")
-        except Exception:
-            log.debug("Unexpected ffprobe shape")
-
-        if v.sample_aspect_ratio is None:
-            if _sar is None:
-                sar = Fraction(1)
-            else:
-                try:
-                    sar = Fraction(_sar.replace(":", "/"))
-                except Exception:
-                    sar = Fraction(1)
-        else:
-            sar = v.sample_aspect_ratio
+        sar = Fraction(1) if v.sample_aspect_ratio is None else v.sample_aspect_ratio
+        cc = v.codec_context
+
+        if v.name is None:
+            log.error(f"Can't detect codec for video stream {v}")
 
         videos += (
             VideoStream(
@@ -258,11 +230,11 @@ def initFileInfo(path: str, ffmpeg: FFmpeg, log: Log) -> FileInfo:
                 vdur,
                 sar,
                 v.time_base,
-                v.codec_context.pix_fmt,
-                c_range,
-                c_space,
-                c_primary,
-                c_transfer,
+                cc.pix_fmt,
+                cc.color_range,
+                cc.colorspace,
+                cc.color_primaries,
+                cc.color_trc,
                 0 if v.bit_rate is None else v.bit_rate,
                 v.language,
             ),
@@ -273,13 +245,14 @@ def initFileInfo(path: str, ffmpeg: FFmpeg, log: Log) -> FileInfo:
         if a.duration is not None and a.time_base is not None:
             adur = float(a.duration * a.time_base)
 
+        a_cc = a.codec_context
         audios += (
             AudioStream(
-                a.codec_context.name,
-                0 if a.sample_rate is None else a.sample_rate,
-                a.channels,
+                a_cc.name,
+                0 if a_cc.sample_rate is None else a_cc.sample_rate,
+                a_cc.channels,
                 adur,
-                0 if a.bit_rate is None else a.bit_rate,
+                0 if a_cc.bit_rate is None else a_cc.bit_rate,
                 a.language,
             ),
         )

{auto-editor-24.9.1 → auto_editor-24.19.1}/auto_editor/formats/fcp11.py

@@ -32,13 +32,13 @@ def get_colorspace(src: FileInfo) -> str:
     s = src.videos[0]
     if s.pix_fmt == "rgb24":
         return "sRGB IEC61966-2.1"
-    if s.color_space == "smpte170m":
-        return "6-1-6 (Rec. 601 NTSC)"
-    if s.color_space == "bt470bg":
+    if s.color_space == 5:  # "bt470bg"
         return "5-1-6 (Rec. 601 PAL)"
-    if s.color_primaries == "bt2020":
+    if s.color_space == 6:  # "smpte170m"
+        return "6-1-6 (Rec. 601 NTSC)"
+    if s.color_primaries == 9:  # "bt2020"
         # See: https://video.stackexchange.com/questions/22059/how-to-identify-hdr-video
-        if s.color_transfer in ("arib-std-b67", "smpte2084"):
+        if s.color_transfer in (16, 18):  # "smpte2084" "arib-std-b67"
             return "9-18-9 (Rec. 2020 HLG)"
         return "9-1-9 (Rec. 2020)"
 
@@ -79,7 +79,7 @@ def fcp11_write_xml(
                 ffmpeg.run(
                     ["-i", f"{src.path.resolve()}", "-map", f"0:a:{i}", f"{newtrack}"]
                 )
-                all_srcs.append(initFileInfo(f"{newtrack}", ffmpeg, log))
+                all_srcs.append(initFileInfo(f"{newtrack}", log))
                 all_refs.append(f"r{(i + 1) * 2}")
 
     fcpxml = Element("fcpxml", version="1.10" if flavor == "resolve" else "1.11")
@@ -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.9.1 → auto_editor-24.19.1}/auto_editor/formats/fcp7.py

@@ -281,7 +281,6 @@ def fcp7_read_xml(path: str, ffmpeg: FFmpeg, log: Log) -> v3:
                     if "pathurl" in fileobj:
                         sources[file_id] = initFileInfo(
                             uri_to_path(fileobj["pathurl"]),
-                            ffmpeg,
                             log,
                         )
                     else:
@@ -297,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)
@@ -315,7 +314,7 @@ def fcp7_read_xml(path: str, ffmpeg: FFmpeg, log: Log) -> v3:
                 if file_id not in sources:
                     fileobj = valid.parse(clipitem["file"], {"pathurl": str})
                     sources[file_id] = initFileInfo(
-                        uri_to_path(fileobj["pathurl"]), ffmpeg, log
+                        uri_to_path(fileobj["pathurl"]), log
                     )
 
                 if "filter" in clipitem:
@@ -325,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(
@@ -415,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
@@ -474,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.9.1 → auto_editor-24.19.1}/auto_editor/formats/json.py

@@ -6,7 +6,7 @@ from difflib import get_close_matches
 from fractions import Fraction
 from typing import Any
 
-from auto_editor.ffwrapper import FFmpeg, FileInfo, initFileInfo
+from auto_editor.ffwrapper import FileInfo, initFileInfo
 from auto_editor.lang.json import Lexer, Parser, dump
 from auto_editor.lib.err import MyError
 from auto_editor.timeline import (
@@ -42,7 +42,7 @@ def check_file(path: str, log: Log) -> None:
         log.error(f"Could not locate media file: '{path}'")
 
 
-def read_v3(tl: Any, ffmpeg: FFmpeg, log: Log) -> v3:
+def read_v3(tl: Any, log: Log) -> v3:
     check_attrs(
         tl,
         log,
@@ -59,7 +59,7 @@ def read_v3(tl: Any, ffmpeg: FFmpeg, log: Log) -> v3:
     def make_src(v: str) -> FileInfo:
         if v in srcs:
             return srcs[v]
-        temp = initFileInfo(v, ffmpeg, log)
+        temp = initFileInfo(v, log)
         srcs[v] = temp
         return temp
 
@@ -158,7 +158,7 @@ def read_v3(tl: Any, ffmpeg: FFmpeg, log: Log) -> v3:
     return v3(src, tb, sr, res, bg, v, a, v1=None)
 
 
-def read_v1(tl: Any, ffmpeg: FFmpeg, log: Log) -> v3:
+def read_v1(tl: Any, log: Log) -> v3:
     from auto_editor.make_layers import clipify
 
     check_attrs(tl, log, "source", "chunks")
@@ -168,11 +168,32 @@ def read_v1(tl: Any, ffmpeg: FFmpeg, log: Log) -> v3:
 
     check_file(path, log)
 
-    src = initFileInfo(path, ffmpeg, log)
+    src = initFileInfo(path, log)
 
     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]) is not int or chunk[0] < 0:
+            log.error(f"Invalid start at chunk {i}")
+        if type(chunk[1]) is not int 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:
+            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]
+
     for c in clipify(chunks, src):
         if src.videos:
             if len(vtl) == 0:
@@ -194,7 +215,7 @@ def read_v1(tl: Any, ffmpeg: FFmpeg, log: Log) -> v3:
     )
 
 
-def read_json(path: str, ffmpeg: FFmpeg, log: Log) -> v3:
+def read_json(path: str, log: Log) -> v3:
     with open(path, encoding="utf-8", errors="ignore") as f:
         try:
             tl = Parser(Lexer(path, f)).expr()
@@ -206,9 +227,9 @@ def read_json(path: str, ffmpeg: FFmpeg, log: Log) -> v3:
     ver = tl["version"]
 
     if ver == "3":
-        return read_v3(tl, ffmpeg, log)
+        return read_v3(tl, log)
     if ver == "1":
-        return read_v1(tl, ffmpeg, log)
+        return read_v1(tl, log)
     if type(ver) is not str:
         log.error("version needs to be a string")
     log.error(f"Importing version {ver} timelines is not supported.")

{auto-editor-24.9.1 → auto_editor-24.19.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.9.1 → auto_editor-24.19.1}/auto_editor/make_layers.py

@@ -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))
@@ -125,7 +125,14 @@ 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 = 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
+
         res = inp.get_res() if args.resolution is None else args.resolution
 
     try:
@@ -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.9.1 → auto_editor-24.19.1}/auto_editor/output.py

@@ -182,12 +182,19 @@ def mux_quality_media(
         cmd += _ffset("-c:a", args.audio_codec) + _ffset("-b:a", args.audio_bitrate)
 
     if same_container and v_tracks > 0:
-        cmd += (
-            _ffset("-color_range", src.videos[0].color_range)
-            + _ffset("-colorspace", src.videos[0].color_space)
-            + _ffset("-color_primaries", src.videos[0].color_primaries)
-            + _ffset("-color_trc", src.videos[0].color_transfer)
-        )
+        color_range = src.videos[0].color_range
+        colorspace = src.videos[0].color_space
+        color_prim = src.videos[0].color_primaries
+        color_trc = src.videos[0].color_transfer
+
+        if color_range == 1 or color_range == 2:
+            cmd.extend(["-color_range", f"{color_range}"])
+        if colorspace in (0, 1) or (colorspace >= 3 and colorspace < 16):
+            cmd.extend(["-colorspace", f"{colorspace}"])
+        if color_prim in (0, 1) or (color_prim >= 4 and color_prim < 17):
+            cmd.extend(["-color_primaries", f"{color_prim}"])
+        if color_trc == 1 or (color_trc >= 4 and color_trc < 22):
+            cmd.extend(["-color_trc", f"{color_trc}"])
 
     if args.extras is not None:
         cmd.extend(args.extras.split(" "))

{auto-editor-24.9.1 → auto_editor-24.19.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.9.1 → auto_editor-24.19.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.9.1 → auto_editor-24.19.1}/auto_editor/render/video.py

@@ -97,7 +97,6 @@ def make_image_cache(tl: v3) -> dict[tuple[FileInfo, int], np.ndarray]:
         for obj in clip:
             if isinstance(obj, TlImage) and obj.src not in img_cache:
                 with av.open(obj.src.path) as cn:
-                    assert isinstance(cn, av.InputContainer)
                     my_stream = cn.streams.video[0]
                     for frame in cn.decode(my_stream):
                         if obj.width != 0:
@@ -245,7 +244,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.9.1 → auto_editor-24.19.1}/auto_editor/subcommands/desc.py

@@ -3,28 +3,26 @@ from __future__ import annotations
 import sys
 from dataclasses import dataclass, field
 
-from auto_editor.ffwrapper import FFmpeg, initFileInfo
+from auto_editor.ffwrapper import initFileInfo
 from auto_editor.utils.log import Log
 from auto_editor.vanparse import ArgumentParser
 
 
 @dataclass(slots=True)
 class DescArgs:
-    ffmpeg_location: str | None = None
     help: bool = False
     input: list[str] = field(default_factory=list)
 
 
 def desc_options(parser: ArgumentParser) -> ArgumentParser:
     parser.add_required("input", nargs="*")
-    parser.add_argument("--ffmpeg-location", help="Point to your custom ffmpeg file")
     return parser
 
 
 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, FFmpeg(args.ffmpeg_location), Log())
+        src = initFileInfo(path, Log())
         if src.description is not None:
             sys.stdout.write(f"\n{src.description}\n\n")
         else: