Allow all known hardware encoders

Author: WyattBlue

CHANGELOG.md

@@ -1,9 +1,24 @@
+# 26.2.0 (Unreleased)
+
+## Features
+ - Allow all hardware encoders PyAV knows about (h264_videotoolbox, hevc_nvenc, etc.).
+ - New option `-vprofile`. Allows setting the video profile.
+
+## Misc.
+ - Deprecate the `copy` codec (auto-editor always re-encoders no matter what).
+
+**Full Changelog**: https://github.com/WyattBlue/auto-editor/compare/26.1.2...26.2.0
+
+
 # 26.1.2
 
 ## Fixes
  - Use file name, not full path for cache
 
 
+**Full Changelog**: https://github.com/WyattBlue/auto-editor/compare/26.1.1...26.1.2
+
+
 # 26.1.1
 
 ## Fixes

auto_editor/__init__.py

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

auto_editor/edit.py

@@ -8,7 +8,7 @@
 from typing import Any
 
 import av
-from av import AudioResampler
+from av import AudioResampler, Codec
 
 from auto_editor.ffwrapper import FileInfo, initFileInfo
 from auto_editor.lib.contracts import is_int, is_str
@@ -81,14 +81,21 @@ def set_video_codec(
         return codec
 
     if codec == "copy":
+        log.deprecated("The `copy` codec is deprecated. auto-editor always re-encodes")
         if src is None:
             log.error("No input to copy its codec from.")
         if not src.videos:
             log.error("Input file does not have a video stream to copy codec from.")
         codec = src.videos[0].codec
 
     if ctr.vcodecs is not None and codec not in ctr.vcodecs:
-        log.error(codec_error.format(codec, out_ext))
+        try:
+            cobj = Codec(codec, "w")
+        except av.codec.codec.UnknownCodecError:
+            log.error(f"Unknown encoder: {codec}")
+        # Normalize encoder names
+        if cobj.id not in (Codec(x, "w").id for x in ctr.vcodecs):
+            log.error(codec_error.format(codec, out_ext))
 
     return codec
 
@@ -101,26 +108,30 @@ def set_audio_codec(
             codec = "aac"
         else:
             codec = src.audios[0].codec
-            ctx = av.Codec(codec)
-            if ctx.audio_formats is None:
+            if av.Codec(codec, "w").audio_formats is None:
                 codec = "aac"
         if codec not in ctr.acodecs and ctr.default_aud != "none":
             codec = ctr.default_aud
-        if codec == "mp3float":
-            codec = "mp3"
         if codec is None:
             codec = "aac"
         return codec
 
     if codec == "copy":
+        log.deprecated("The `copy` codec is deprecated. auto-editor always re-encodes")
         if src is None:
             log.error("No input to copy its codec from.")
         if not src.audios:
             log.error("Input file does not have an audio stream to copy codec from.")
         codec = src.audios[0].codec
 
     if ctr.acodecs is None or codec not in ctr.acodecs:
-        log.error(codec_error.format(codec, out_ext))
+        try:
+            cobj = Codec(codec, "w")
+        except av.codec.codec.UnknownCodecError:
+            log.error(f"Unknown encoder: {codec}")
+        # Normalize encoder names
+        if cobj.id not in (Codec(x, "w").id for x in ctr.acodecs):
+            log.error(codec_error.format(codec, out_ext))
 
     return codec
 

auto_editor/ffwrapper.py

@@ -147,9 +147,10 @@ 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(
-                a_cc.name,
+                name,
                 0 if a_cc.sample_rate is None else a_cc.sample_rate,
                 a.layout.name,
                 a_cc.channels,

auto_editor/render/video.py

@@ -148,15 +148,15 @@ def render_av(
     ops = {"mov_flags": "faststart"}
     output_stream = output.add_stream(args.video_codec, rate=target_fps, options=ops)
 
+    cc = output_stream.codec_context
     if args.vprofile is not None:
-        if args.vprofile.title() not in output_stream.codec_context.profiles:
-            a = [f'"{x.lower()}"' for x in output_stream.codec_context.profiles]
-            b = " ".join(a)
+        if args.vprofile.title() not in cc.profiles:
+            b = " ".join([f'"{x.lower()}"' for x in cc.profiles])
             log.error(
                 f"`{args.vprofile}` is not a valid profile.\nprofiles supported: {b}"
             )
 
-        output_stream.codec_context.profile = args.vprofile.title()
+        cc.profile = args.vprofile.title()
 
     yield output_stream
     if not isinstance(output_stream, av.VideoStream):

auto_editor/utils/container.py

@@ -82,12 +82,6 @@ def container_constructor(ext: str) -> Container:
         kind = codec_type(codec)
         if kind == "video":
             vcodecs.add(codec)
-            if codec == "h264":
-                vcodecs.add("libx264")
-            if codec == "av1":
-                vcodecs.add("libsvtav1")
-            if codec == "hevc":
-                vcodecs.add("hevc_nvenc")
         if kind == "audio":
             acodecs.add(codec)
         if kind == "subtitle":

auto_editor/utils/log.py

@@ -104,6 +104,10 @@ 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")
+
     def error(self, message: str | Exception) -> NoReturn:
         if self.is_debug and isinstance(message, Exception):
             self.cleanup()