Combine av/indexenr* to av/index.py

Author: WyattBlue

av/indexentries.pxd av/index.pxdav/indexentries.pxd renamed to av/index.pxd

@@ -1,9 +1,12 @@
 cimport libav as lib
 
 
+cdef class IndexEntry:
+    cdef lib.AVIndexEntry *ptr
+    cdef _init(self, lib.AVIndexEntry *ptr)
+
 cdef class IndexEntries:
     cdef lib.AVStream *stream_ptr
     cdef _init(self, lib.AVStream *ptr)
 
-
 cdef IndexEntries wrap_index_entries(lib.AVStream *ptr)

av/indexentries.py av/index.pyav/indexentries.py renamed to av/index.py

@@ -1,11 +1,69 @@
 import cython
 import cython.cimports.libav as lib
-from cython.cimports.av.indexentry import wrap_index_entry
 from cython.cimports.libc.stdint import int64_t
 
 _cinit_bypass_sentinel = cython.declare(object, object())
 
 
+@cython.cfunc
+def wrap_index_entry(ptr: cython.pointer[lib.AVIndexEntry]) -> IndexEntry:
+    obj: IndexEntry = IndexEntry(_cinit_bypass_sentinel)
+    obj._init(ptr)
+    return obj
+
+
+@cython.cclass
+class IndexEntry:
+    """A single entry from a stream's index.
+
+    This is a thin wrapper around FFmpeg's ``AVIndexEntry``.
+
+    The exact meaning of the fields depends on the container/demuxer.
+    """
+
+    def __cinit__(self, sentinel):
+        if sentinel is not _cinit_bypass_sentinel:
+            raise RuntimeError("cannot manually instantiate IndexEntry")
+
+    @cython.cfunc
+    def _init(self, ptr: cython.pointer[lib.AVIndexEntry]):
+        self.ptr = ptr
+
+    def __repr__(self):
+        return (
+            f"<av.IndexEntry pos={self.pos} timestamp={self.timestamp} flags={self.flags} "
+            f"size={self.size} min_distance={self.min_distance}>"
+        )
+
+    @property
+    def pos(self):
+        return self.ptr.pos
+
+    @property
+    def timestamp(self):
+        return self.ptr.timestamp
+
+    @property
+    def flags(self):
+        return self.ptr.flags
+
+    @property
+    def is_keyframe(self):
+        return bool(self.ptr.flags & lib.AVINDEX_KEYFRAME)
+
+    @property
+    def is_discard(self):
+        return bool(self.ptr.flags & lib.AVINDEX_DISCARD_FRAME)
+
+    @property
+    def size(self):
+        return self.ptr.size
+
+    @property
+    def min_distance(self):
+        return self.ptr.min_distance
+
+
 @cython.cfunc
 def wrap_index_entries(ptr: cython.pointer[lib.AVStream]) -> IndexEntries:
     obj: IndexEntries = IndexEntries(_cinit_bypass_sentinel)

av/indexentries.pyi av/index.pyiav/indexentries.pyi renamed to av/index.pyi

@@ -1,6 +1,13 @@
 from typing import Iterator, overload
 
-from av.indexentry import IndexEntry
+class IndexEntry:
+    pos: int
+    timestamp: int
+    flags: int
+    is_keyframe: bool
+    is_discard: bool
+    size: int
+    min_distance: int
 
 class IndexEntries:
     def __len__(self) -> int: ...

av/indexentry.pxd

@@ -3,7 +3,7 @@ cimport libav as lib
 from av.codec.context cimport CodecContext
 from av.container.core cimport Container
 from av.frame cimport Frame
-from av.indexentries cimport IndexEntries
+from av.index cimport IndexEntries
 from av.packet cimport Packet
 
 

av/indexentry.py

@@ -3,7 +3,7 @@
 import cython
 from cython.cimports import libav as lib
 from cython.cimports.av.error import err_check
-from cython.cimports.av.indexentries import wrap_index_entries
+from cython.cimports.av.index import wrap_index_entries
 from cython.cimports.av.packet import Packet
 from cython.cimports.av.utils import (
     avdict_to_dict,