auto-editor 24.25.1__tar.gz → 24.27.1__tar.gz

{auto_editor-24.25.1/auto_editor.egg-info → auto_editor-24.27.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-editor
-Version: 24.25.1
+Version: 24.27.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.1.0
+Requires-Dist: pyav==12.2.*
 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.27.1/auto_editor/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "24.27.1"
+version = "24w27a"

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/__main__.py

@@ -311,10 +311,10 @@ def main() -> None:
 
         import av
 
-        print(f"Python Version: {plat.python_version()}")
-        print(f"Platform: {plat.system()} {plat.release()} {plat.machine().lower()}")
-        print(f"PyAV Version: {av.__version__}")
-        print(f"Auto-Editor Version: {auto_editor.version}")
+        print(f"OS: {plat.system()} {plat.release()} {plat.machine().lower()}")
+        print(f"Python: {plat.python_version()}")
+        print(f"PyAV: {av.__version__}")
+        print(f"Auto-Editor: {auto_editor.version}")
         return
 
     if not args.input:

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/edit.py

@@ -160,7 +160,7 @@ def edit_media(
         if path_ext == ".xml":
             from auto_editor.formats.fcp7 import fcp7_read_xml
 
-            tl = fcp7_read_xml(paths[0], ffmpeg, log)
+            tl = fcp7_read_xml(paths[0], log)
             assert tl.src is not None
             sources: list[FileInfo] = [tl.src]
             src: FileInfo | None = tl.src
@@ -168,7 +168,7 @@ def edit_media(
         elif path_ext == ".mlt":
             from auto_editor.formats.shotcut import shotcut_read_mlt
 
-            tl = shotcut_read_mlt(paths[0], ffmpeg, log)
+            tl = shotcut_read_mlt(paths[0], log)
             assert tl.src is not None
             sources = [tl.src]
             src = tl.src
@@ -209,7 +209,7 @@ def edit_media(
     else:
         samplerate = args.sample_rate
 
-    ensure = Ensure(ffmpeg, samplerate, temp, log)
+    ensure = Ensure(ffmpeg, bar, samplerate, temp, log)
 
     if tl is None:
         tl = make_timeline(sources, ensure, args, samplerate, bar, temp, log)

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/ffwrapper.py

@@ -11,6 +11,8 @@ from shutil import which
 from subprocess import PIPE, Popen
 from typing import Any
 
+import av
+
 from auto_editor.utils.func import get_stdout
 from auto_editor.utils.log import Log
 
@@ -190,10 +192,12 @@ class FileInfo:
 
 
 def initFileInfo(path: str, log: Log) -> FileInfo:
-    import av
-
     try:
         cont = av.open(path, "r")
+    except av.error.FileNotFoundError:
+        log.error(f"Could not find '{path}'")
+    except av.error.IsADirectoryError:
+        log.error(f"Expected a media file, but got a directory: {path}")
     except av.error.InvalidDataError:
         log.error(f"Invalid data when processing: {path}")
 

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/formats/fcp7.py

@@ -7,7 +7,7 @@ from math import ceil
 from typing import TYPE_CHECKING
 from xml.etree.ElementTree import Element
 
-from auto_editor.ffwrapper import FFmpeg, FileInfo, initFileInfo
+from auto_editor.ffwrapper import FileInfo, initFileInfo
 from auto_editor.timeline import ASpace, TlAudio, TlVideo, VSpace, v3
 
 from .utils import Validator, show
@@ -177,7 +177,7 @@ def read_filters(clipitem: Element, log: Log) -> float:
     return 1.0
 
 
-def fcp7_read_xml(path: str, ffmpeg: FFmpeg, log: Log) -> v3:
+def fcp7_read_xml(path: str, log: Log) -> v3:
     def xml_bool(val: str) -> bool:
         if val == "TRUE":
             return True

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/formats/shotcut.py

@@ -9,7 +9,6 @@ from auto_editor.utils.func import aspect_ratio, to_timecode
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
-    from auto_editor.ffwrapper import FFmpeg
     from auto_editor.timeline import TlAudio, TlVideo
     from auto_editor.utils.log import Log
 
@@ -22,7 +21,7 @@ https://mltframework.org/docs/mltxml/
 """
 
 
-def shotcut_read_mlt(path: str, ffmpeg: FFmpeg, log: Log) -> v3:
+def shotcut_read_mlt(path: str, log: Log) -> v3:
     raise NotImplementedError
 
 

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/make_layers.py

@@ -38,7 +38,7 @@ def clipify(chunks: Chunks, src: FileInfo, start: int = 0) -> list[Clip]:
     clips: list[Clip] = []
     i = 0
     for chunk in chunks:
-        if chunk[2] != 99999:
+        if chunk[2] > 0 and chunk[2] < 99999.0:
             dur = round((chunk[1] - chunk[0]) / chunk[2])
             if dur == 0:
                 continue

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/output.py

@@ -4,7 +4,11 @@ import os.path
 from dataclasses import dataclass, field
 from fractions import Fraction
 
+import av
+from av.audio.resampler import AudioResampler
+
 from auto_editor.ffwrapper import FFmpeg, FileInfo
+from auto_editor.utils.bar import Bar
 from auto_editor.utils.container import Container
 from auto_editor.utils.log import Log
 from auto_editor.utils.types import Args
@@ -13,6 +17,7 @@ from auto_editor.utils.types import Args
 @dataclass(slots=True)
 class Ensure:
     _ffmpeg: FFmpeg
+    _bar: Bar
     _sr: int
     temp: str
     log: Log
@@ -31,12 +36,42 @@ class Ensure:
         out_path = os.path.join(self.temp, f"{label:x}.wav")
 
         if first_time:
+            sample_rate = self._sr
+            bar = self._bar
             self.log.debug(f"Making external audio: {out_path}")
-            self.log.conwrite("Extracting audio")
 
-            cmd = ["-i", f"{src.path}", "-map", f"0:a:{stream}"]
-            cmd += ["-ac", "2", "-ar", f"{self._sr}", "-rf64", "always", out_path]
-            self._ffmpeg.run(cmd)
+            in_container = av.open(src.path, "r")
+            out_container = av.open(
+                out_path, "w", format="wav", options={"rf64": "always"}
+            )
+            astream = in_container.streams.audio[stream]
+
+            if astream.duration is None or astream.time_base is None:
+                dur = 1
+            else:
+                dur = int(astream.duration * astream.time_base)
+
+            bar.start(dur, "Extracting audio")
+
+            # PyAV always uses "stereo" layout, which is what we want.
+            output_astream = out_container.add_stream("pcm_s16le", rate=sample_rate)
+            assert isinstance(output_astream, av.audio.stream.AudioStream)
+
+            resampler = AudioResampler(format="s16", layout="stereo", rate=sample_rate)  # type: ignore
+            for i, frame in enumerate(in_container.decode(astream)):
+                if i % 1500 == 0:
+                    bar.tick(0 if frame.time is None else frame.time)
+
+                for new_frame in resampler.resample(frame):
+                    for packet in output_astream.encode(new_frame):
+                        out_container.mux_one(packet)
+
+            for packet in output_astream.encode():
+                out_container.mux_one(packet)
+
+            out_container.close()
+            in_container.close()
+            bar.end()
 
         return out_path
 

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/render/video.py

@@ -103,8 +103,8 @@ def make_image_cache(tl: v3) -> dict[tuple[FileInfo, int], np.ndarray]:
                                 graph.add("scale", f"{obj.width}:-1"),
                                 graph.add("buffersink"),
                             )
-                            graph.push(frame)
-                            frame = graph.pull()
+                            graph.vpush(frame)
+                            frame = graph.vpull()
                         img_cache[(obj.src, obj.width)] = frame.to_ndarray(
                             format="rgb24"
                         )
@@ -122,7 +122,7 @@ def render_av(
     log: Log,
 ) -> tuple[str, bool]:
     src = tl.src
-    cns: dict[FileInfo, av.InputContainer] = {}
+    cns: dict[FileInfo, av.container.InputContainer] = {}
     decoders: dict[FileInfo, Iterator[av.VideoFrame]] = {}
     seek_cost: dict[FileInfo, int] = {}
     tous: dict[FileInfo, int] = {}
@@ -302,8 +302,8 @@ def render_av(
                             graph.add("pad", f"{width}:{height}:-1:-1:color={bg}"),
                             graph.add("buffersink"),
                         )
-                        graph.push(frame)
-                        frame = graph.pull()
+                        graph.vpush(frame)
+                        frame = graph.vpull()
                 elif isinstance(obj, TlRect):
                     graph = av.filter.Graph()
                     x, y = apply_anchor(obj.x, obj.y, obj.width, obj.height, obj.anchor)
@@ -315,8 +315,8 @@ def render_av(
                         ),
                         graph.add("buffersink"),
                     )
-                    graph.push(frame)
-                    frame = graph.pull()
+                    graph.vpush(frame)
+                    frame = graph.vpull()
                 elif isinstance(obj, TlImage):
                     img = img_cache[(obj.src, obj.width)]
                     array = frame.to_ndarray(format="rgb24")
@@ -355,8 +355,8 @@ def render_av(
                     frame = av.VideoFrame.from_ndarray(array, format="rgb24")
 
             if scale_graph is not None and frame.width != target_width:
-                scale_graph.push(frame)
-                frame = scale_graph.pull()
+                scale_graph.vpush(frame)
+                frame = scale_graph.vpull()
 
             if frame.format.name != target_pix_fmt:
                 frame = frame.reformat(format=target_pix_fmt)

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/subcommands/levels.py

@@ -85,7 +85,7 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
     src = sources[0]
 
     tb = src.get_fps() if args.timebase is None else args.timebase
-    ensure = Ensure(ffmpeg, src.get_sr(), temp, log)
+    ensure = Ensure(ffmpeg, bar, src.get_sr(), temp, log)
 
     if ":" in args.edit:
         method, attrs = args.edit.split(":", 1)

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/subcommands/repl.py

@@ -73,8 +73,8 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
         sources = [initFileInfo(path, log) for path in args.input]
         src = sources[0]
         tb = src.get_fps() if args.timebase is None else args.timebase
-        ensure = Ensure(ffmpeg, src.get_sr(), temp, log)
         bar = Bar("none")
+        ensure = Ensure(ffmpeg, bar, src.get_sr(), temp, log)
         env["timebase"] = tb
         env["@levels"] = Levels(ensure, src, tb, bar, temp, log)
         env["@filesetup"] = FileSetup(src, ensure, strict, tb, bar, temp, log)

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/subcommands/test.py

@@ -340,11 +340,19 @@ def main(sys_args: list[str] | None = None):
     def track_tests():
         return run.main(["resources/multi-track.mov"], ["--keep_tracks_seperate"])
 
-    def json_tests():
+    def export_json_tests():
         out = run.main(["example.mp4"], ["--export_as_json"])
         out2 = run.main([out], [])
         return out, out2
 
+    def import_v1_tests():
+        with open("v1.json", "w") as file:
+            file.write(
+                """{"version": "1", "source": "example.mp4", "chunks": [ [0, 26, 1.0], [26, 34, 0] ]}"""
+            )
+
+        return run.main(["v1.json"], [])
+
     def premiere_named_export():
         run.main(["example.mp4"], ["--export", 'premiere:name="Foo Bar"'])
 
@@ -524,9 +532,7 @@ def main(sys_args: list[str] | None = None):
     #  Issue 280
     def SAR():
         out = run.main(["resources/SAR-2by3.mp4"], [])
-
-        # It's working, PyAV just can't detect the changes.
-        # assert checker.check(out).videos[0].sar == Fraction(2, 3)
+        assert checker.check(out).videos[0].sar == Fraction(2, 3)
 
         return out
 
@@ -711,7 +717,8 @@ def main(sys_args: list[str] | None = None):
                 edit_positive_tests,
                 audio_norm_f,
                 audio_norm_ebu,
-                json_tests,
+                export_json_tests,
+                import_v1_tests,
                 high_speed_test,
                 video_speed,
                 multi_track_edit,

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/validate_input.py

@@ -67,20 +67,17 @@ def download_video(my_input: str, args: Args, ffmpeg: FFmpeg, log: Log) -> str:
 
 
 def valid_input(inputs: list[str], ffmpeg: FFmpeg, args: Args, log: Log) -> list[str]:
-    new_inputs = []
+    result = []
 
     for my_input in inputs:
-        if os.path.isfile(my_input):
+        if my_input.startswith("http://") or my_input.startswith("https://"):
+            result.append(download_video(my_input, args, ffmpeg, log))
+        else:
             _, ext = os.path.splitext(my_input)
             if ext == "":
-                log.error("File must have an extension.")
-            new_inputs.append(my_input)
-
-        elif my_input.startswith("http://") or my_input.startswith("https://"):
-            new_inputs.append(download_video(my_input, args, ffmpeg, log))
-        else:
-            if os.path.isdir(my_input):
-                log.error("Input must be a file or a URL, not a directory.")
-            log.error(f"Could not find '{my_input}'")
+                if os.path.isdir(my_input):
+                    log.error("Input must be a file or a URL, not a directory.")
+                log.error("Input file must have an extension.")
+            result.append(my_input)
 
-    return new_inputs
+    return result

{auto_editor-24.25.1 → auto_editor-24.27.1}/auto_editor/vanparse.py

@@ -119,7 +119,7 @@ def to_key(op: Options | Required) -> str:
     return op.names[0][:2].replace("-", "") + op.names[0][2:].replace("-", "_")
 
 
-def print_option_help(program_name: str | None, ns_obj: T, option: Options) -> None:
+def print_option_help(name: str | None, ns_obj: object, option: Options) -> None:
     text = StringIO()
     text.write(
         f"  {', '.join(option.names)} {'' if option.metavar is None else option.metavar}\n\n"
@@ -145,8 +145,8 @@ def print_option_help(program_name: str | None, ns_obj: T, option: Options) -> N
 
     from auto_editor.help import data
 
-    if program_name is not None and option.names[0] in data[program_name]:
-        text.write(indent(data[program_name][option.names[0]], "    ") + "\n")
+    if name is not None and option.names[0] in data[name]:
+        text.write(indent(data[name][option.names[0]], "    ") + "\n")
     else:
         text.write(f"    {option.help}\n\n")
 

{auto_editor-24.25.1 → auto_editor-24.27.1/auto_editor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-editor
-Version: 24.25.1
+Version: 24.27.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.1.0
+Requires-Dist: pyav==12.2.*
 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.25.1 → auto_editor-24.27.1}/auto_editor.egg-info/requires.txt

@@ -1,3 +1,3 @@
 numpy>=1.22.0
-pyav==12.1.0
+pyav==12.2.*
 ae-ffmpeg==1.2.*

{auto_editor-24.25.1 → auto_editor-24.27.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.1.0",
+    "pyav==12.2.*",
     "ae-ffmpeg==1.2.*",
 ]
 keywords = [

auto_editor-24.25.1/auto_editor/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "24.25.1"
-version = "24w25a"