Skip to content

Commit a371f43

Browse files
committed
Use new Enum syntax
1 parent 796d8af commit a371f43

10 files changed

Lines changed: 267 additions & 264 deletions

File tree

av/codec/codec.pyi

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from enum import Flag, IntEnum
22
from fractions import Fraction
3-
from typing import ClassVar, Literal, overload
3+
from typing import ClassVar, Literal, cast, overload
44

55
from av.audio.codeccontext import AudioCodecContext
66
from av.audio.format import AudioFormat
@@ -12,37 +12,37 @@ from av.video.format import VideoFormat
1212
from .context import CodecContext
1313

1414
class Properties(Flag):
15-
NONE: ClassVar[Properties]
16-
INTRA_ONLY: ClassVar[Properties]
17-
LOSSY: ClassVar[Properties]
18-
LOSSLESS: ClassVar[Properties]
19-
REORDER: ClassVar[Properties]
20-
BITMAP_SUB: ClassVar[Properties]
21-
TEXT_SUB: ClassVar[Properties]
15+
NONE = cast(ClassVar[Properties], ...)
16+
INTRA_ONLY = cast(ClassVar[Properties], ...)
17+
LOSSY = cast(ClassVar[Properties], ...)
18+
LOSSLESS = cast(ClassVar[Properties], ...)
19+
REORDER = cast(ClassVar[Properties], ...)
20+
BITMAP_SUB = cast(ClassVar[Properties], ...)
21+
TEXT_SUB = cast(ClassVar[Properties], ...)
2222

2323
class Capabilities(IntEnum):
24-
none: int
25-
draw_horiz_band: int
26-
dr1: int
27-
hwaccel: int
28-
delay: int
29-
small_last_frame: int
30-
hwaccel_vdpau: int
31-
subframes: int
32-
experimental: int
33-
channel_conf: int
34-
neg_linesizes: int
35-
frame_threads: int
36-
slice_threads: int
37-
param_change: int
38-
auto_threads: int
39-
variable_frame_size: int
40-
avoid_probing: int
41-
hardware: int
42-
hybrid: int
43-
encoder_reordered_opaque: int
44-
encoder_flush: int
45-
encoder_recon_frame: int
24+
none = cast(int, ...)
25+
draw_horiz_band = cast(int, ...)
26+
dr1 = cast(int, ...)
27+
hwaccel = cast(int, ...)
28+
delay = cast(int, ...)
29+
small_last_frame = cast(int, ...)
30+
hwaccel_vdpau = cast(int, ...)
31+
subframes = cast(int, ...)
32+
experimental = cast(int, ...)
33+
channel_conf = cast(int, ...)
34+
neg_linesizes = cast(int, ...)
35+
frame_threads = cast(int, ...)
36+
slice_threads = cast(int, ...)
37+
param_change = cast(int, ...)
38+
auto_threads = cast(int, ...)
39+
variable_frame_size = cast(int, ...)
40+
avoid_probing = cast(int, ...)
41+
hardware = cast(int, ...)
42+
hybrid = cast(int, ...)
43+
encoder_reordered_opaque = cast(int, ...)
44+
encoder_flush = cast(int, ...)
45+
encoder_recon_frame = cast(int, ...)
4646

4747
class UnknownCodecError(ValueError): ...
4848

av/codec/context.pyi

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
from enum import Flag, IntEnum
22
from fractions import Fraction
3-
from typing import ClassVar, Literal
3+
from typing import ClassVar, Literal, cast
44

55
from av.packet import Packet
66

77
from .codec import Codec
88
from .hwaccel import HWAccel
99

1010
class ThreadType(Flag):
11-
NONE: ClassVar[ThreadType]
12-
FRAME: ClassVar[ThreadType]
13-
SLICE: ClassVar[ThreadType]
14-
AUTO: ClassVar[ThreadType]
11+
NONE = cast(ClassVar[ThreadType], ...)
12+
FRAME = cast(ClassVar[ThreadType], ...)
13+
SLICE = cast(ClassVar[ThreadType], ...)
14+
AUTO = cast(ClassVar[ThreadType], ...)
1515
def __get__(self, i: object | None, owner: type | None = None) -> ThreadType: ...
1616
def __set__(self, instance: object, value: int | str | ThreadType) -> None: ...
1717

