Set timebases in open

Author: WyattBlue

av/audio/codeccontext.pyx

@@ -11,14 +11,9 @@ cdef class AudioCodecContext(CodecContext):
     cdef _init(self, lib.AVCodecContext *ptr, const lib.AVCodec *codec):
         CodecContext._init(self, ptr, codec)
 
-    cdef _set_default_time_base(self):
-        self.ptr.time_base.num = 1
-        self.ptr.time_base.den = self.ptr.sample_rate
-
     cdef _prepare_frames_for_encode(self, Frame input_frame):
 
         cdef AudioFrame frame = input_frame
-
         cdef bint allow_var_frame_size = self.ptr.codec.capabilities & lib.AV_CODEC_CAP_VARIABLE_FRAME_SIZE
 
         # Note that the resampler will simply return an input frame if there is

av/codec/context.pxd

@@ -8,12 +8,10 @@ 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
-    cdef bint _is_open
 
     # 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
@@ -30,8 +28,7 @@ cdef class CodecContext:
 
     # Public API.
     cpdef open(self, bint strict=?)
-
-    cdef _set_default_time_base(self)
+    cdef readonly bint is_open
 
     # Wraps both versions of the transcode API, returning lists.
     cpdef encode(self, Frame frame=?)

av/codec/context.pyi

@@ -57,9 +57,6 @@ class Flags2(EnumFlag):
 class CodecContext:
     extradata: bytes | None
     extradata_size: int
-    is_open: bool
-    is_encoder: bool
-    is_decoder: bool
     name: str
     codec: Codec
     options: dict[str, str]
@@ -98,6 +95,12 @@ class CodecContext:
     closed_gop: bool
     delay: bool
 
+    @property
+    def is_open(self) -> bool: ...
+    @property
+    def is_encoder(self) -> bool: ...
+    @property
+    def is_decoder(self) -> bool: ...
     def open(self, strict: bool = True) -> None: ...
     @staticmethod
     def create(

av/codec/context.pyx

@@ -117,7 +117,6 @@ Flags2 = define_enum("Flags2", __name__, (
 
 
 cdef class CodecContext:
-
     @staticmethod
     def create(codec, mode=None):
         cdef Codec cy_codec = codec if isinstance(codec, Codec) else Codec(codec, mode)
@@ -130,7 +129,7 @@ cdef class CodecContext:
 
         self.options = {}
         self.stream_index = -1  # This is set by the container immediately.
-        self._is_open = False
+        self.is_open = False
 
     cdef _init(self, lib.AVCodecContext *ptr, const lib.AVCodec *codec):
         self.ptr = ptr
@@ -217,10 +216,6 @@ cdef class CodecContext:
     def extradata_size(self):
         return self.ptr.extradata_size
 
-    @property
-    def is_open(self):
-        return self._is_open
-
     @property
     def is_encoder(self):
         if self.ptr is NULL:
@@ -234,27 +229,29 @@ cdef class CodecContext:
         return lib.av_codec_is_decoder(self.ptr.codec)
 
     cpdef open(self, bint strict=True):
-        if self._is_open:
+        if self.is_open:
             if strict:
                 raise ValueError("CodecContext is already open.")
             return
 
         cdef _Dictionary options = Dictionary()
         options.update(self.options or {})
 
-        # Assert we have a time_base for encoders.
         if not self.ptr.time_base.num and self.is_encoder:
-            self._set_default_time_base()
+            if self.type == "video":
+                self.ptr.time_base.num = self.ptr.framerate.den or 1
+                self.ptr.time_base.den = self.ptr.framerate.num or lib.AV_TIME_BASE
+            elif self.type == "audio":
+                self.ptr.time_base.num = 1
+                self.ptr.time_base.den = self.ptr.sample_rate
+            else:
+                self.ptr.time_base.num = 1
+                self.ptr.time_base.den = lib.AV_TIME_BASE
 
         err_check(lib.avcodec_open2(self.ptr, self.codec.ptr, &options.ptr))
-        self._is_open = True
+        self.is_open = True
         self.options = dict(options)
 
-    cdef _set_default_time_base(self):
-        self.ptr.time_base.num = 1
-        self.ptr.time_base.den = lib.AV_TIME_BASE
-
-
     def __dealloc__(self):
         if self.ptr and self.extradata_set:
             lib.av_freep(&self.ptr.extradata)
@@ -564,7 +561,7 @@ cdef class CodecContext:
 
     @thread_count.setter
     def thread_count(self, int value):
-        if self._is_open:
+        if self.is_open:
             raise RuntimeError("Cannot change thread_count after codec is open.")
         self.ptr.thread_count = value
 
@@ -579,7 +576,7 @@ cdef class CodecContext:
 
     @thread_type.setter
     def thread_type(self, value):
-        if self._is_open:
+        if self.is_open:
             raise RuntimeError("Cannot change thread_type after codec is open.")
         self.ptr.thread_type = ThreadType[value].value
 

av/video/codeccontext.pyx

@@ -20,10 +20,6 @@ cdef class VideoCodecContext(CodecContext):
         self._build_format()
         self.encoded_frame_count = 0
 
-    cdef _set_default_time_base(self):
-        self.ptr.time_base.num = self.ptr.framerate.den or 1
-        self.ptr.time_base.den = self.ptr.framerate.num or lib.AV_TIME_BASE
-
     cdef _prepare_frames_for_encode(self, Frame input):
         if not input:
             return [None]