Make VideoCodecContext 12 bytes smaller

Author: WyattBlue

av/codec/context.pxd

@@ -1,5 +1,5 @@
 cimport libav as lib
-from libc.stdint cimport int64_t
+from libc.stdint cimport int64_t, uint8_t
 
 from av.buffer cimport ByteSource
 from av.codec.codec cimport Codec
@@ -11,13 +11,6 @@ from av.packet cimport Packet
 cdef class CodecContext:
     cdef lib.AVCodecContext *ptr
 
-    # Whether AVCodecContext.extradata should be de-allocated upon destruction.
-    cdef bint extradata_set
-
-    # True when created via add_stream_from_template(); start_encoding() skips
-    # avcodec_open2() and lets encode()/decode() open the codec lazily if needed.
-    cdef readonly bint _template_initialized
-
     # Used as a signal that this is within a stream, and also for us to access that
     # stream. This is set "manually" by the stream after constructing this object.
     cdef int stream_index
@@ -40,6 +33,10 @@ cdef class CodecContext:
     # Used by hardware-accelerated decode.
     cdef HWAccel hwaccel_ctx
 
+    cdef uint8_t _ctxflags  # ctxEnum: template_initialized
+    # True when created via add_stream_from_template(); start_encoding() skips
+    # avcodec_open2() and lets encode()/decode() open the codec lazily if needed.
+
     # Used by both transcode APIs to setup user-land objects.
     # TODO: Remove the `Packet` from `_setup_decoded_frame` (because flushing packets
     # are bogus). It should take all info it needs from the context and/or stream.

av/codec/context.py

@@ -206,7 +206,6 @@ def extradata(self, data):
                 raise MemoryError("Cannot allocate extradata")
             memcpy(self.ptr.extradata, source.ptr, source.length)
             self.ptr.extradata_size = source.length
-        self.extradata_set = True
 
     @property
     def extradata_size(self):
@@ -253,9 +252,8 @@ def open(self, strict: cython.bint = True):
         self.options = dict(options)
 
     def __dealloc__(self):
-        if self.ptr and self.extradata_set:
-            lib.av_freep(cython.address(self.ptr.extradata))
         if self.ptr:
+            lib.av_freep(cython.address(self.ptr.extradata))
             lib.avcodec_free_context(cython.address(self.ptr))
         if self.parser:
             lib.av_parser_close(self.parser)

av/container/output.py

@@ -275,7 +275,7 @@ def add_stream_from_template(
 
         # Construct the user-land stream
         py_codec_context: CodecContext = wrap_codec_context(ctx, codec, None)
-        py_codec_context._template_initialized = True
+        py_codec_context._ctxflags |= 1  # _template_initialized = True
         py_stream: Stream = wrap_stream(self, stream, py_codec_context)
         self.streams.add_stream(py_stream)
 
@@ -446,7 +446,7 @@ def start_encoding(self):
                 for k, v in self.options.items():
                     ctx.options.setdefault(k, v)
 
-                if not ctx._template_initialized:
+                if not (ctx._ctxflags & 1):  # template_initialized
                     ctx.open()
 
                     # Track option consumption.

av/video/codeccontext.pxd

@@ -19,8 +19,6 @@ cdef class VideoCodecContext(CodecContext):
     cdef AVCodecPrivateData _private_data
     cdef VideoFormat _format
     cdef _build_format(self)
-    cdef int last_w
-    cdef int last_h
     cdef readonly VideoReformatter reformatter
     cdef readonly int encoded_frame_count
     cdef VideoFrame next_frame

av/video/codeccontext.py

@@ -39,10 +39,6 @@ def _get_hw_format(
 
 @cython.cclass
 class VideoCodecContext(CodecContext):
-    def __cinit__(self, *args, **kwargs):
-        self.last_w = 0
-        self.last_h = 0
-
     @cython.cfunc
     def _init(
         self,