1818
class Flags(IntEnum):
19-
unaligned: int
20-
qscale: int
21-
four_mv: int
22-
output_corrupt: int
23-
qpel: int
24-
drop_changed: int
25-
recon_frame: int
26-
copy_opaque: int
27-
frame_duration: int
28-
pass1: int
29-
pass2: int
30-
loop_filter: int
31-
gray: int
32-
psnr: int
33-
interlaced_dct: int
34-
low_delay: int
35-
global_header: int
36-
bitexact: int
37-
ac_pred: int
38-
interlaced_me: int
39-
closed_gop: int
19+
unaligned = cast(int, ...)
20+
qscale = cast(int, ...)
21+
four_mv = cast(int, ...)
22+
output_corrupt = cast(int, ...)
23+
qpel = cast(int, ...)
24+
drop_changed = cast(int, ...)
25+
recon_frame = cast(int, ...)
26+
copy_opaque = cast(int, ...)
27+
frame_duration = cast(int, ...)
28+
pass1 = cast(int, ...)
29+
pass2 = cast(int, ...)
30+
loop_filter = cast(int, ...)
31+
gray = cast(int, ...)
32+
psnr = cast(int, ...)
33+
interlaced_dct = cast(int, ...)
34+
low_delay = cast(int, ...)
35+
global_header = cast(int, ...)
36+
bitexact = cast(int, ...)
37+
ac_pred = cast(int, ...)
38+
interlaced_me = cast(int, ...)
39+
closed_gop = cast(int, ...)
4040

4141
class Flags2(IntEnum):
42-
fast: int
43-
no_output: int
44-
local_header: int
45-
chunks: int
46-
ignore_crop: int
47-
show_all: int
48-
export_mvs: int
49-
skip_manual: int
50-
ro_flush_noop: int
42+
fast = cast(int, ...)
43+
no_output = cast(int, ...)
44+
local_header = cast(int, ...)
45+
chunks = cast(int, ...)
46+
ignore_crop = cast(int, ...)
47+
show_all = cast(int, ...)
48+
export_mvs = cast(int, ...)
49+
skip_manual = cast(int, ...)
50+
ro_flush_noop = cast(int, ...)
5151

5252
class CodecContext:
5353
name: str

av/codec/hwaccel.pyi

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
from enum import IntEnum
2+
from typing import cast
23

34
from av.codec.codec import Codec
45
from av.video.format import VideoFormat
56

67
class HWDeviceType(IntEnum):
7-
none: int
8-
vdpau: int
9-
cuda: int
10-
vaapi: int
11-
dxva2: int
12-
qsv: int
13-
videotoolbox: int
14-
d3d11va: int
15-
drm: int
16-
opencl: int
17-
mediacodec: int
18-
vulkan: int
19-
d3d12va: int
8+
none = cast(int, ...)
9+
vdpau = cast(int, ...)
10+
cuda = cast(int, ...)
11+
vaapi = cast(int, ...)
12+
dxva2 = cast(int, ...)
13+
qsv = cast(int, ...)
14+
videotoolbox = cast(int, ...)
15+
d3d11va = cast(int, ...)
16+
drm = cast(int, ...)
17+
opencl = cast(int, ...)
18+
mediacodec = cast(int, ...)
19+
vulkan = cast(int, ...)
20+
d3d12va = cast(int, ...)
2021

2122
class HWConfigMethod(IntEnum):
22-
none: int
23-
hw_device_ctx: int
24-
hw_frame_ctx: int
25-
internal: int
26-
ad_hoc: int
23+
none = cast(int, ...)
24+
hw_device_ctx = cast(int, ...)
25+
hw_frame_ctx = cast(int, ...)
26+
internal = cast(int, ...)
27+
ad_hoc = cast(int, ...)
2728

