Skip to content

Commit aa98ff1

Browse files
committed
Remove undertested option/descriptor API
1 parent 0f5a939 commit aa98ff1

15 files changed

Lines changed: 1 addition & 440 deletions

av/codec/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
Capabilities,
33
Codec,
44
Properties,
5-
codec_descriptor,
65
codecs_available,
76
find_best_pix_fmt_of_list,
87
)
@@ -12,7 +11,6 @@
1211
"Capabilities",
1312
"Codec",
1413
"Properties",
15-
"codec_descriptor",
1614
"codecs_available",
1715
"find_best_pix_fmt_of_list",
1816
"CodecContext",

av/codec/codec.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from cython.cimports import libav as lib
55
from cython.cimports.av.audio.format import get_audio_format
66
from cython.cimports.av.codec.hwaccel import wrap_hwconfig
7-
from cython.cimports.av.descriptor import wrap_avclass
87
from cython.cimports.av.utils import avrational_to_fraction
98
from cython.cimports.av.video.format import VideoFormat, get_pix_fmt, get_video_format
109
from cython.cimports.libc.stdlib import free, malloc
@@ -146,10 +145,6 @@ def mode(self):
146145
def is_decoder(self):
147146
return not self.is_encoder
148147

149-
@property
150-
def descriptor(self):
151-
return wrap_avclass(self.ptr.priv_class)
152-
153148
@property
154149
def name(self):
155150
return self.ptr.name or ""
@@ -355,7 +350,6 @@ def get_codec_names():
355350

356351

357352
codecs_available = get_codec_names()
358-
codec_descriptor = wrap_avclass(lib.avcodec_get_class())
359353

360354

361355
def dump_codecs():

av/codec/codec.pyi

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ from typing import ClassVar, Literal, Sequence, cast, overload
44

55
from av.audio.codeccontext import AudioCodecContext
66
from av.audio.format import AudioFormat
7-
from av.descriptor import Descriptor
87
from av.subtitles.codeccontext import SubtitleCodecContext
98
from av.video.codeccontext import VideoCodecContext
109
from av.video.format import VideoFormat
@@ -53,7 +52,6 @@ class Codec:
5352
def is_decoder(self) -> bool: ...
5453
@property
5554
def mode(self) -> Literal["r", "w"]: ...
56-
descriptor: Descriptor
5755
@property
5856
def name(self) -> str: ...
5957
@property
@@ -107,10 +105,6 @@ class Codec:
107105
VideoCodecContext | AudioCodecContext | SubtitleCodecContext | CodecContext
108106
): ...
109107

110-
class codec_descriptor:
111-
name: str
112-
options: tuple[int, ...]
113-
114108
codecs_available: set[str]
115109

116110
def dump_codecs() -> None: ...

av/descriptor.pxd

Lines changed: 0 additions & 20 deletions
This file was deleted.

av/descriptor.py

Lines changed: 0 additions & 76 deletions
This file was deleted.

av/descriptor.pyi

Lines changed: 0 additions & 5 deletions
This file was deleted.

av/filter/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
from .filter import Filter, filter_descriptor, filters_available
1+
from .filter import Filter, filters_available
22
from .graph import Graph as Graph
33
from .loudnorm import stats as stats

av/filter/filter.pxd

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
cimport libav as lib
22

3-
from av.descriptor cimport Descriptor
4-
53

64
cdef class Filter:
75
cdef const lib.AVFilter *ptr
86
cdef object _inputs
97
cdef object _outputs
10-
cdef Descriptor _descriptor
118

129

1310
cdef Filter wrap_filter(const lib.AVFilter *ptr)

av/filter/filter.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import cython
22
from cython.cimports import libav as lib
3-
from cython.cimports.av.descriptor import wrap_avclass
43
from cython.cimports.av.filter.link import alloc_filter_pads
54

65
_cinit_sentinel = cython.declare(object, object())
@@ -26,18 +25,6 @@ def __cinit__(self, name):
2625
if not self.ptr:
2726
raise ValueError(f"no filter {name}")
2827

29-
@property
30-
def descriptor(self):
31-
if self._descriptor is None:
32-
self._descriptor = wrap_avclass(self.ptr.priv_class)
33-
return self._descriptor
34-
35-
@property
36-
def options(self):
37-
if self.descriptor is None:
38-
return
39-
return self.descriptor.options
40-
4128
@property
4229
def name(self):
4330
return self.ptr.name
@@ -78,4 +65,3 @@ def get_filter_names() -> set:
7865

7966

8067
filters_available = get_filter_names()
81-
filter_descriptor = wrap_avclass(lib.avfilter_get_class())

av/filter/filter.pyi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
from av.descriptor import Descriptor
2-
from av.option import Option
3-
41
class Filter:
52
name: str
63
description: str
7-
descriptor: Descriptor
8-
options: tuple[Option, ...] | None
94
flags: int
105

116
def __init__(self, name: str) -> None: ...

0 commit comments

Comments
 (0)