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

{auto-editor-24.7.1/auto_editor.egg-info → auto-editor-24.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-editor
-Version: 24.7.1
+Version: 24.13.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>
 

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

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

{auto-editor-24.7.1 → auto-editor-24.13.1}/auto_editor/analyze.py

@@ -21,13 +21,10 @@ from auto_editor.lib.contracts import (
 from auto_editor.lib.data_structs import Sym
 from auto_editor.render.subtitle import SubtitleParser
 from auto_editor.utils.cmdkw import (
-    ParserError,
     Required,
-    parse_with_palet,
     pAttr,
     pAttrs,
 )
-from auto_editor.utils.func import boolop
 from auto_editor.wavfile import read
 
 if TYPE_CHECKING:
@@ -38,7 +35,6 @@ if TYPE_CHECKING:
     from numpy.typing import NDArray
 
     from auto_editor.ffwrapper import FileInfo
-    from auto_editor.lib.data_structs import Env
     from auto_editor.output import Ensure
     from auto_editor.utils.bar import Bar
     from auto_editor.utils.log import Log
@@ -412,81 +408,3 @@ class Levels:
 
         self.bar.end()
         return self.cache("motion", mobj, threshold_list[:index])
-
-
-def edit_method(val: str, filesetup: FileSetup, env: Env) -> NDArray[np.bool_]:
-    assert isinstance(filesetup, FileSetup)
-    src = filesetup.src
-    tb = filesetup.tb
-    ensure = filesetup.ensure
-    strict = filesetup.strict
-    bar = filesetup.bar
-    temp = filesetup.temp
-    log = filesetup.log
-
-    if ":" in val:
-        method, attrs = val.split(":", 1)
-    else:
-        method, attrs = val, ""
-
-    levels = Levels(ensure, src, tb, bar, temp, log)
-
-    if method == "none":
-        return levels.none()
-    if method == "all/e":
-        return levels.all()
-
-    try:
-        obj = parse_with_palet(attrs, builder_map[method], env)
-    except ParserError as e:
-        log.error(e)
-
-    try:
-        if method == "audio":
-            s = obj["stream"]
-            if s == "all" or s == Sym("all"):
-                total_list: NDArray[np.bool_] | None = None
-                for s in range(len(src.audios)):
-                    audio_list = to_threshold(levels.audio(s), obj["threshold"])
-                    if total_list is None:
-                        total_list = audio_list
-                    else:
-                        total_list = boolop(total_list, audio_list, np.logical_or)
-
-                if total_list is None:
-                    if strict:
-                        log.error("Input has no audio streams.")
-                    stream_data = levels.all()
-                else:
-                    stream_data = total_list
-            else:
-                assert isinstance(s, int)
-                stream_data = to_threshold(levels.audio(s), obj["threshold"])
-
-            assert isinstance(obj["minclip"], int)
-            assert isinstance(obj["mincut"], int)
-
-            mut_remove_small(stream_data, obj["minclip"], replace=1, with_=0)
-            mut_remove_small(stream_data, obj["mincut"], replace=0, with_=1)
-
-            return stream_data
-
-        if method == "motion":
-            return to_threshold(
-                levels.motion(obj["stream"], obj["blur"], obj["width"]),
-                obj["threshold"],
-            )
-
-        if method == "subtitle":
-            return levels.subtitle(
-                obj["pattern"],
-                obj["stream"],
-                obj["ignore_case"],
-                obj["max_count"],
-            )
-    except LevelError as e:
-        if strict:
-            log.error(e)
-
-        return levels.all()
-    raise ValueError("Unreachable")

{auto-editor-24.7.1 → auto-editor-24.13.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.7.1 → auto-editor-24.13.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,33 +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:
-            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(
@@ -255,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,
             ),
@@ -270,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.7.1 → auto-editor-24.13.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")

{auto-editor-24.7.1 → auto-editor-24.13.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:
@@ -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:
@@ -363,7 +362,6 @@ def media_def(
         ET.SubElement(rate, "ntsc").text = ntsc
         ET.SubElement(vschar, "width").text = f"{tl.res[0]}"
         ET.SubElement(vschar, "height").text = f"{tl.res[1]}"
-        ET.SubElement(vschar, "anamorphic").text = "FALSE"
         ET.SubElement(vschar, "pixelaspectratio").text = "square"
 
     for aud in src.audios:
@@ -389,7 +387,7 @@ def fcp7_write_xml(name: str, output: str, tl: v3, log: Log) -> None:
         src_to_id[src] = the_id
 
     xmeml = ET.Element("xmeml", version="5")
-    sequence = ET.SubElement(xmeml, "sequence")
+    sequence = ET.SubElement(xmeml, "sequence", explodedTracks="true")
     ET.SubElement(sequence, "name").text = name
     ET.SubElement(sequence, "duration").text = f"{int(tl.out_len())}"
     rate = ET.SubElement(sequence, "rate")
@@ -400,13 +398,14 @@ def fcp7_write_xml(name: str, output: str, tl: v3, log: Log) -> None:
     vformat = ET.SubElement(video, "format")
     vschar = ET.SubElement(vformat, "samplecharacteristics")
 
-    rate = ET.SubElement(vschar, "rate")
-    ET.SubElement(rate, "timebase").text = f"{timebase}"
-    ET.SubElement(rate, "ntsc").text = ntsc
     ET.SubElement(vschar, "width").text = f"{width}"
     ET.SubElement(vschar, "height").text = f"{height}"
     ET.SubElement(vschar, "pixelaspectratio").text = "square"
 
+    rate = ET.SubElement(vschar, "rate")
+    ET.SubElement(rate, "timebase").text = f"{timebase}"
+    ET.SubElement(rate, "ntsc").text = ntsc
+
     if len(tl.v) > 0 and len(tl.v[0]) > 0:
         track = ET.SubElement(video, "track")
 
@@ -420,6 +419,7 @@ def fcp7_write_xml(name: str, output: str, tl: v3, log: Log) -> None:
 
             clipitem = ET.SubElement(track, "clipitem", id=f"clipitem-{j+1}")
             ET.SubElement(clipitem, "name").text = src.path.stem
+            ET.SubElement(clipitem, "enabled").text = "TRUE"
             ET.SubElement(clipitem, "start").text = _start
             ET.SubElement(clipitem, "end").text = _end
             ET.SubElement(clipitem, "in").text = _in
@@ -433,6 +433,7 @@ def fcp7_write_xml(name: str, output: str, tl: v3, log: Log) -> None:
                 media_def(filedef, pathurl, clip.src, tl, timebase, ntsc)
                 file_defs.add(pathurl)
 
+            ET.SubElement(clipitem, "compositemode").text = "normal"
             if clip.speed != 1:
                 clipitem.append(speedup(clip.speed * 100))
 
@@ -444,8 +445,6 @@ def fcp7_write_xml(name: str, output: str, tl: v3, log: Log) -> None:
                 ET.SubElement(link, "mediatype").text = "video" if i == 0 else "audio"
                 ET.SubElement(link, "trackindex").text = str(max(i, 1))
                 ET.SubElement(link, "clipindex").text = str(j + 1)
-                if i > 0:
-                    ET.SubElement(link, "groupindex").text = "1"
 
     # Audio definitions and clips
     audio = ET.SubElement(media, "audio")
@@ -489,6 +488,7 @@ def fcp7_write_xml(name: str, output: str, tl: v3, log: Log) -> None:
                     premiereChannelType="stereo",
                 )
                 ET.SubElement(clipitem, "name").text = src.path.stem
+                ET.SubElement(clipitem, "enabled").text = "TRUE"
                 ET.SubElement(clipitem, "start").text = _start
                 ET.SubElement(clipitem, "end").text = _end
                 ET.SubElement(clipitem, "in").text = _in
@@ -502,7 +502,7 @@ def fcp7_write_xml(name: str, output: str, tl: v3, log: Log) -> None:
 
                 sourcetrack = ET.SubElement(clipitem, "sourcetrack")
                 ET.SubElement(sourcetrack, "mediatype").text = "audio"
-                ET.SubElement(sourcetrack, "trackindex").text = f"{t + 1}"
+                ET.SubElement(sourcetrack, "trackindex").text = f"{t}"
                 labels = ET.SubElement(clipitem, "labels")
                 ET.SubElement(labels, "label2").text = "Iris"
 
@@ -512,5 +512,5 @@ def fcp7_write_xml(name: str, output: str, tl: v3, log: Log) -> None:
             audio.append(track)
 
     tree = ET.ElementTree(xmeml)
-    ET.indent(tree, space="\t", level=0)
+    ET.indent(tree, space="  ", level=0)
     tree.write(output, xml_declaration=True, encoding="utf-8")

{auto-editor-24.7.1 → auto-editor-24.13.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,7 +168,7 @@ 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))]
@@ -194,7 +194,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 +206,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.7.1 → auto-editor-24.13.1}/auto_editor/help.py

@@ -25,16 +25,19 @@ will set the speed from 400 ticks to 800 ticks to 2.5x
 If timebase is 30, 400 ticks to 800 means 13.33 to 26.66 seconds
 """.strip(),
         "--edit-based-on": """
-Evalutes a palet expression that returns a bool-array?. The array is then used for
+Evaluates a palet expression that returns a bool-array?. The array is then used for
 editing.
 
 Editing Methods:
  - audio  ; Audio silence/loudness detection
     - threshold threshold? : 4%
-    - stream (or/c nat? 'all "all") : 0
+    - stream (or/c nat? 'all) : 'all
     - mincut nat? : 6
     - minclip nat? : 3
 
+ ; mincut is more significant, there it has a larger default value.
+ ; minclip gets applied first, then mincut
+
  - motion  ; Motion detection specialized for noisy real-life videos
     - threshold threshold? : 2%
     - stream nat? : 0
@@ -150,10 +153,6 @@ The special value `unset` may also be used, and means: Don't pass any value to f
 """.strip(),
         "--video-bitrate": """
 `--video-bitrate` sets the target bitrate for the video encoder. It accepts the same format as `--audio-bitrate` and the special `unset` value is allowed.
-""".strip(),
-        "--silent-threshold": """
-Silent threshold is a percentage where 0% represents absolute silence and 100% represents the highest volume in the media file.
-Setting the threshold to `0%` will cut only out areas where area is absolutely silence.
 """.strip(),
         "--margin": """
 Default value: 0.2s,0.2s