Generalize SideData more.

Author: mikeboers

Makefile

@@ -69,7 +69,6 @@ deploy-docs: docs
 
 
 
-clean: clean-build
 
 clean-build:
 	- rm -rf build
@@ -87,4 +86,5 @@ clean-docs:
 	- rm tmp/tagfile.xml
 	- make -C docs clean
 
+clean: clean-build clean-sandbox clean-src
 clean-all: clean-build clean-sandbox clean-src clean-docs

av/frame.pxd

@@ -1,7 +1,7 @@
 cimport libav as lib
 
 from av.packet cimport Packet
-
+from av.sidedata.sidedata cimport _SideDataContainer
 
 cdef class Frame(object):
 
@@ -11,6 +11,8 @@ cdef class Frame(object):
     cdef lib.AVRational _time_base
     cdef _rebase_time(self, lib.AVRational)
 
+    cdef _SideDataContainer _side_data
+
     cdef readonly int index
 
     cdef _copy_internal_attributes(self, Frame source, bint data_layout=?)

av/frame.pyx

@@ -1,5 +1,7 @@
 from av.utils cimport avrational_to_fraction, to_avrational
 
+from av.sidedata.sidedata import SideDataContainer
+
 from fractions import Fraction
 
 
@@ -128,3 +130,9 @@ cdef class Frame(object):
         :type: bool
         """
         def __get__(self): return self.ptr.decode_error_flags != 0 or bool(self.ptr.flags & lib.AV_FRAME_FLAG_CORRUPT)
+
+    @property
+    def side_data(self):
+        if self._side_data is None:
+            self._side_data = SideDataContainer(self)
+        return self._side_data

av/sidedata/__init__.py

@@ -0,0 +1,21 @@
+
+from av.frame cimport Frame
+from av.buffer cimport Buffer
+cimport libav as lib
+
+
+cdef class SideData(Buffer):
+
+    cdef Frame frame
+    cdef lib.AVFrameSideData *ptr
+
+
+cdef SideData wrap_side_data(Frame frame, int index)
+
+cdef class _SideDataContainer(object):
+
+    cdef Frame frame
+
+    cdef list _by_index
+    cdef dict _by_type
+

av/sidedata/motionvectors.pyx

@@ -0,0 +1,94 @@
+
+from av.enums cimport define_enum
+
+import collections
+
+
+cdef object _cinit_bypass_sentinel = object()
+
+
+SideDataType = define_enum('SideDataType', (
+    ('PANSCAN', lib.AV_FRAME_DATA_PANSCAN),
+    ('A53_CC', lib.AV_FRAME_DATA_A53_CC),
+    ('STEREO3D', lib.AV_FRAME_DATA_STEREO3D),
+    ('MATRIXENCODING', lib.AV_FRAME_DATA_MATRIXENCODING),
+    ('DOWNMIX_INFO', lib.AV_FRAME_DATA_DOWNMIX_INFO),
+    ('REPLAYGAIN', lib.AV_FRAME_DATA_REPLAYGAIN),
+    ('DISPLAYMATRIX', lib.AV_FRAME_DATA_DISPLAYMATRIX),
+    ('AFD', lib.AV_FRAME_DATA_AFD),
+    ('MOTION_VECTORS', lib.AV_FRAME_DATA_MOTION_VECTORS),
+    ('SKIP_SAMPLES', lib.AV_FRAME_DATA_SKIP_SAMPLES),
+    ('AUDIO_SERVICE_TYPE', lib.AV_FRAME_DATA_AUDIO_SERVICE_TYPE),
+    ('MASTERING_DISPLAY_METADATA', lib.AV_FRAME_DATA_MASTERING_DISPLAY_METADATA),
+    ('GOP_TIMECODE', lib.AV_FRAME_DATA_GOP_TIMECODE),
+    ('SPHERICAL', lib.AV_FRAME_DATA_SPHERICAL),
+    ('CONTENT_LIGHT_LEVEL', lib.AV_FRAME_DATA_CONTENT_LIGHT_LEVEL),
+    ('ICC_PROFILE', lib.AV_FRAME_DATA_ICC_PROFILE),
+    ('QP_TABLE_PROPERTIES', lib.AV_FRAME_DATA_QP_TABLE_PROPERTIES),
+    ('QP_TABLE_DATA', lib.AV_FRAME_DATA_QP_TABLE_DATA),
+))
+
+
+cdef SideData wrap_side_data(Frame frame, int index):
+    return SideData(_cinit_bypass_sentinel, frame, index)
+
+
+cdef class SideData(Buffer):
+
+    def __init__(self, sentinel, Frame frame, int index):
+        if sentinel is not _cinit_bypass_sentinel:
+            raise RuntimeError('cannot manually instatiate SideData')
+        self.frame = frame
+        self.ptr = frame.ptr.side_data[index]
+
+    cdef size_t _buffer_size(self):
+        return self.ptr.size
+
+    cdef void* _buffer_ptr(self):
+        return self.ptr.data
+
+    cdef bint _buffer_writable(self):
+        return False
+
+    def __repr__(self):
+        return f'<av.sidedata.SideData {self.ptr.size} bytes of {self.type} at 0x{<unsigned int>self.ptr.data:0x}>'
+
+    @property
+    def type(self):
+        return SideDataType.get(self.ptr.type) or self.ptr.type
+
+
+cdef class _SideDataContainer(object):
+
+    def __init__(self, Frame frame):
+
+        self.frame = frame
+        self._by_index = []
+        self._by_type = {}
+
+        cdef int i
+        cdef SideData data
+        for i in range(self.frame.ptr.nb_side_data):
+            data = wrap_side_data(frame, i)
+            self._by_index.append(data)
+            self._by_type[data.type] = data
+
+    def __len__(self):
+        return len(self._by_index)
+
+    def __iter__(self):
+        return iter(self._by_index)
+
+    def __getitem__(self, key):
+
+        if isinstance(key, int):
+            return self._by_index[key]
+
+        type_ = SideDataType.get(key)
+        return self._by_type(type_)
+
+
+class SideDataContainer(_SideDataContainer, collections.Mapping):
+    pass
+
+

av/sidedata/sidedata.pxd

@@ -3,6 +3,7 @@ from libc.stdint cimport int64_t
 cimport libav as lib
 
 from av.codec.context cimport CodecContext
+from av.enums cimport define_enum
 from av.frame cimport Frame
 from av.packet cimport Packet
 from av.utils cimport avrational_to_fraction, to_avrational
@@ -12,6 +13,41 @@ from av.video.frame cimport VideoFrame, alloc_video_frame
 from av.video.reformatter cimport VideoReformatter
 
 
+CodecContextFlags = define_enum('CodecContextFlags', (
+    ('UNALIGNED', lib.AV_CODEC_FLAG_UNALIGNED),
+    ('QSCALE', lib.AV_CODEC_FLAG_QSCALE),
+    ('4MV', lib.AV_CODEC_FLAG_4MV),
+    ('OUTPUT_CORRUPT', lib.AV_CODEC_FLAG_OUTPUT_CORRUPT),
+    ('QPEL', lib.AV_CODEC_FLAG_QPEL),
+    ('PASS1', lib.AV_CODEC_FLAG_PASS1),
+    ('PASS2', lib.AV_CODEC_FLAG_PASS2),
+    ('LOOP_FILTER', lib.AV_CODEC_FLAG_LOOP_FILTER),
+    ('GRAY', lib.AV_CODEC_FLAG_GRAY),
+    ('PSNR', lib.AV_CODEC_FLAG_PSNR),
+    ('TRUNCATED', lib.AV_CODEC_FLAG_TRUNCATED),
+    ('INTERLACED_DCT', lib.AV_CODEC_FLAG_INTERLACED_DCT),
+    ('LOW_DELAY', lib.AV_CODEC_FLAG_LOW_DELAY),
+    ('GLOBAL_HEADER', lib.AV_CODEC_FLAG_GLOBAL_HEADER),
+    ('BITEXACT', lib.AV_CODEC_FLAG_BITEXACT),
+    ('AC_PRED', lib.AV_CODEC_FLAG_AC_PRED),
+    ('INTERLACED_ME', lib.AV_CODEC_FLAG_INTERLACED_ME),
+    ('CLOSED_GOP', lib.AV_CODEC_FLAG_CLOSED_GOP),
+), is_flags=True)
+
+CodecContextFlags2 = define_enum('CodecContextFlags2', (
+    ('FAST', lib.AV_CODEC_FLAG2_FAST),
+    ('NO_OUTPUT', lib.AV_CODEC_FLAG2_NO_OUTPUT),
+    ('LOCAL_HEADER', lib.AV_CODEC_FLAG2_LOCAL_HEADER),
+    ('DROP_FRAME_TIMECODE', lib.AV_CODEC_FLAG2_DROP_FRAME_TIMECODE),
+    ('CHUNKS', lib.AV_CODEC_FLAG2_CHUNKS),
+    ('IGNORE_CROP', lib.AV_CODEC_FLAG2_IGNORE_CROP),
+    ('SHOW_ALL', lib.AV_CODEC_FLAG2_SHOW_ALL),
+    ('EXPORT_MVS', lib.AV_CODEC_FLAG2_EXPORT_MVS),
+    ('SKIP_MANUAL', lib.AV_CODEC_FLAG2_SKIP_MANUAL),
+    ('RO_FLUSH_NOOP', lib.AV_CODEC_FLAG2_RO_FLUSH_NOOP),
+), is_flags=True)
+
+
 cdef class VideoCodecContext(CodecContext):
 
     def __cinit__(self, *args, **kwargs):
@@ -71,6 +107,22 @@ cdef class VideoCodecContext(CodecContext):
     cdef _build_format(self):
         self._format = get_video_format(<lib.AVPixelFormat>self.ptr.pix_fmt, self.ptr.width, self.ptr.height)
 
+    @property
+    def flags(self):
+        return CodecContextFlags.get(self.ptr.flags)
+    @flags.setter
+    def flags(self, value):
+        enum = CodecContextFlags.get(value)
+        self.ptr.flags = enum.value
+
+    @property
+    def flags2(self):
+        return CodecContextFlags.get(self.ptr.flags2)
+    @flags2.setter
+    def flags2(self, value):
+        enum = CodecContextFlags2.get(value)
+        self.ptr.flags2 = enum.value
+
     property format:
         def __get__(self):
             return self._format

av/sidedata/sidedata.pyx

@@ -32,22 +32,6 @@ PictureType = define_enum('PictureType', (
     ('BI', lib.AV_PICTURE_TYPE_BI),
 ))
 
-SideDataType = define_enum('SideDataType', (
-    ('PANSCAN', lib.AV_FRAME_DATA_PANSCAN),
-    ('A53_CC', lib.AV_FRAME_DATA_A53_CC),
-    ('STEREO3D', lib.AV_FRAME_DATA_STEREO3D),
-    ('MATRIXENCODING', lib.AV_FRAME_DATA_MATRIXENCODING),
-    ('DOWNMIX_INFO', lib.AV_FRAME_DATA_DOWNMIX_INFO),
-    ('REPLAYGAIN', lib.AV_FRAME_DATA_REPLAYGAIN),
-    ('DISPLAYMATRIX', lib.AV_FRAME_DATA_DISPLAYMATRIX),
-    ('AFD', lib.AV_FRAME_DATA_AFD),
-    ('MOTION_VECTORS', lib.AV_FRAME_DATA_MOTION_VECTORS),
-    ('SKIP_SAMPLES', lib.AV_FRAME_DATA_SKIP_SAMPLES),
-    ('AUDIO_SERVICE_TYPE', lib.AV_FRAME_DATA_AUDIO_SERVICE_TYPE),
-    ('MASTERING_DISPLAY_METADATA', lib.AV_FRAME_DATA_MASTERING_DISPLAY_METADATA),
-    ('GOP_TIMECODE', lib.AV_FRAME_DATA_GOP_TIMECODE),
-))
-
 
 cdef copy_array_to_plane(array, VideoPlane plane, unsigned int bytes_per_pixel):
     cdef bytes imgbytes = array.tobytes()

av/video/codeccontext.pyx

@@ -47,9 +47,36 @@ cdef extern from "libavcodec/avcodec.pyav.h" nogil:
         FF_THREAD_SLICE
 
     cdef enum:
-        AV_CODEC_FLAG_GLOBAL_HEADER
+        AV_CODEC_FLAG_UNALIGNED
         AV_CODEC_FLAG_QSCALE
+        AV_CODEC_FLAG_4MV
+        AV_CODEC_FLAG_OUTPUT_CORRUPT
+        AV_CODEC_FLAG_QPEL
+        AV_CODEC_FLAG_PASS1
+        AV_CODEC_FLAG_PASS2
+        AV_CODEC_FLAG_LOOP_FILTER
+        AV_CODEC_FLAG_GRAY
+        AV_CODEC_FLAG_PSNR
         AV_CODEC_FLAG_TRUNCATED
+        AV_CODEC_FLAG_INTERLACED_DCT
+        AV_CODEC_FLAG_LOW_DELAY
+        AV_CODEC_FLAG_GLOBAL_HEADER
+        AV_CODEC_FLAG_BITEXACT
+        AV_CODEC_FLAG_AC_PRED
+        AV_CODEC_FLAG_INTERLACED_ME
+        AV_CODEC_FLAG_CLOSED_GOP
+
+    cdef enum:
+        AV_CODEC_FLAG2_FAST
+        AV_CODEC_FLAG2_NO_OUTPUT
+        AV_CODEC_FLAG2_LOCAL_HEADER
+        AV_CODEC_FLAG2_DROP_FRAME_TIMECODE
+        AV_CODEC_FLAG2_CHUNKS
+        AV_CODEC_FLAG2_IGNORE_CROP
+        AV_CODEC_FLAG2_SHOW_ALL
+        AV_CODEC_FLAG2_EXPORT_MVS
+        AV_CODEC_FLAG2_SKIP_MANUAL
+        AV_CODEC_FLAG2_RO_FLUSH_NOOP
 
     cdef enum:
         AV_PKT_FLAG_KEY
@@ -119,6 +146,8 @@ cdef extern from "libavcodec/avcodec.pyav.h" nogil:
         AVCodecID codec_id
 
         int flags
+        int flags2
+
         int thread_count
         int thread_type
 
@@ -236,6 +265,8 @@ cdef extern from "libavcodec/avcodec.pyav.h" nogil:
         AV_FRAME_DATA_SPHERICAL
         AV_FRAME_DATA_CONTENT_LIGHT_LEVEL
         AV_FRAME_DATA_ICC_PROFILE
+        AV_FRAME_DATA_QP_TABLE_PROPERTIES
+        AV_FRAME_DATA_QP_TABLE_DATA
 
     cdef struct AVFrameSideData:
         AVFrameSideDataType type
@@ -258,6 +289,9 @@ cdef extern from "libavcodec/avcodec.pyav.h" nogil:
         int width
         int height
 
+        int nb_side_data
+        AVFrameSideData **side_data
+
         int nb_samples # Audio samples
         int sample_rate # Audio Sample rate
         int channels # Number of audio channels