Combine hwaccel and hwaccel ctx

av/codec/context.pxd

@@ -3,7 +3,7 @@ from libc.stdint cimport int64_t
 
 from av.bytesource cimport ByteSource
 from av.codec.codec cimport Codec
-from av.codec.hwaccel cimport HWAccel, HWAccelContext
+from av.codec.hwaccel cimport HWAccel
 from av.frame cimport Frame
 from av.packet cimport Packet
 
@@ -34,7 +34,7 @@ cdef class CodecContext:
     cpdef flush_buffers(self)
 
     # Used by hardware-accelerated decode.
-    cdef HWAccelContext hwaccel_ctx
+    cdef HWAccel hwaccel_ctx
 
     # Used by both transcode APIs to setup user-land objects.
     # TODO: Remove the `Packet` from `_setup_decoded_frame` (because flushing packets

av/codec/context.pyi

@@ -5,6 +5,7 @@ from typing import ClassVar, Literal
 from av.packet import Packet
 
 from .codec import Codec
+from .hwaccel import HWAccel
 
 class ThreadType(Flag):
     NONE: ClassVar[ThreadType]

av/codec/hwaccel.pxd

@@ -3,20 +3,18 @@ cimport libav as lib
 from av.codec.codec cimport Codec
 
 
-cdef class HWConfig(object):
+cdef class HWConfig:
     cdef object __weakref__
     cdef lib.AVCodecHWConfig *ptr
     cdef void _init(self, lib.AVCodecHWConfig *ptr)
 
 cdef HWConfig wrap_hwconfig(lib.AVCodecHWConfig *ptr)
 
-cdef class HWAccel(object):
+cdef class HWAccel:
     cdef int _device_type
     cdef str _device
-    cdef public bint allow_software_fallback
-    cdef public dict options
-
-cdef class HWAccelContext(HWAccel):
     cdef readonly Codec codec
     cdef readonly HWConfig config
     cdef lib.AVBufferRef *ptr
+    cdef public bint allow_software_fallback
+    cdef public dict options

av/codec/hwaccel.pyi

@@ -43,6 +43,6 @@ class HWAccel:
         allow_software_fallback: bool = False,
         options: dict[str, object] | None = None,
     ) -> None: ...
-    def create(self, codec: Codec): ...
+    def create(self, codec: Codec) -> HWAccel: ...
 
 def hwdevices_available() -> list[str]: ...

av/codec/hwaccel.pyx

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import weakref
 from enum import IntEnum
 
@@ -9,7 +7,6 @@ from av.codec.codec cimport Codec
 from av.dictionary cimport _Dictionary
 from av.error cimport err_check
 from av.video.format cimport get_video_format
-
 from av.dictionary import Dictionary
 
 
@@ -97,7 +94,7 @@ cpdef hwdevices_available():
 
 
 cdef class HWAccel:
-    def __init__(self, device_type, device=None, allow_software_fallback=True, options=None):
+    def __init__(self, device_type, device=None, codec=None, allow_software_fallback=True, options=None):
         if isinstance(device_type, HWDeviceType):
             self._device_type = device_type
         elif isinstance(device_type, str):
@@ -108,34 +105,26 @@ cdef class HWAccel:
         self._device = device
         self.allow_software_fallback = allow_software_fallback
         self.options = {} if not options else dict(options)
+        self.ptr = NULL
+        self.codec = codec
+        self.config = None
 
-    def create(self, Codec codec not None):
-        return HWAccelContext(
-            HWDeviceType(self._device_type),
-            self._device,
-            self.options,
-            self.allow_software_fallback,
-            codec,
-        )
+        if codec:
+            self._initialize_hw_context()
 
-cdef class HWAccelContext(HWAccel):
-    def __init__(self, device_type, device, allow_software_fallback, options, codec):
-        super().__init__(device_type, device, options)
-        if not codec:
-            raise ValueError("`codec` is required")
-        self.codec = codec
+    def _initialize_hw_context(self):
         cdef HWConfig config
-
-        for config in codec.hardware_configs:
+        for config in self.codec.hardware_configs:
             if not (config.ptr.methods & lib.AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX):
                 continue
             if self._device_type and config.device_type != self._device_type:
                 continue
             break
         else:
-            raise NotImplementedError(f"No supported hardware config for {codec}")
+            raise NotImplementedError(f"No supported hardware config for {self.codec}")
 
         self.config = config
+
         cdef char *c_device = NULL
         if self._device:
             device_bytes = self._device.encode()
@@ -148,6 +137,15 @@ cdef class HWAccelContext(HWAccel):
             )
         )
 
+    def create(self, Codec codec not None):
+        """Create a new hardware accelerator context with the given codec"""
+        if self.ptr:
+            raise RuntimeError("Hardware context already initialized")
+
+        self.codec = codec
+        self._initialize_hw_context()
+        return self
+
     def __dealloc__(self):
         if self.ptr:
             lib.av_buffer_unref(&self.ptr)