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

{auto-editor-24.13.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.13.1
+Version: 24.19.1
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
 License: Unlicense
@@ -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.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.19.1/auto_editor/__init__.py

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

{auto-editor-24.13.1 → auto_editor-24.19.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.19.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.19.1}/auto_editor/formats/json.py

@@ -173,6 +173,27 @@ 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]) 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:

{auto-editor-24.13.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.13.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.13.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.13.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.13.1 → auto_editor-24.19.1}/auto_editor/render/video.py

@@ -244,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.13.1 → auto_editor-24.19.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.19.1/auto_editor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-editor
-Version: 24.13.1
+Version: 24.19.1
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
 License: Unlicense
@@ -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/__init__.py

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