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

auto_editor/__init__.py

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

auto_editor/cmds/test.py

@@ -549,6 +549,15 @@ def main(sys_args: list[str] | None = None):
     def yuv442p():
         return run.main(["resources/test_yuv422p.mp4"], [])
 
+    def prores():
+        run.main(["resources/testsrc.mp4", "-c:v", "prores", "-o", "out.mkv"], [])
+        assert fileinfo("out.mkv").videos[0].pix_fmt == "yuv422p10le"
+
+        run.main(["out.mkv", "-c:v", "prores", "-o", "out2.mkv"], [])
+        assert fileinfo("out2.mkv").videos[0].pix_fmt == "yuv422p10le"
+
+        return "out.mkv", "out2.mkv"
+
     #  Issue 280
     def SAR():
         out = run.main(["resources/SAR-2by3.mp4"], [])
@@ -735,6 +744,7 @@ def main(sys_args: list[str] | None = None):
                 premiere,
                 SAR,
                 yuv442p,
+                prores,
                 edit_negative_tests,
                 edit_positive_tests,
                 audio_norm_f,

auto_editor/edit.py

@@ -365,17 +365,35 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
 
         # Setup video
         if ctr.default_vid != "none" and tl.v:
-            vframes = render_av(output, tl, args, bar, log)
+            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
+            encoder_titles.append(name if no_color else f"\033[96m{name}")
+        if subtitle_streams:
+            name = subtitle_streams[0].name
+            encoder_titles.append(name if no_color else f"\033[32m{name}")
+
+        title = f"({os.path.splitext(output_path)[1][1:]}) "
+        if no_color:
+            title += "+".join(encoder_titles)
+        else:
+            title += "\033[0m+".join(encoder_titles) + "\033[0m"
+        bar.start(tl.end, title)
+
         # Process frames
         while True:
             audio_frames = [next(frames, None) for frames in audio_gen_frames]
-            video_frame = next(vframes, None)
+            index, video_frame = next(vframes, (0, None))
             subtitle_frames = [next(packet, None) for packet in sub_gen_frames]
