Remove undertested option/descriptor API

av/codec/__init__.py

@@ -2,7 +2,6 @@
     Capabilities,
     Codec,
     Properties,
-    codec_descriptor,
     codecs_available,
     find_best_pix_fmt_of_list,
 )
@@ -12,7 +11,6 @@
     "Capabilities",
     "Codec",
     "Properties",
-    "codec_descriptor",
     "codecs_available",
     "find_best_pix_fmt_of_list",
     "CodecContext",

av/codec/codec.py

@@ -4,7 +4,6 @@
 from cython.cimports import libav as lib
 from cython.cimports.av.audio.format import get_audio_format
 from cython.cimports.av.codec.hwaccel import wrap_hwconfig
-from cython.cimports.av.descriptor import wrap_avclass
 from cython.cimports.av.utils import avrational_to_fraction
 from cython.cimports.av.video.format import VideoFormat, get_pix_fmt, get_video_format
 from cython.cimports.libc.stdlib import free, malloc
@@ -146,10 +145,6 @@ def mode(self):
     def is_decoder(self):
         return not self.is_encoder
 
-    @property
-    def descriptor(self):
-        return wrap_avclass(self.ptr.priv_class)
-
     @property
     def name(self):
         return self.ptr.name or ""
@@ -355,7 +350,6 @@ def get_codec_names():
 
 
 codecs_available = get_codec_names()
-codec_descriptor = wrap_avclass(lib.avcodec_get_class())
 
 
 def dump_codecs():

av/codec/codec.pyi

@@ -4,7 +4,6 @@ from typing import ClassVar, Literal, Sequence, cast, overload
 
 from av.audio.codeccontext import AudioCodecContext
 from av.audio.format import AudioFormat
-from av.descriptor import Descriptor
 from av.subtitles.codeccontext import SubtitleCodecContext
 from av.video.codeccontext import VideoCodecContext
 from av.video.format import VideoFormat
@@ -53,7 +52,6 @@ class Codec:
     def is_decoder(self) -> bool: ...
     @property
     def mode(self) -> Literal["r", "w"]: ...
-    descriptor: Descriptor
     @property
     def name(self) -> str: ...
     @property
@@ -107,10 +105,6 @@ class Codec:
         VideoCodecContext | AudioCodecContext | SubtitleCodecContext | CodecContext
     ): ...
 
-class codec_descriptor:
-    name: str
-    options: tuple[int, ...]
-
 codecs_available: set[str]
 
 def dump_codecs() -> None: ...

av/filter/__init__.py

@@ -1,3 +1,3 @@
-from .filter import Filter, filter_descriptor, filters_available
+from .filter import Filter, filters_available
 from .graph import Graph as Graph
 from .loudnorm import stats as stats

av/filter/filter.pxd

@@ -1,13 +1,10 @@
 cimport libav as lib
 
-from av.descriptor cimport Descriptor
-
 
 cdef class Filter:
     cdef const lib.AVFilter *ptr
     cdef object _inputs
     cdef object _outputs
-    cdef Descriptor _descriptor
 
 
 cdef Filter wrap_filter(const lib.AVFilter *ptr)

av/filter/filter.py

@@ -1,6 +1,5 @@
 import cython
 from cython.cimports import libav as lib
-from cython.cimports.av.descriptor import wrap_avclass
 from cython.cimports.av.filter.link import alloc_filter_pads
 
 _cinit_sentinel = cython.declare(object, object())
@@ -26,18 +25,6 @@ def __cinit__(self, name):
         if not self.ptr:
             raise ValueError(f"no filter {name}")
 
-    @property
-    def descriptor(self):
-        if self._descriptor is None:
-            self._descriptor = wrap_avclass(self.ptr.priv_class)
-        return self._descriptor
-
-    @property
-    def options(self):
-        if self.descriptor is None:
-            return
-        return self.descriptor.options
-
     @property
     def name(self):
         return self.ptr.name
@@ -78,4 +65,3 @@ def get_filter_names() -> set:
 
 
 filters_available = get_filter_names()
-filter_descriptor = wrap_avclass(lib.avfilter_get_class())

av/filter/filter.pyi

@@ -1,11 +1,6 @@
-from av.descriptor import Descriptor
-from av.option import Option
-
 class Filter:
     name: str
     description: str
-    descriptor: Descriptor
-    options: tuple[Option, ...] | None
     flags: int
 
     def __init__(self, name: str) -> None: ...

av/format.py

@@ -2,7 +2,6 @@
 
 import cython
 import cython.cimports.libav as lib
-from cython.cimports.av.descriptor import wrap_avclass
 
 _cinit_bypass_sentinel = cython.declare(object, object())
 
@@ -78,17 +77,6 @@ def __cinit__(self, name, mode=None):
     def __repr__(self):
         return f"<av.{self.__class__.__name__} {self.name!r}>"
 
-    @property
-    def descriptor(self):
-        if self.iptr:
-            return wrap_avclass(self.iptr.priv_class)
-        else:
-            return wrap_avclass(self.optr.priv_class)
-
-    @property
-    def options(self):
-        return self.descriptor.options
-
     @property
     def input(self):
         """An input-only view of this format."""
@@ -178,4 +166,3 @@ def get_input_format_names() -> set:
 
 formats_available = get_output_format_names()
 formats_available.update(get_input_format_names())
-format_descriptor = wrap_avclass(lib.avformat_get_class())