2829
class HWConfig:
2930
@property

av/container/core.pyi

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ from enum import Flag, IntEnum
22
from fractions import Fraction
33
from pathlib import Path
44
from types import TracebackType
5-
from typing import Any, Callable, ClassVar, Literal, Type, overload
5+
from typing import Any, Callable, ClassVar, Literal, Type, cast, overload
66

77
from av.codec.hwaccel import HWAccel
88
from av.format import ContainerFormat
@@ -14,58 +14,58 @@ from .streams import StreamContainer
1414
Real = int | float | Fraction
1515

1616
class Flags(Flag):
17-
gen_pts: ClassVar[Flags]
18-
ign_idx: ClassVar[Flags]
19-
non_block: ClassVar[Flags]
20-
ign_dts: ClassVar[Flags]
21-
no_fillin: ClassVar[Flags]
22-
no_parse: ClassVar[Flags]
23-
no_buffer: ClassVar[Flags]
24-
custom_io: ClassVar[Flags]
25-
discard_corrupt: ClassVar[Flags]
26-
flush_packets: ClassVar[Flags]
27-
bitexact: ClassVar[Flags]
28-
sort_dts: ClassVar[Flags]
29-
fast_seek: ClassVar[Flags]
30-
shortest: ClassVar[Flags]
31-
auto_bsf: ClassVar[Flags]
17+
gen_pts = cast(ClassVar[Flags], ...)
18+
ign_idx = cast(ClassVar[Flags], ...)
19+
non_block = cast(ClassVar[Flags], ...)
20+
ign_dts = cast(ClassVar[Flags], ...)
21+
no_fillin = cast(ClassVar[Flags], ...)
22+
no_parse = cast(ClassVar[Flags], ...)
23+
no_buffer = cast(ClassVar[Flags], ...)
24+
custom_io = cast(ClassVar[Flags], ...)
25+
discard_corrupt = cast(ClassVar[Flags], ...)
26+
flush_packets = cast(ClassVar[Flags], ...)
27+
bitexact = cast(ClassVar[Flags], ...)
28+
sort_dts = cast(ClassVar[Flags], ...)
29+
fast_seek = cast(ClassVar[Flags], ...)
30+
shortest = cast(ClassVar[Flags], ...)
31+
auto_bsf = cast(ClassVar[Flags], ...)
3232

