Fix some incorrect type stubs

Author: WyattBlue

av/__init__.py

@@ -47,6 +47,7 @@
 AVError = FFmpegError  # noqa: F405
 
 __all__ = (
+    "__version__",
     "time_base",
     "library_versions",
     "AudioCodecContext",

av/codec/__init__.py

@@ -1,2 +1,11 @@
 from .codec import Capabilities, Codec, Properties, codec_descriptor, codecs_available
 from .context import CodecContext
+
+__all__ = (
+    "Capabilities",
+    "Codec",
+    "Properties",
+    "codec_descriptor",
+    "codecs_available",
+    "CodecContext",
+)

av/codec/context.pyi

@@ -56,6 +56,7 @@ class Flags2(EnumFlag):
 
 class CodecContext:
     extradata: bytes | None
+    extradata_size: int
     is_open: bool
     is_encoder: bool
     is_decoder: bool
@@ -95,6 +96,7 @@ class CodecContext:
     ac_pred: bool
     interlaced_me: bool
     closed_gop: bool
+    delay: bool
 
     def open(self, strict: bool = True) -> None: ...
     def close(self, strict: bool = True) -> None: ...

av/container/output.pyi

@@ -23,7 +23,7 @@ class OutputContainer(Container):
     @overload
     def add_stream(
         self,
-        codec_name: Literal["h264", "mpeg4", "png"],
+        codec_name: Literal["h264", "mpeg4", "png", "qtrle"],
         rate: Fraction | int | float | None = None,
         template: None = None,
         options: dict[str, str] | None = None,

av/video/codeccontext.pyi

@@ -11,7 +11,7 @@ class VideoCodecContext(CodecContext):
     format: VideoFormat | None
     width: int
     height: int
-    bits_per_codec_sample: int
+    bits_per_coded_sample: int
     pix_fmt: str | None
     framerate: Fraction
     rate: Fraction

av/video/format.pyi

@@ -9,6 +9,7 @@ class VideoFormat:
     is_rgb: bool
     width: int
     height: int
+    components: tuple[VideoFormatComponent, ...]
 
     def __init__(self, name: str, width: int = 0, height: int = 0) -> None: ...
     def chroma_width(self, luma_width: int = 0) -> int: ...

av/video/stream.pyi

@@ -21,7 +21,7 @@ class VideoStream(Stream):
     format: VideoFormat
     width: int
     height: int
-    bits_per_codec_sample: int
+    bits_per_coded_sample: int
     pix_fmt: str | None
     framerate: Fraction
     rate: Fraction

tests/test_audiofifo.py

@@ -33,11 +33,8 @@ def test_data(self) -> None:
     def test_pts_simple(self) -> None:
         fifo = av.AudioFifo()
 
-        # ensure __repr__ does not crash
-        self.assertTrue(
-            str(fifo).startswith(
-                "<av.AudioFifo uninitialized, use fifo.write(frame), at 0x"
-            )
+        assert str(fifo).startswith(
+            "<av.AudioFifo uninitialized, use fifo.write(frame), at 0x"
         )
 
         iframe = av.AudioFrame(samples=1024)
@@ -47,11 +44,8 @@ def test_pts_simple(self) -> None:
 
         fifo.write(iframe)
 
-        # ensure __repr__ was updated
-        self.assertTrue(
-            str(fifo).startswith(
-                "<av.AudioFifo 1024 samples of 48000hz <av.AudioLayout 'stereo'> <av.AudioFormat s16> at 0x"
-            )
+        assert str(fifo).startswith(
+            "<av.AudioFifo 1024 samples of 48000hz <av.AudioLayout 'stereo'> <av.AudioFormat s16> at 0x"
         )
 
         oframe = fifo.read(512)

tests/test_codec_context.py

@@ -72,7 +72,7 @@ def test_skip_frame_default(self):
         ctx = Codec("png", "w").create()
         assert ctx.skip_frame.name == "DEFAULT"
 
-    def test_codec_delay(self):
+    def test_codec_delay(self) -> None:
         with av.open(fate_suite("mkv/codec_delay_opus.mkv")) as container:
             assert container.streams.audio[0].codec_context.delay == 312
         with av.open(fate_suite("h264/interlaced_crop.mp4")) as container:
@@ -131,7 +131,7 @@ def test_decoder_timebase(self) -> None:
         with pytest.raises(RuntimeError):
             ctx.time_base = Fraction(1, 25)
 
-    def test_encoder_extradata(self):
+    def test_encoder_extradata(self) -> None:
         ctx = av.codec.Codec("h264", "w").create()
         assert ctx.extradata is None
         assert ctx.extradata_size == 0
@@ -140,7 +140,7 @@ def test_encoder_extradata(self):
         assert ctx.extradata == b"123"
         assert ctx.extradata_size == 3
 
-    def test_encoder_pix_fmt(self):
+    def test_encoder_pix_fmt(self) -> None:
         ctx = av.codec.Codec("h264", "w").create("video")
 
         # valid format
@@ -161,6 +161,7 @@ def test_bits_per_coded_sample(self):
             for packet in container.demux(stream):
                 for frame in packet.decode():
                     pass
+                assert isinstance(packet.stream, av.VideoStream)
                 assert packet.stream.bits_per_coded_sample == 32
 
         with av.open(fate_suite("qtrle/aletrek-rle.mov")) as container:

tests/test_file_probing.py

@@ -43,9 +43,7 @@ def test_stream_probing(self):
         assert stream.bit_rate is None
         assert stream.channels == 2
         assert stream.codec.name == "aac_latm"
-        self.assertEqual(
-            stream.codec.long_name, "AAC LATM (Advanced Audio Coding LATM syntax)"
-        )
+        assert stream.codec.long_name == "AAC LATM (Advanced Audio Coding LATM syntax)"
         assert stream.format.bits == 32
         assert stream.format.name == "fltp"
         assert stream.layout.name == "stereo"