Make video/plane pure python

av/video/plane.pyx → av/video/plane.py

@@ -1,8 +1,10 @@
-from av.video.frame cimport VideoFrame
+import cython
+from cython.cimports.av.video.frame import VideoFrame
 
 
-cdef class VideoPlane(Plane):
-    def __cinit__(self, VideoFrame frame, int index):
+@cython.cclass
+class VideoPlane(Plane):
+    def __cinit__(self, frame: VideoFrame, index: cython.int):
         # The palette plane has no associated component or linesize; set fields manually
         if frame.format.name == "pal8" and index == 1:
             self.width = 256
@@ -16,15 +18,16 @@ def __cinit__(self, VideoFrame frame, int index):
                 self.width = component.width
                 self.height = component.height
                 break
-        else:
+        else:  # nobreak
             raise RuntimeError(f"could not find plane {index} of {frame.format!r}")
 
         # Sometimes, linesize is negative (and that is meaningful). We are only
         # insisting that the buffer size be based on the extent of linesize, and
         # ignore it's direction.
         self.buffer_size = abs(self.frame.ptr.linesize[self.index]) * self.height
 
-    cdef size_t _buffer_size(self):
+    @cython.cfunc
+    def _buffer_size(self) -> cython.size_t:
         return self.buffer_size
 
     @property

av/video/reformatter.pyx

@@ -165,12 +165,11 @@ cdef class VideoReformatter:
 
         if src_colorspace != dst_colorspace or src_color_range != dst_color_range:
             with nogil:
-                # Casts for const-ness, because Cython isn't expressive enough.
                 ret = lib.sws_getColorspaceDetails(
                     self.ptr,
-                    <int**>&inv_tbl,
+                    &inv_tbl,
                     &src_colorspace_range,
-                    <int**>&tbl,
+                    &tbl,
                     &dst_colorspace_range,
                     &brightness,
                     &contrast,
@@ -210,8 +209,7 @@ cdef class VideoReformatter:
         with nogil:
             lib.sws_scale(
                 self.ptr,
-                # Cast for const-ness, because Cython isn't expressive enough.
-                <const uint8_t**>frame.ptr.data,
+                frame.ptr.data,
                 frame.ptr.linesize,
                 0,  # slice Y
                 frame.ptr.height,