3333
class AudioCodec(IntEnum):
34-
none: int
35-
pcm_alaw: int
36-
pcm_bluray: int
37-
pcm_dvd: int
38-
pcm_f16le: int
39-
pcm_f24le: int
40-
pcm_f32be: int
41-
pcm_f32le: int
42-
pcm_f64be: int
43-
pcm_f64le: int
44-
pcm_lxf: int
45-
pcm_mulaw: int
46-
pcm_s16be: int
47-
pcm_s16be_planar: int
48-
pcm_s16le: int
49-
pcm_s16le_planar: int
50-
pcm_s24be: int
51-
pcm_s24daud: int
52-
pcm_s24le: int
53-
pcm_s24le_planar: int
54-
pcm_s32be: int
55-
pcm_s32le: int
56-
pcm_s32le_planar: int
57-
pcm_s64be: int
58-
pcm_s64le: int
59-
pcm_s8: int
60-
pcm_s8_planar: int
61-
pcm_u16be: int
62-
pcm_u16le: int
63-
pcm_u24be: int
64-
pcm_u24le: int
65-
pcm_u32be: int
66-
pcm_u32le: int
67-
pcm_u8: int
68-
pcm_vidc: int
34+
none = cast(int, ...)
35+
pcm_alaw = cast(int, ...)
36+
pcm_bluray = cast(int, ...)
37+
pcm_dvd = cast(int, ...)
38+
pcm_f16le = cast(int, ...)
39+
pcm_f24le = cast(int, ...)
40+
pcm_f32be = cast(int, ...)
41+
pcm_f32le = cast(int, ...)
42+
pcm_f64be = cast(int, ...)
43+
pcm_f64le = cast(int, ...)
44+
pcm_lxf = cast(int, ...)
45+
pcm_mulaw = cast(int, ...)
46+
pcm_s16be = cast(int, ...)
47+
pcm_s16be_planar = cast(int, ...)
48+
pcm_s16le = cast(int, ...)
49+
pcm_s16le_planar = cast(int, ...)
50+
pcm_s24be = cast(int, ...)
51+
pcm_s24daud = cast(int, ...)
52+
pcm_s24le = cast(int, ...)
53+
pcm_s24le_planar = cast(int, ...)
54+
pcm_s32be = cast(int, ...)
55+
pcm_s32le = cast(int, ...)
56+
pcm_s32le_planar = cast(int, ...)
57+
pcm_s64be = cast(int, ...)
58+
pcm_s64le = cast(int, ...)
59+
pcm_s8 = cast(int, ...)
60+
pcm_s8_planar = cast(int, ...)
61+
pcm_u16be = cast(int, ...)
62+
pcm_u16le = cast(int, ...)
63+
pcm_u24be = cast(int, ...)
64+
pcm_u24le = cast(int, ...)
65+
pcm_u32be = cast(int, ...)
66+
pcm_u32le = cast(int, ...)
67+
pcm_u8 = cast(int, ...)
68+
pcm_vidc = cast(int, ...)
6969

7070
class Container:
7171
writeable: bool

av/format.pyi

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
__all__ = ("Flags", "ContainerFormat", "formats_available")
22

33
from enum import Flag
4-
from typing import ClassVar, Literal
4+
from typing import ClassVar, Literal, cast
55

66
class Flags(Flag):
7-
no_file: ClassVar[Flags]
8-
need_number: ClassVar[Flags]
9-
show_ids: ClassVar[Flags]
10-
global_header: ClassVar[Flags]
11-
no_timestamps: ClassVar[Flags]
12-
generic_index: ClassVar[Flags]
13-
ts_discont: ClassVar[Flags]
14-
variable_fps: ClassVar[Flags]
15-
no_dimensions: ClassVar[Flags]
16-
no_streams: ClassVar[Flags]
17-
no_bin_search: ClassVar[Flags]
18-
no_gen_search: ClassVar[Flags]
19-
no_byte_seek: ClassVar[Flags]
20-
allow_flush: ClassVar[Flags]
21-
ts_nonstrict: ClassVar[Flags]
22-
ts_negative: ClassVar[Flags]
23-
seek_to_pts: ClassVar[Flags]
7+
no_file = cast(ClassVar[Flags], ...)
8+
need_number = cast(ClassVar[Flags], ...)
9+
show_ids = cast(ClassVar[Flags], ...)
10+
global_header = cast(ClassVar[Flags], ...)
11+
no_timestamps = cast(ClassVar[Flags], ...)
12+
generic_index = cast(ClassVar[Flags], ...)
13+
ts_discont = cast(ClassVar[Flags], ...)
14+
variable_fps = cast(ClassVar[Flags], ...)
15+
no_dimensions = cast(ClassVar[Flags], ...)
16+
no_streams = cast(ClassVar[Flags], ...)
17+
no_bin_search = cast(ClassVar[Flags], ...)
18+
no_gen_search = cast(ClassVar[Flags], ...)
19+
no_byte_seek = cast(ClassVar[Flags], ...)
20+
allow_flush = cast(ClassVar[Flags], ...)
21+
ts_nonstrict = cast(ClassVar[Flags], ...)
22+
ts_negative = cast(ClassVar[Flags], ...)
23+
seek_to_pts = cast(ClassVar[Flags], ...)
2424

2525
class ContainerFormat:
2626
def __init__(self, name: str, mode: Literal["r", "w"] | None = None) -> None: ...

0 commit comments

Comments
 (0)