Skip to content

Commit f933cef

Browse files
committed
str cast, docs update, [], remove 'in' from test
1 parent 7548687 commit f933cef

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

src/torchcodec/encoders/_video_encoder.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def to_file(
7474
crf=crf,
7575
preset=preset,
7676
extra_options=[
77-
x for k, v in (extra_options or {}).items() for x in (k, str(v))
77+
str(x) for k, v in (extra_options or {}).items() for x in (k, v)
7878
],
7979
)
8080

@@ -106,7 +106,7 @@ def to_tensor(
106106
a string: "fast", "medium", "slow"). Defaults to None
107107
(which will use encoder's default).
108108
extra_options (dict[str, Any], optional): A dictionary of additional
109-
encoder options to pass, e.g. ``{"preset": "slow", "tune": "film"}``.
109+
encoder options to pass, e.g. ``{"qp": 5, "tune": "film"}``.
110110
Values will be converted to strings before passing to the encoder.
111111
112112
Returns:
@@ -122,7 +122,7 @@ def to_tensor(
122122
crf=crf,
123123
preset=preset_value,
124124
extra_options=[
125-
x for k, v in (extra_options or {}).items() for x in (k, str(v))
125+
str(x) for k, v in (extra_options or {}).items() for x in (k, v)
126126
],
127127
)
128128

@@ -160,7 +160,7 @@ def to_file_like(
160160
a string: "fast", "medium", "slow"). Defaults to None
161161
(which will use encoder's default).
162162
extra_options (dict[str, Any], optional): A dictionary of additional
163-
encoder options to pass, e.g. ``{"preset": "slow", "tune": "film"}``.
163+
encoder options to pass, e.g. ``{"qp": 5, "tune": "film"}``.
164164
Values will be converted to strings before passing to the encoder.
165165
"""
166166
preset = str(preset) if isinstance(preset, int) else preset
@@ -174,6 +174,6 @@ def to_file_like(
174174
crf=crf,
175175
preset=preset,
176176
extra_options=[
177-
x for k, v in (extra_options or {}).items() for x in (k, str(v))
177+
str(x) for k, v in (extra_options or {}).items() for x in (k, v)
178178
],
179179
)

test/test_encoders.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,9 +1092,9 @@ def test_codec_parameter_utilized(self, tmp_path, format, codec_spec):
10921092
dest = str(tmp_path / f"output.{format}")
10931093

10941094
VideoEncoder(frames=frames, frame_rate=30).to_file(dest=dest, codec=codec_spec)
1095-
actual_codec_spec = self._get_video_metadata(dest, fields=["codec_name"]).get(
1095+
actual_codec_spec = self._get_video_metadata(dest, fields=["codec_name"])[
10961096
"codec_name"
1097-
)
1097+
]
10981098
assert actual_codec_spec == codec_spec
10991099

11001100
@pytest.mark.skipif(
@@ -1131,15 +1131,11 @@ def test_codec_spec_vs_impl_equivalence(self, tmp_path, codec_spec, codec_impl):
11311131
)
11321132

11331133
assert (
1134-
self._get_video_metadata(spec_output, fields=["codec_name"]).get(
1135-
"codec_name"
1136-
)
1134+
self._get_video_metadata(spec_output, fields=["codec_name"])["codec_name"]
11371135
== codec_spec
11381136
)
11391137
assert (
1140-
self._get_video_metadata(impl_output, fields=["codec_name"]).get(
1141-
"codec_name"
1142-
)
1138+
self._get_video_metadata(impl_output, fields=["codec_name"])["codec_name"]
11431139
== codec_spec
11441140
)
11451141

@@ -1175,6 +1171,7 @@ def test_extra_options_utilized(self, tmp_path, profile, colorspace, color_range
11751171
fields=["profile", "color_space", "color_range"],
11761172
)
11771173
# Validate profile (case-insensitive, baseline is reported as "Constrained Baseline")
1178-
assert profile in metadata.get("profile", "").lower()
1179-
assert metadata.get("color_space") == colorspace
1180-
assert metadata.get("color_range") == color_range
1174+
expected_profile = "constrained baseline" if profile == "baseline" else profile
1175+
assert metadata["profile"].lower() == expected_profile
1176+
assert metadata["color_space"] == colorspace
1177+
assert metadata["color_range"] == color_range

0 commit comments

Comments
 (0)