auto-editor 26.3.0__py3-none-any.whl → 26.3.1__py3-none-any.whl

auto_editor/__init__.py

@@ -1 +1 @@
-__version__ = "26.3.0"
+__version__ = "26.3.1"

auto_editor/analyze.py

@@ -178,7 +178,6 @@ class Levels:
 
             with av.open(self.src.path, "r") as container:
                 audio_stream = container.streams.audio[0]
-                self.log.experimental(audio_stream.codec)
                 result = sum(1 for _ in iter_audio(audio_stream, self.tb))
 
             self.log.debug(f"Audio Length: {result}")
@@ -263,9 +262,6 @@ class Levels:
         container = av.open(self.src.path, "r")
         audio = container.streams.audio[stream]
 
-        if audio.codec.experimental:
-            self.log.error(f"`{audio.codec.name}` is an experimental codec")
-
         if audio.duration is not None and audio.time_base is not None:
             inaccurate_dur = int(audio.duration * audio.time_base * self.tb)
         elif container.duration is not None:
@@ -304,9 +300,6 @@ class Levels:
         container = av.open(self.src.path, "r")
         video = container.streams.video[stream]
 
-        if video.codec.experimental:
-            self.log.experimental(video.codec)
-
         inaccurate_dur = (
             1024
             if video.duration is None or video.time_base is None

auto_editor/cmds/levels.py

@@ -136,7 +136,6 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
                 else:
                     container = av.open(src.path, "r")
                     audio_stream = container.streams.audio[obj["stream"]]
-                    log.experimental(audio_stream.codec)
 
                     values = []
 
@@ -158,7 +157,6 @@ def main(sys_args: list[str] = sys.argv[1:]) -> None:
                 else:
                     container = av.open(src.path, "r")
                     video_stream = container.streams.video[obj["stream"]]
-                    log.experimental(video_stream.codec)
 
                     values = []
 

auto_editor/cmds/test.py

@@ -9,6 +9,7 @@ from fractions import Fraction
 from time import perf_counter
 from typing import TYPE_CHECKING
 
+import av
 import numpy as np
 
 from auto_editor.ffwrapper import FileInfo, initFileInfo
@@ -235,6 +236,11 @@ def main(sys_args: list[str] | None = None):
 
     def example():
         out = run.main(inputs=["example.mp4"], cmd=[])
+
+        with av.open(out) as container:
+            assert container.streams[0].type == "video"
+            assert container.streams[1].type == "audio"
+
         cn = fileinfo(out)
         video = cn.videos[0]
 

auto_editor/edit.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import os
 import sys
 from fractions import Fraction
+from heapq import heappop, heappush
 from os.path import splitext
 from subprocess import run
 from typing import Any
@@ -309,6 +310,13 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
         else:
             audio_paths = []
 
+        # Setup video
+        if ctr.default_vid != "none" and tl.v:
+            vframes = render_av(output, tl, args, log)
+            output_stream = next(vframes)
+        else:
+            output_stream, vframes = None, iter([])
+
         # Setup audio
         if audio_paths:
             try:
@@ -363,23 +371,16 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
             subtitle_streams.append(subtitle_stream)
             sub_gen_frames.append(subtitle_input.demux(subtitles=0))
 
-        # Setup video
-        if ctr.default_vid != "none" and tl.v:
-            vframes = render_av(output, tl, args, log)
-            output_stream = next(vframes)
-        else:
-            output_stream, vframes = None, iter([])
-
         no_color = log.no_color or log.machine
         encoder_titles = []
         if output_stream is not None:
             name = output_stream.codec.canonical_name
             encoder_titles.append(name if no_color else f"\033[95m{name}")
         if audio_streams:
-            name = audio_streams[0].name
+            name = audio_streams[0].codec.canonical_name
             encoder_titles.append(name if no_color else f"\033[96m{name}")
         if subtitle_streams:
-            name = subtitle_streams[0].name
+            name = subtitle_streams[0].codec.canonical_name
             encoder_titles.append(name if no_color else f"\033[32m{name}")
 
         title = f"({os.path.splitext(output_path)[1][1:]}) "
@@ -389,11 +390,68 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
             title += "\033[0m+".join(encoder_titles) + "\033[0m"
         bar.start(tl.end, title)
 
-        # Process frames
+        MAX_AUDIO_AHEAD = 30  # In timebase, how far audio can be ahead of video.
+        MAX_SUB_AHEAD = 30
+
+        class Priority:
+            __slots__ = ("index", "frame_type", "frame", "stream")
+
+            def __init__(self, value: int | Fraction, frame, stream):
+                self.frame_type: str = stream.type
+                assert self.frame_type in ("audio", "subtitle", "video")
+                if self.frame_type in {"audio", "subtitle"}:
+                    self.index: int | float = round(value * frame.time_base * tl.tb)
+                else:
+                    self.index = float("inf") if value is None else int(value)
+                self.frame = frame
+                self.stream = stream
+
+            def __lt__(self, other):
+                return self.index < other.index
+
+            def __eq__(self, other):
+                return self.index == other.index
+
+        # Priority queue for ordered frames by time_base.
+        frame_queue: list[Priority] = []
+        latest_audio_index = float("-inf")
+        latest_sub_index = float("-inf")
+        earliest_video_index = None
+
         while True:
-            audio_frames = [next(frames, None) for frames in audio_gen_frames]
+            if earliest_video_index is None:
+                should_get_audio = True
+                should_get_sub = True
+            else:
+                for item in frame_queue:
+                    if item.frame_type == "audio":
+                        latest_audio_index = max(latest_audio_index, item.index)
+                    elif item.frame_type == "subtitle":
+                        latest_sub_index = max(latest_sub_index, item.index)
+
+                should_get_audio = (
+                    latest_audio_index <= earliest_video_index + MAX_AUDIO_AHEAD
+                )
+                should_get_sub = (
+                    latest_sub_index <= earliest_video_index + MAX_SUB_AHEAD
+                )
+
             index, video_frame = next(vframes, (0, None))
-            subtitle_frames = [next(packet, None) for packet in sub_gen_frames]
+
+            if video_frame:
+                earliest_video_index = index
+                heappush(frame_queue, Priority(index, video_frame, output_stream))
+
+            if should_get_audio:
+                audio_frames = [next(frames, None) for frames in audio_gen_frames]
+            else:
+                audio_frames = [None]
+            if should_get_sub:
+                subtitle_frames = [next(packet, None) for packet in sub_gen_frames]
+            else:
+                subtitle_frames = [None]
+
+            # Break if no more frames
             if (
                 all(frame is None for frame in audio_frames)
                 and video_frame is None
@@ -401,24 +459,34 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
             ):
                 break
 
-            for audio_stream, audio_frame in zip(audio_streams, audio_frames):
-                if audio_frame:
+            if should_get_audio:
+                for audio_stream, audio_frame in zip(audio_streams, audio_frames):
                     for reframe in resampler.resample(audio_frame):
-                        output.mux(audio_stream.encode(reframe))
-
-            for subtitle_stream, packet in zip(subtitle_streams, subtitle_frames):
-                if not packet or packet.dts is None:
-                    continue
-                packet.stream = subtitle_stream
-                output.mux(packet)
-
-            if video_frame:
+                        assert reframe.pts is not None
+                        heappush(
+                            frame_queue,
+                            Priority(reframe.pts, reframe, audio_stream),
+                        )
+            if should_get_sub:
+                for subtitle_stream, packet in zip(subtitle_streams, subtitle_frames):
+                    if packet and packet.pts is not None:
+                        packet.stream = subtitle_stream
+                        heappush(
+                            frame_queue, Priority(packet.pts, packet, subtitle_stream)
+                        )
+
+            while frame_queue and frame_queue[0].index <= index:
+                item = heappop(frame_queue)
+                frame_type = item.frame_type
                 try:
-                    output.mux(output_stream.encode(video_frame))
+                    if frame_type in {"video", "audio"}:
+                        output.mux(item.stream.encode(item.frame))
+                    elif frame_type == "subtitle":
+                        output.mux(item.frame)
                 except av.error.ExternalError:
                     log.error(
-                        f"Generic error for encoder: {output_stream.name}\n"
-                        "Perhaps video quality settings are too low?"
+                        f"Generic error for encoder: {item.stream.name}\n"
+                        f"at {item.index} time_base\nPerhaps video quality settings are too low?"
                     )
                 except av.FFmpegError as e:
                     log.error(e)

auto_editor/utils/bar.py

@@ -89,20 +89,26 @@ class Bar:
         percent = round(progress * 100, 1)
         p_pad = " " * (4 - len(str(percent)))
         columns = get_terminal_size().columns
-        bar_len = max(1, columns - len_title - 32)
+        bar_len = max(1, columns - len_title - 35)
         bar_str = self._bar_str(progress, bar_len)
 
-        bar = f"  {self.icon}{title} {bar_str} {p_pad}{percent}%  ETA {new_time}"
-
-        if len(bar) > columns - 2:
-            bar = bar[: columns - 2]
-        else:
-            bar += " " * (columns - len(bar) - 4)
-
-        sys.stdout.write(bar + "\r")
+        bar = f"  {self.icon}{title} {bar_str} {p_pad}{percent}%  ETA {new_time}    \r"
+        sys.stdout.write(bar)
 
     def start(self, total: float, title: str = "Please wait") -> None:
-        self.stack.append((title, len(title), total, time()))
+        len_title = 0
+        in_escape = False
+
+        for char in title:
+            if not in_escape:
+                if char == "\033":
+                    in_escape = True
+                else:
+                    len_title += 1
+            elif char == "m":
+                in_escape = False
+
+        self.stack.append((title, len_title, total, time()))
 
         try:
             self.tick(0)

auto_editor/utils/log.py

@@ -1,14 +1,9 @@
-from __future__ import annotations
-
 import sys
 from datetime import timedelta
 from shutil import get_terminal_size, rmtree
 from tempfile import mkdtemp
 from time import perf_counter, sleep
-from typing import TYPE_CHECKING, NoReturn
-
-if TYPE_CHECKING:
-    import av
+from typing import NoReturn
 
 
 class Log:
@@ -100,10 +95,6 @@ class Log:
 
             sys.stdout.write(f"Finished. took {second_len} seconds ({minute_len})\n")
 
-    def experimental(self, codec: av.Codec) -> None:
-        if codec.experimental:
-            self.error(f"`{codec.name}` is an experimental codec")
-
     @staticmethod
     def deprecated(message: str) -> None:
         sys.stderr.write(f"\033[1m\033[33m{message}\033[0m\n")

{auto_editor-26.3.0.dist-info → auto_editor-26.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: auto-editor
-Version: 26.3.0
+Version: 26.3.1
 Summary: Auto-Editor: Effort free video editing!
 Author-email: WyattBlue <wyattblue@auto-editor.com>
 License: Unlicense
@@ -12,7 +12,7 @@ Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy<3.0,>=1.24
-Requires-Dist: pyav==14.2.0
+Requires-Dist: pyav==14.2.*
 
 <p align="center"><img src="https://auto-editor.com/img/auto-editor-banner.webp" title="Auto-Editor" width="700"></p>
 

{auto_editor-26.3.0.dist-info → auto_editor-26.3.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
-auto_editor/__init__.py,sha256=foFMRrw-Br8Dq0ZIes1siNTsxZj5nQywX_cfWHfB380,23
+auto_editor/__init__.py,sha256=cbuXE-xYiZp6P9Ipk0EAUgPxPvaOpg-ve_HurO96fCM,23
 auto_editor/__main__.py,sha256=g-9q3i6oFeNPeFMeNJEwZua6ZloOPLcaLN-B0FlxWXo,11371
-auto_editor/analyze.py,sha256=7p_SDRRKQzlc6wtoW6MXYvJkDV4NO4DSOtJPFAuYcwM,12721
-auto_editor/edit.py,sha256=gz2MocM5s1uz-hLrFWmiNl1TwOm4S_1EkYn-ZBuu_sE,17401
+auto_editor/analyze.py,sha256=tkNZdRz1Nf1mQfC3jKHaiLbHRkacX_7-2TrKTKvwpxY,12463
+auto_editor/edit.py,sha256=unOxLPiPUMoLgM_ScdRA3rNnxOicUUu7iLO1lG0zcfc,20260
 auto_editor/ffwrapper.py,sha256=1lYYfq8gVgMVkYWeAEYDPAHCwFCYbKQwy0FxYBxMzk8,4765
 auto_editor/help.py,sha256=CzfDTsL4GuGu596ySHKj_wKnxGR9h8B0KUdkZpo33oE,8044
 auto_editor/make_layers.py,sha256=vEeJt0PnE1vc9-cQZ_AlXVDjvWhObRCWJSCQGraoMvU,9016
@@ -14,11 +14,11 @@ auto_editor/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 auto_editor/cmds/cache.py,sha256=bViYbtVXefTeEIUvSanDfA6cG35ep1N_Jvtz7ZjgIkY,1959
 auto_editor/cmds/desc.py,sha256=GDrKJYiHMaeTrplZAceXl1JwoqD78XsV2_5lc0Xd7po,869
 auto_editor/cmds/info.py,sha256=vYa1hYdE8kDTE8AS3kwXlnd59X6CrE2GtIEQ7UmlpRY,7010
-auto_editor/cmds/levels.py,sha256=qMxTOlj4ezna0K2jYWDFyZ0Srn4pT6nIdR-479IOEvw,5758
+auto_editor/cmds/levels.py,sha256=RBBs0YM8Qb7XteCy7Pr4QpU9b5maMsDe6xEkAuyGs1c,5644
 auto_editor/cmds/palet.py,sha256=ONzTqemaQq9YEfIOsDRNnwzfqnEMUMSXIQrETxyroRU,749
 auto_editor/cmds/repl.py,sha256=TF_I7zsFY7-KdgidrqjafTz7o_eluVbLvgTcOBG-UWQ,3449
 auto_editor/cmds/subdump.py,sha256=af_XBf7kaevqHn1A71z8C-7x8pS5WKD9FE_ugkCw6rk,665
-auto_editor/cmds/test.py,sha256=Wih-KQnv5Ld1CgbOUdtrp_fMnINsr_khzONvlrJ-bhw,26163
+auto_editor/cmds/test.py,sha256=D8l4Zr0UjrUtFkqsADqlVQ1wvNP3s97ifNnyf1UBTFU,26327
 auto_editor/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/formats/fcp11.py,sha256=sqjC36jI47ICPLjZJYiqGwY7foOnWOiNjkPFLdgSnI4,5208
 auto_editor/formats/fcp7.py,sha256=x5cagTzGCAW3i3M6m7TZC1h8gLfSmX1UK-iiDuCpdfs,20289
@@ -40,17 +40,17 @@ auto_editor/render/audio.py,sha256=_GuX0WNY1YeumgBN3bWqgwVXiuhpvx7sijABxqyO2ag,1
 auto_editor/render/subtitle.py,sha256=jtNRKvgo1fpHTrAfGZqdkNeNgGgasw-K-4PwIKiWwfM,6231
 auto_editor/render/video.py,sha256=JBVl8w-hQ6zrs97iA527LPsBZ9s601SVSJs2bSMCq88,12185
 auto_editor/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_editor/utils/bar.py,sha256=0ZSfuWdBA1zySwodkb4mw5uahC6UwCk2umaGnB8A7n0,3996
+auto_editor/utils/bar.py,sha256=Ky9JRf37JTgLyvNuIXDfucaUE8H1vBbCqKLjttmsmmo,4156
 auto_editor/utils/chunks.py,sha256=J-eGKtEz68gFtRrj1kOSgH4Tj_Yz6prNQ7Xr-d9NQJw,52
 auto_editor/utils/cmdkw.py,sha256=aUGBvBel2Ko1o6Rwmr4rEL-BMc5hEnzYLbyZ1GeJdcY,5729
 auto_editor/utils/container.py,sha256=C_Ahh7nlMEX4DNQ2M_cITPPbYcIL68r4I_AgFy0OD6o,2487
 auto_editor/utils/func.py,sha256=C8ucgsSEzPyBc-8obhsCXd_uQW0cnCdBn1KVxB7FHjU,2747
-auto_editor/utils/log.py,sha256=8fOdyTG3vjKhA1tJTMKRjXVqhrY2q3tFnXU8tKm_twA,3937
+auto_editor/utils/log.py,sha256=wPNf6AabV-0cnoS_bPLv1Lh7llQBtNqPKeh07einOuc,3701
 auto_editor/utils/types.py,sha256=r5f6QB81xH7NRwGntITIOCVx-fupOl8l3X3LSFkt3nE,10756
 docs/build.py,sha256=POy8X8QOBYe_8A8HI_yiVI_Qg9E5mLpn1z7AHQr0_vQ,1888
-auto_editor-26.3.0.dist-info/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
-auto_editor-26.3.0.dist-info/METADATA,sha256=YOFNFBSIMQveLah-PSIrBtlfY-xwEveHxKNAneUAs_0,6111
-auto_editor-26.3.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-auto_editor-26.3.0.dist-info/entry_points.txt,sha256=UAsTc7qJQbnAzHd7KWg-ALo_X9Hj2yDs3M9I2DV3eyI,212
-auto_editor-26.3.0.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
-auto_editor-26.3.0.dist-info/RECORD,,
+auto_editor-26.3.1.dist-info/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
+auto_editor-26.3.1.dist-info/METADATA,sha256=4r9rtkLWEDaVMcJauMcljdAw-cnz2h6xS9sixAnWVlQ,6111
+auto_editor-26.3.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+auto_editor-26.3.1.dist-info/entry_points.txt,sha256=UAsTc7qJQbnAzHd7KWg-ALo_X9Hj2yDs3M9I2DV3eyI,212
+auto_editor-26.3.1.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
+auto_editor-26.3.1.dist-info/RECORD,,