auto-editor 23.35.1__py3-none-any.whl → 23.40.1__py3-none-any.whl

auto_editor/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "23.35.1"
-version = "23w35a"
+__version__ = "23.40.1"
+version = "23w40a"

auto_editor/analyze.py

@@ -12,9 +12,9 @@ from auto_editor.lang.json import Lexer, Parser, dump
 from auto_editor.lib.contracts import (
     is_bool,
     is_nat,
+    is_nat1,
     is_str,
     is_threshold,
-    is_uint,
     is_void,
     orc,
 )
@@ -46,28 +46,28 @@ if TYPE_CHECKING:
 audio_builder = pAttrs(
     "audio",
     pAttr("threshold", 0.04, is_threshold),
-    pAttr("stream", 0, orc(is_uint, Sym("all"), "all")),
-    pAttr("mincut", 6, is_uint),
-    pAttr("minclip", 3, is_uint),
+    pAttr("stream", 0, orc(is_nat, Sym("all"), "all")),
+    pAttr("mincut", 6, is_nat),
+    pAttr("minclip", 3, is_nat),
 )
 motion_builder = pAttrs(
     "motion",
     pAttr("threshold", 0.02, is_threshold),
-    pAttr("stream", 0, is_uint),
-    pAttr("blur", 9, is_uint),
-    pAttr("width", 400, is_nat),
+    pAttr("stream", 0, is_nat),
+    pAttr("blur", 9, is_nat),
+    pAttr("width", 400, is_nat1),
 )
 pixeldiff_builder = pAttrs(
     "pixeldiff",
-    pAttr("threshold", 1, is_uint),
-    pAttr("stream", 0, is_uint),
+    pAttr("threshold", 1, is_nat),
+    pAttr("stream", 0, is_nat),
 )
 subtitle_builder = pAttrs(
     "subtitle",
     pAttr("pattern", Required, is_str),
-    pAttr("stream", 0, is_uint),
+    pAttr("stream", 0, is_nat),
     pAttr("ignore-case", False, is_bool),
-    pAttr("max-count", None, orc(is_uint, is_void)),
+    pAttr("max-count", None, orc(is_nat, is_void)),
 )
 
 builder_map = {
@@ -149,16 +149,14 @@ def obj_tag(tag: str, tb: Fraction, obj: dict[str, Any]) -> str:
     return key
 
 
+@dataclass
 class Levels:
-    def __init__(
-        self, ensure: Ensure, src: FileInfo, tb: Fraction, bar: Bar, temp: str, log: Log
-    ):
-        self.ensure = ensure
-        self.src = src
-        self.tb = tb
-        self.bar = bar
-        self.temp = temp
-        self.log = log
+    ensure: Ensure
+    src: FileInfo
+    tb: Fraction
+    bar: Bar
+    temp: str
+    log: Log
 
     @property
     def media_length(self) -> int:
@@ -167,9 +165,7 @@ class Levels:
                 return len(arr)
 
             sr, samples = read(
-                self.ensure.audio(
-                    f"{self.src.path.resolve()}", self.src.label, stream=0
-                )
+                self.ensure.audio(f"{self.src.path.resolve()}", self.src.label, 0)
             )
             samp_count = len(samples)
             del samples

auto_editor/ffwrapper.py

@@ -298,11 +298,10 @@ class FileInfo:
                 except ValueError:
                     log.error(f"Could not convert fps '{fps_str}' to Fraction.")
 
-                if fps < 1:
-                    if codec in IMG_CODECS:
-                        fps = Fraction(25)
-                    elif fps == 0:
-                        fps = Fraction(30)
+                if fps < 1 and codec in IMG_CODECS:
+                    fps = Fraction(25)
+                if fps == 0:
+                    fps = Fraction(30)
 
                 try:
                     time_base = Fraction(time_base_str)

auto_editor/formats/fcp7.py

@@ -123,6 +123,21 @@ def read_tb_ntsc(tb: int, ntsc: bool) -> Fraction:
     return Fraction(tb)
 
 
+"""
+(define/c (read-tb-ntsc [tb int?] [ntsc bool?] -> frac?)
+    (if ntsc
+        (cond
+            ((= tb 24) 24000/1001)
+            ((= tb 30) 30000/1001)
+            ((= tb 60) 60000/1001)
+            (else (* tb 999/1000))
+        )
+        (* tb 1/1)
+    )
+)
+"""
+
+
 def speedup(speed: float) -> Element:
     fil = Element("filter")
     effect = ET.SubElement(fil, "effect")
@@ -151,6 +166,28 @@ def speedup(speed: float) -> Element:
     return fil
 
 
+"""
+(define/c (speedup [speed float?] -> element?)
+    (xml (filter (effect
+        (name "Time Remap")
+        (effectid "timeremap")
+        (parameter #:authoringApp "PremierePro"
+            (parameterid "variablespeed") (name "variablespeed")
+            (valuemin "0") (valuemax "1") (value "0")
+        )
+        (parameter #:authoringApp "PremierePro"
+            (parameterid "speed") (name "speed")
+            (valuemin "-100000") (valuemax "100000") (value (number->string speed))
+        )
+        (parameter #:authoringApp "PremierePro"
+            (parameterid "frameblending") (name "frameblending")
+            (value "FALSE")
+        )
+    )))
+)
+"""
+
+
 SUPPORTED_EFFECTS = ["timeremap"]
 
 

auto_editor/help.py

@@ -31,28 +31,28 @@ editing.
 Editing Methods:
  - audio  ; Audio silence/loudness detection
     - threshold threshold? : 4%
-    - stream (or/c uint? 'all "all") : 0
-    - mincut uint? : 6
-    - minclip uint? : 3
+    - stream (or/c nat? 'all "all") : 0
+    - mincut nat? : 6
+    - minclip nat? : 3
 
  - motion  ; Motion detection specialized for noisy real-life videos
     - threshold threshold? : 2%
-    - stream uint? : 0
-    - blur uint? : 9
-    - width nat? : 400
+    - stream nat? : 0
+    - blur nat? : 9
+    - width nat1? : 400
 
  - none  ;  Do not modify the media in anyway; mark all sections as "loud" (1).
  - all/e  ; Cut out everything out; mark all sections as "silent" (0).
 
  - pixeldiff  ; Detect when a certain amount of pixels have changed between frames.
-    - threshold uint? : 1
-    - stream uint? : 0
+    - threshold nat? : 1
+    - stream nat? : 0
 
  - subtitle  ; Detect when subtitle matches pattern as a RegEx string.
     - pattern string?
-    - stream uint? : 0
+    - stream nat? : 0
     - ignore-case bool? : #f
-    - max-count (or/c uint? void?) : (void)
+    - max-count (or/c nat? void?) : (void)
 
 Command-line Examples:
   --edit audio