-
             if (
                 all(frame is None for frame in audio_frames)
                 and video_frame is None
@@ -405,12 +423,16 @@ def edit_media(paths: list[str], args: Args, log: Log) -> None:
                 except av.FFmpegError as e:
                     log.error(e)
 
+            bar.tick(index)
+
         # Flush streams
         if output_stream is not None:
             output.mux(output_stream.encode(None))
         for audio_stream in audio_streams:
             output.mux(audio_stream.encode(None))
 
+        bar.end()
+
         # Close resources
         for audio_input in audio_inputs:
             audio_input.close()

auto_editor/ffwrapper.py

@@ -147,10 +147,9 @@ def initFileInfo(path: str, log: Log) -> FileInfo:
             adur = float(a.duration * a.time_base)
 
         a_cc = a.codec_context
-        name = a_cc.name if a_cc.name != "mp3float" else "mp3"
         audios += (
             AudioStream(
-                name,
+                a_cc.codec.canonical_name,
                 0 if a_cc.sample_rate is None else a_cc.sample_rate,
                 a.layout.name,
                 a_cc.channels,

auto_editor/lang/stdenv.py

@@ -1045,7 +1045,7 @@ def make_standard_env() -> dict[str, Any]:
         # reals
         "pow": Proc("pow", pow, (2, 2), is_real),
         "abs": Proc("abs", abs, (1, 1), is_real),
-        "round": Proc("round", round, (1, 1), is_real),
+        "round": Proc("round", round, (1, 2), is_real, is_int),
         "max": Proc("max", lambda *v: max(v), (1, None), is_real),
         "min": Proc("min", lambda *v: min(v), (1, None), is_real),
         "max-seq": Proc("max-seq", max, (1, 1), is_sequence),

auto_editor/render/video.py

@@ -15,7 +15,6 @@ if TYPE_CHECKING:
 
     from auto_editor.ffwrapper import FileInfo
     from auto_editor.timeline import v3
-    from auto_editor.utils.bar import Bar
     from auto_editor.utils.log import Log
     from auto_editor.utils.types import Args
 
@@ -26,35 +25,12 @@ class VideoFrame:
     src: FileInfo
 
 
-# From: github.com/PyAV-Org/PyAV/blob/main/av/video/frame.pyx
-allowed_pix_fmt = {
-    "yuv420p",
-    "yuvj420p",
-    "yuv444p",
-    "yuvj444p",
-    "rgb48be",
-    "rgb48le",
-    "rgb64be",
-    "rgb64le",
-    "rgb24",
-    "bgr24",
-    "argb",
-    "rgba",
-    "abgr",
-    "bgra",
-    "gray",
-    "gray8",
-    "gray16be",
-    "gray16le",
-    "rgb8",
-    "bgr8",
-    "pal8",
-}
+allowed_pix_fmt = av.video.frame.supported_np_pix_fmts
 
 
 def make_solid(width: int, height: int, pix_fmt: str, bg: str) -> av.VideoFrame:
     hex_color = bg.lstrip("#").upper()
-    rgb_color = tuple(int(hex_color[i : i + 2], 16) for i in {0, 2, 4})
+    rgb_color = tuple(int(hex_color[i : i + 2], 16) for i in (0, 2, 4))
 
     rgb_array = np.full((height, width, 3), rgb_color, dtype=np.uint8)
     rgb_frame = av.VideoFrame.from_ndarray(rgb_array, format="rgb24")
@@ -65,7 +41,7 @@ def make_image_cache(tl: v3) -> dict[tuple[FileInfo, int], np.ndarray]:
     img_cache = {}
     for clip in tl.v:
         for obj in clip:
-            if isinstance(obj, TlImage) and obj.src not in img_cache:
+            if isinstance(obj, TlImage) and (obj.src, obj.width) not in img_cache:
                 with av.open(obj.src.path) as cn:
                     my_stream = cn.streams.video[0]
                     for frame in cn.decode(my_stream):
@@ -85,7 +61,7 @@ def make_image_cache(tl: v3) -> dict[tuple[FileInfo, int], np.ndarray]:
 
 
 def render_av(
-    output: av.container.OutputContainer, tl: v3, args: Args, bar: Bar, log: Log
+    output: av.container.OutputContainer, tl: v3, args: Args, log: Log
 ) -> Any:
     from_ndarray = av.VideoFrame.from_ndarray
 
@@ -132,13 +108,15 @@ def render_av(
 
     codec = av.Codec(args.video_codec, "w")
 
-    if args.video_codec == "gif":
+    if codec.canonical_name == "gif":
         if codec.video_formats is not None and target_pix_fmt in (
             f.name for f in codec.video_formats
         ):
             target_pix_fmt = target_pix_fmt
         else:
             target_pix_fmt = "rgb8"
+    elif codec.canonical_name == "prores":
+        target_pix_fmt = "yuv422p10le"
     else:
         target_pix_fmt = (
             target_pix_fmt if target_pix_fmt in allowed_pix_fmt else "yuv420p"
@@ -212,8 +190,6 @@ def render_av(
     seek_frame = None
     frames_saved = 0
 
-    bar.start(tl.end, "Creating new video")
-
     bg = args.background
     null_frame = make_solid(target_width, target_height, target_pix_fmt, bg)
     frame_index = -1
@@ -334,11 +310,7 @@ def render_av(
 
         if frame.format.name != target_pix_fmt:
             frame = frame.reformat(format=target_pix_fmt)
-            bar.tick(index)
-        elif index % 3 == 0:
-            bar.tick(index)
 
-        yield from_ndarray(frame.to_ndarray(), format=frame.format.name)
+        yield (index, from_ndarray(frame.to_ndarray(), format=frame.format.name))
 
-    bar.end()
     log.debug(f"Total frames saved seeking: {frames_saved}")

auto_editor/utils/bar.py

@@ -89,7 +89,7 @@ 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 - 32)
         bar_str = self._bar_str(progress, bar_len)
 
         bar = f"  {self.icon}{title} {bar_str} {p_pad}{percent}%  ETA {new_time}"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: auto-editor
-Version: 26.2.0
+Version: 26.3.0
 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.*
+Requires-Dist: pyav==14.2.0
 
 <p align="center"><img src="https://auto-editor.com/img/auto-editor-banner.webp" title="Auto-Editor" width="700"></p>
 

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

@@ -1,8 +1,8 @@
-auto_editor/__init__.py,sha256=1-JJ1Kd-PXkwShJyQvOWjlyj_pGZI56jaozFas4DX70,23
+auto_editor/__init__.py,sha256=foFMRrw-Br8Dq0ZIes1siNTsxZj5nQywX_cfWHfB380,23
 auto_editor/__main__.py,sha256=g-9q3i6oFeNPeFMeNJEwZua6ZloOPLcaLN-B0FlxWXo,11371
 auto_editor/analyze.py,sha256=7p_SDRRKQzlc6wtoW6MXYvJkDV4NO4DSOtJPFAuYcwM,12721
-auto_editor/edit.py,sha256=cZbt5a4AH2U8pwtBb_VNOhcvjE3JEaBwkXfvriEcHYY,16573
-auto_editor/ffwrapper.py,sha256=1uUTPV61RWKbUrONLvQdu2piNziz44vZjzQgd-e9YCU,4807
+auto_editor/edit.py,sha256=gz2MocM5s1uz-hLrFWmiNl1TwOm4S_1EkYn-ZBuu_sE,17401
+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
 auto_editor/output.py,sha256=ho8Lpqz4Sv_Gw0Vj2OvG39s83xHpyZlvtRNryTPbXqc,2563
@@ -18,7 +18,7 @@ auto_editor/cmds/levels.py,sha256=qMxTOlj4ezna0K2jYWDFyZ0Srn4pT6nIdR-479IOEvw,57
 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=hX7g8tNa8DNk3vqx15DOtFj82zWKUImP_UHPCYPPdMQ,25787
+auto_editor/cmds/test.py,sha256=Wih-KQnv5Ld1CgbOUdtrp_fMnINsr_khzONvlrJ-bhw,26163
 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
@@ -30,7 +30,7 @@ auto_editor/lang/json.py,sha256=D84vwyLtX5t5xl8S4r4jFXGVkbIg1L4IcexlS_a_k6w,9231
 auto_editor/lang/libintrospection.py,sha256=6H1rGp0wqaCud5IPaoEmzULGnYt6ec7_0h32ATcw2oY,261
 auto_editor/lang/libmath.py,sha256=z33A161Oe6vYYK7R6pgYjdZZe63dQkN38Qf36TL3prg,847
 auto_editor/lang/palet.py,sha256=ZOzNxLfzY8FTCYlF_mZtU2XoNzdg-eseUVkMtnWkVaI,24139
-auto_editor/lang/stdenv.py,sha256=CIlQ9tTKscVNjajtDJeCG24Rk2J9sYqKJK4moI67Kag,43754
+auto_editor/lang/stdenv.py,sha256=sQyOD3bttjcieWMtTMNpE6blEZriAfHtSZHbuvC09R8,43762
 auto_editor/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/lib/contracts.py,sha256=lExGQymcQUmwG5lC1lO4qm4GY8W0q_yzK_miTaAoPA4,7586
 auto_editor/lib/data_structs.py,sha256=Hnzl5gWvo-geTU0g-lGejj6HQW3VvPv0NBEj2XoGskY,7089
@@ -38,9 +38,9 @@ auto_editor/lib/err.py,sha256=UlszQJdzMZwkbT8x3sY4GkCV_5x9yrd6uVVUzvA8iiI,35
 auto_editor/render/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auto_editor/render/audio.py,sha256=_GuX0WNY1YeumgBN3bWqgwVXiuhpvx7sijABxqyO2ag,12580
 auto_editor/render/subtitle.py,sha256=jtNRKvgo1fpHTrAfGZqdkNeNgGgasw-K-4PwIKiWwfM,6231
-auto_editor/render/video.py,sha256=svyHUZRV3sAXjEcfrnKPW7gJkqd-724lYGrZnwKEnSA,12591
+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=miij9BW6mqn85gARh-bf2jP9dEHSwOyI3d4JIxQo36s,3998
+auto_editor/utils/bar.py,sha256=0ZSfuWdBA1zySwodkb4mw5uahC6UwCk2umaGnB8A7n0,3996
 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
@@ -48,9 +48,9 @@ auto_editor/utils/func.py,sha256=C8ucgsSEzPyBc-8obhsCXd_uQW0cnCdBn1KVxB7FHjU,274
 auto_editor/utils/log.py,sha256=8fOdyTG3vjKhA1tJTMKRjXVqhrY2q3tFnXU8tKm_twA,3937
 auto_editor/utils/types.py,sha256=r5f6QB81xH7NRwGntITIOCVx-fupOl8l3X3LSFkt3nE,10756
 docs/build.py,sha256=POy8X8QOBYe_8A8HI_yiVI_Qg9E5mLpn1z7AHQr0_vQ,1888
-auto_editor-26.2.0.dist-info/LICENSE,sha256=yiq99pWITHfqS0pbZMp7cy2dnbreTuvBwudsU-njvIM,1210
-auto_editor-26.2.0.dist-info/METADATA,sha256=cy6NADq5iQR2-kkjagsaCvfz7ZuDW0kaM83TKMdqZTU,6109
-auto_editor-26.2.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-auto_editor-26.2.0.dist-info/entry_points.txt,sha256=UAsTc7qJQbnAzHd7KWg-ALo_X9Hj2yDs3M9I2DV3eyI,212
-auto_editor-26.2.0.dist-info/top_level.txt,sha256=jBV5zlbWRbKOa-xaWPvTD45QL7lGExx2BDzv-Ji4dTw,17
-auto_editor-26.2.0.dist-info/RECORD,,
+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,,