Add workaround for mypy#3004

Author: WyattBlue

av/audio/codeccontext.pyi

@@ -7,20 +7,21 @@ from .format import AudioFormat
 from .frame import AudioFrame
 from .layout import AudioLayout
 
+class _Format:
+    def __get__(self, i: object | None, owner: type | None = None) -> AudioFormat: ...
+    def __set__(self, instance: object, value: AudioFormat | str) -> None: ...
+
+class _Layout:
+    def __get__(self, i: object | None, owner: type | None = None) -> AudioLayout: ...
+    def __set__(self, instance: object, value: AudioLayout | str) -> None: ...
+
 class AudioCodecContext(CodecContext):
     frame_size: int
     sample_rate: int
     rate: int
     type: Literal["audio"]
-
-    @property
-    def format(self) -> AudioFormat: ...
-    @format.setter
-    def format(self, value: AudioFormat | str) -> None: ...
-    @property
-    def layout(self) -> AudioLayout: ...
-    @layout.setter
-    def layout(self, value: AudioLayout | str) -> None: ...
+    format: _Format
+    layout: _Layout
     @property
     def channels(self) -> int: ...
     def encode(self, frame: AudioFrame | None = None) -> list[Packet]: ...

av/audio/frame.pyi

@@ -17,13 +17,21 @@ _SupportedNDarray = Union[
     np.ndarray[Any, np.dtype[np.uint8]],  # u1
 ]
 
+class _Format:
+    def __get__(self, i: object | None, owner: type | None = None) -> AudioFormat: ...
+    def __set__(self, instance: object, value: AudioFormat | str) -> None: ...
+
+class _Layout:
+    def __get__(self, i: object | None, owner: type | None = None) -> AudioLayout: ...
+    def __set__(self, instance: object, value: AudioLayout | str) -> None: ...
+
 class AudioFrame(Frame):
     planes: tuple[AudioPlane, ...]
     samples: int
     sample_rate: int
     rate: int
-    format: AudioFormat
-    layout: AudioLayout
+    format: _Format
+    layout: _Layout
 
     def __init__(
         self,

av/audio/stream.pyi

@@ -8,6 +8,14 @@ from .format import AudioFormat
 from .frame import AudioFrame
 from .layout import AudioLayout
 
+class _Format:
+    def __get__(self, i: object | None, owner: type | None = None) -> AudioFormat: ...
+    def __set__(self, instance: object, value: AudioFormat | str) -> None: ...
+
+class _Layout:
+    def __get__(self, i: object | None, owner: type | None = None) -> AudioLayout: ...
+    def __set__(self, instance: object, value: AudioLayout | str) -> None: ...
+
 class AudioStream(Stream):
     codec_context: AudioCodecContext
     # From codec context
@@ -17,14 +25,7 @@ class AudioStream(Stream):
     rate: int
     channels: int
     type: Literal["audio"]
-
-    @property
-    def format(self) -> AudioFormat: ...
-    @format.setter
-    def format(self, value: AudioFormat | str) -> None: ...
-    @property
-    def layout(self) -> AudioLayout: ...
-    @layout.setter
-    def layout(self, value: AudioLayout | str) -> None: ...
+    format: _Format
+    layout: _Layout
     def encode(self, frame: AudioFrame | None = None) -> list[Packet]: ...
     def decode(self, packet: Packet | None = None) -> list[AudioFrame]: ...

av/filter/graph.pyi

@@ -34,8 +34,8 @@ class Graph:
         self,
         template: AudioStream | None = None,
         sample_rate: int | None = None,
-        format: AudioFormat | None = None,
-        layout: AudioLayout | None = None,
+        format: AudioFormat | str | None = None,
+        layout: AudioLayout | str | None = None,
         channels: int | None = None,
         name: str | None = None,
         time_base: Fraction | None = None,

tests/test_codec_context.py

@@ -139,7 +139,7 @@ def test_encoder_extradata(self):
         assert ctx.extradata_size == 3
 
     def test_encoder_pix_fmt(self):
-        ctx = av.codec.Codec("h264", "w").create()
+        ctx = av.codec.Codec("h264", "w").create("video")
 
         # valid format
         ctx.pix_fmt = "yuv420p"
@@ -429,8 +429,8 @@ def _audio_encoding(
 
         ctx.time_base = Fraction(1) / sample_rate
         ctx.sample_rate = sample_rate
-        ctx.format = sample_fmt  # type: ignore
-        ctx.layout = channel_layout  # type: ignore
+        ctx.format = sample_fmt
+        ctx.layout = channel_layout
 
         ctx.open()
 
@@ -463,8 +463,8 @@ def _audio_encoding(
 
         ctx = Codec(codec_name, "r").create("audio")
         ctx.sample_rate = sample_rate
-        ctx.format = sample_fmt  # type: ignore
-        ctx.layout = channel_layout  # type: ignore
+        ctx.format = sample_fmt
+        ctx.layout = channel_layout
         ctx.open()
 
         result_samples = 0

tests/test_encode.py

@@ -196,8 +196,8 @@ def test_transcode(self) -> None:
 
             ctx = stream.codec_context
             ctx.sample_rate = sample_rate
-            stream.format = sample_fmt  # type: ignore
-            ctx.layout = channel_layout  # type: ignore
+            stream.format = sample_fmt
+            ctx.layout = channel_layout
 
             with av.open(
                 fate_suite("audio-reference/chorusnoise_2ch_44kHz_s16.wav")