VideoFrame: Don't need np_buffer

Author: WyattBlue

av/video/frame.pxd

@@ -13,23 +13,14 @@ cdef class CudaContext:
     cdef dict _frames_cache
     cdef lib.AVBufferRef* _get_device_ref(self)
     cdef public lib.AVBufferRef* get_frames_ctx(
-        self,
-        lib.AVPixelFormat sw_fmt,
-        int width,
-        int height,
+        self, lib.AVPixelFormat sw_fmt, int width, int height
     )
 
 cdef class VideoFrame(Frame):
-    # This is the buffer that is used to back everything in the AVFrame.
-    # We don't ever actually access it directly.
-    cdef uint8_t *_buffer
-    cdef object _np_buffer
-    cdef object _cuda_ctx
-
+    cdef CudaContext _cuda_ctx
     cdef VideoReformatter reformatter
     cdef readonly VideoFormat format
     cdef readonly int _device_id
-
     cdef _init(self, lib.AVPixelFormat format, unsigned int width, unsigned int height)
     cdef _init_user_attributes(self)
     cpdef save(self, object filepath)

av/video/frame.py

@@ -403,11 +403,7 @@ def _init_user_attributes(self):
         )
 
     def __dealloc__(self):
-        # The `self._buffer` member is only set if *we* allocated the buffer in `_init`,
-        # as opposed to a buffer allocated by a decoder.
         lib.av_frame_unref(self.ptr)
-        # Let go of the reference from the numpy buffers if we made one
-        self._np_buffer = None
 
     def __repr__(self):
         return (
@@ -1061,7 +1057,6 @@ def _image_fill_pointers_numpy(self, buffer, width, height, linesizes, format):
         c_ptr: cython.pointer[uint8_t] = cython.cast(cython.pointer[uint8_t], c_data)
         c_format: lib.AVPixelFormat = get_pix_fmt(format)
         lib.av_frame_unref(self.ptr)
-        self._np_buffer = None
 
         # Hold on to a reference for the numpy buffer so that it doesn't get accidentally garbage collected
         self.ptr.format = c_format
@@ -1094,7 +1089,6 @@ def _image_fill_pointers_numpy(self, buffer, width, height, linesizes, format):
             Py_DECREF(py_buf)
             raise MemoryError("av_buffer_create failed")
 
-        self._np_buffer = buffer
         self._init_user_attributes()
 
     @staticmethod

av/video/frame.pyi

@@ -101,4 +101,4 @@ class VideoFrame(Frame):
         device_id: int | None = None,
         primary_ctx: bool = True,
         cuda_context: CudaContext | None = None,
-    ) -> "VideoFrame": ...
+    ) -> VideoFrame: ...