Set immutable properties

Author: caffeinism

av/_hwdevice_registry.py

@@ -19,5 +19,5 @@ cdef class HWAccel:
     cdef public bint allow_software_fallback
     cdef public dict options
     cdef public int flags
-    cdef public str output_format
-    cdef public int device_id
+    cdef str _output_format
+    cdef int _device_id

av/codec/hwaccel.pxd

@@ -130,15 +130,15 @@ def __init__(
             output_format = output_format.lower()
         if output_format not in {"sw", "hw"}:
             raise ValueError("output_format must be 'sw' or 'hw'")
-        self.output_format = output_format
+        self._output_format = output_format
 
-        self.device_id = 0
+        self._device_id = 0
         if self._device_type == HWDeviceType.cuda:
             if device:
                 try:
-                    self.device_id = int(device)
+                    self._device_id = int(device)
                 except ValueError:
-                    self.device_id = 0
+                    self._device_id = 0
 
         self._device = device
         self.allow_software_fallback = allow_software_fallback
@@ -178,6 +178,14 @@ def _initialize_hw_context(self, codec: Codec):
             )
         )
 
+    @property
+    def device_id(self) -> int:
+        return self._device_id
+
+    @property
+    def output_format(self) -> str:
+        return self._output_format
+
     def create(self, codec: Codec):
         """Create a new hardware accelerator context with the given codec"""
         if self.ptr:

av/codec/hwaccel.py

@@ -37,10 +37,12 @@ class HWConfig:
     def is_supported(self) -> bool: ...
 
 class HWAccel:
-    output_format: Literal["sw", "hw"]
     options: dict[str, object]
-    device_id: int
 
+    @property
+    def output_format(self) -> Literal["sw", "hw"]: ...
+    @property
+    def device_id(self) -> int: ...
     def __init__(
         self,
         device_type: str | HWDeviceType,

av/codec/hwaccel.pyi

@@ -128,7 +128,8 @@ def _transfer_hwframe(self, frame: Frame):
             return frame
 
         if self.hwaccel_ctx.output_format == "hw":
-            frame.device_id = int(getattr(self.hwaccel_ctx, "device_id", 0))
+            vframe = cython.cast(VideoFrame, frame)
+            vframe._device_id = int(getattr(self.hwaccel_ctx, "device_id", 0))
             return frame
 
         frame_sw: Frame = self._alloc_next_frame()

av/video/codeccontext.py

@@ -7,8 +7,8 @@ from av.video.reformatter cimport VideoReformatter
 
 
 cdef class CudaContext:
-    cdef public int device_id
-    cdef public bool primary_ctx
+    cdef int _device_id
+    cdef bool _primary_ctx
     cdef lib.AVBufferRef* _device_ref
     cdef dict _frames_cache
 
@@ -26,7 +26,7 @@ cdef class VideoFrame(Frame):
     cdef uint8_t *_buffer
     cdef object _np_buffer
 
-    cdef public int device_id
+    cdef int _device_id
     cdef VideoReformatter reformatter
     cdef readonly VideoFormat format
 

av/video/frame.pxd

@@ -19,14 +19,12 @@
 from cython.cimports.dlpack import DLManagedTensor, kDLCPU, kDLCUDA, kDLUInt
 from cython.cimports.libc.stdint import int64_t, uint8_t
 
-import av._hwdevice_registry as _hwreg
-
 
 @cython.cclass
 class CudaContext:
     def __cinit__(self, device_id=0, primary_ctx=True):
-        self.device_id = int(device_id)
-        self.primary_ctx = bool(primary_ctx)
+        self._device_id = int(device_id)
+        self._primary_ctx = bool(primary_ctx)
         self._device_ref = cython.NULL
         self._frames_cache = {}
 
@@ -46,6 +44,14 @@ def __dealloc__(self):
             lib.av_buffer_unref(cython.address(ref))
             self._device_ref = cython.NULL
 
+    @property
+    def device_id(self) -> int:
+        return self._device_id
+
+    @property
+    def primary_ctx(self) -> bool:
+        return self._primary_ctx
+
     @cython.cfunc
     def _get_device_ref(self) -> cython.pointer[lib.AVBufferRef]:
         device_ref: cython.pointer[lib.AVBufferRef] = self._device_ref
@@ -69,11 +75,6 @@ def _get_device_ref(self) -> cython.pointer[lib.AVBufferRef]:
             )
         )
 
-        _hwreg.register_cuda_hwdevice_data_ptr(
-            cython.cast(cython.size_t, device_ref.data),
-            self.device_id,
-        )
-
         self._device_ref = device_ref
         return device_ref
 
@@ -425,6 +426,10 @@ def __repr__(self):
             f"{self.width}x{self.height} at 0x{id(self):x}>"
         )
 
+    @property
+    def device_id(self) -> int:
+        return self._device_id
+
     @property
     def planes(self):
         """

av/video/frame.py

@@ -29,6 +29,10 @@ class PictureType(IntEnum):
     BI = 7
 
 class CudaContext:
+    @property
+    def device_id(self) -> int: ...
+    @property
+    def primary_ctx(self) -> bool: ...
     def __init__(self, device_id: int = 0, primary_ctx: bool = True) -> None: ...
 
 class VideoFrame(Frame):
@@ -48,6 +52,8 @@ class VideoFrame(Frame):
     def interlaced_frame(self) -> bool: ...
     @property
     def rotation(self) -> int: ...
+    @property
+    def device_id(self) -> int: ...
     def __init__(
         self, width: int = 0, height: int = 0, format: str = "yuv420p"
     ) -> None: ...