Skip to content

Commit d5eb4fb

Browse files
mcesariniflumdimopoulos
authored andcommitted
fix: Add missing output format in AV1 Argon Profile 0 test suite vectors
1 parent 2b3bf8f commit d5eb4fb

5 files changed

Lines changed: 36 additions & 19 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ AAC
471471
- [AAC](https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/).
472472
- [AV1](https://storage.googleapis.com/aom-test-data/).
473473
- [AV1](https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform/tast-tests/src/chromiumos/tast/local/bundles/cros/video/data/test_vectors/av1/).
474-
- [AV1](https://storage.googleapis.com/downloads.aomedia.org/assets/zip/).
474+
- [AV1](https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/).
475475
- [H.264/AVC](https://www.itu.int/wftp3/av-arch/jvt-site/draft_conformance/).
476476
- [H.265/HEVC](https://www.itu.int/wftp3/av-arch/jctvc-site/bitstream_exchange/draft_conformance/).
477477
- [H.266/VVC](https://www.itu.int/wftp3/av-arch/jvet-site/bitstream_exchange/VVC/draft_conformance/).

‎scripts/gen_av1_argon.py‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,24 @@ def generate(self, download: bool) -> None:
154154
output_format = OutputFormat[pix_fmt.upper()]
155155
if output_format == OutputFormat.UNKNOWN:
156156
raise KeyError
157-
except (subprocess.CalledProcessError, KeyError) as error:
157+
except (subprocess.CalledProcessError, KeyError):
158+
exceptions_profile0_output_format = {
159+
# Exceptions for profile 0 core (annex b) vectors
160+
"test54": OutputFormat.YUV420P10LE,
161+
"test11142": OutputFormat.YUV420P10LE,
162+
"test11079_11110": OutputFormat.YUV444P12LE,
163+
"test11145": OutputFormat.GRAY10LE,
164+
"test11023": OutputFormat.YUV420P10LE,
165+
"test11174": OutputFormat.YUV420P10LE,
166+
# Exceptions for profile 0 non-annex b vectors
167+
"test12293_12304": OutputFormat.GRAY10LE,
168+
# Exceptions for profile 0 stress annex b vectors
169+
"test50688": OutputFormat.YUV420P10LE,
170+
"test23792": OutputFormat.YUV420P10LE,
171+
"test79399": OutputFormat.YUV420P10LE,
172+
"test29600": OutputFormat.YUV420P10LE,
173+
}
174+
158175
exceptions_profile1_output_format = {
159176
# Exceptions for profile 1 core (annex b) vectors
160177
"test54": OutputFormat.GBRP10LE,
@@ -194,12 +211,12 @@ def generate(self, download: bool) -> None:
194211
"test85818": OutputFormat.YUV422P10LE,
195212
}
196213

197-
if tv_filename in exceptions_profile1_output_format.keys():
214+
if tv_filename in exceptions_profile0_output_format.keys():
215+
output_format = exceptions_profile0_output_format[tv_filename]
216+
elif tv_filename in exceptions_profile1_output_format.keys():
198217
output_format = exceptions_profile1_output_format[tv_filename]
199218
elif tv_filename in exceptions_profile2_output_format.keys():
200219
output_format = exceptions_profile2_output_format[tv_filename]
201-
else:
202-
raise error
203220

204221
temp_output_ref = f"{os.path.splitext(tv_abs_path)[0]}.out"
205222
try:

‎test_suites/av1/AV1-ARGON-PROFILE0-CORE-ANNEX-B.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
7373
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
7474
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_core_special/streams/test54.obu",
75-
"output_format": "None",
75+
"output_format": "yuv420p10le",
7676
"result": "139317f4dc2134bcef8d36a8fb117cf4"
7777
},
7878
{
@@ -824,7 +824,7 @@
824824
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
825825
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
826826
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_core/streams/test11142.obu",
827-
"output_format": "None",
827+
"output_format": "yuv420p10le",
828828
"result": "513f5dd6a0a96db2ca82be66d5bf13dd"
829829
},
830830
{
@@ -1592,7 +1592,7 @@
15921592
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
15931593
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
15941594
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_core/streams/test11079_11110.obu",
1595-
"output_format": "None",
1595+
"output_format": "yuv444p12le",
15961596
"result": "2c292c849264f017d40caf9970df7040"
15971597
},
15981598
{
@@ -1848,7 +1848,7 @@
18481848
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
18491849
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
18501850
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_core/streams/test11145.obu",
1851-
"output_format": "None",
1851+
"output_format": "gray10le",
18521852
"result": "c5401b78b8e5e473cad61ea61b3c9241"
18531853
},
18541854
{
@@ -2312,7 +2312,7 @@
23122312
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
23132313
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
23142314
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_core/streams/test11023.obu",
2315-
"output_format": "None",
2315+
"output_format": "yuv420p10le",
23162316
"result": "6661cb3843a0e4ebae39c024973e314f"
23172317
},
23182318
{
@@ -4128,7 +4128,7 @@
41284128
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
41294129
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
41304130
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_core/streams/test11174.obu",
4131-
"output_format": "None",
4131+
"output_format": "yuv420p10le",
41324132
"result": "6aa590195fd910008eeb70c6f0583fef"
41334133
},
41344134
{

‎test_suites/av1/AV1-ARGON-PROFILE0-NON-ANNEX-B.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
281281
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
282282
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_error/streams/test50.obu",
283-
"output_format": "Unknown",
283+
"output_format": "gbrp10le",
284284
"result": ""
285285
},
286286
{
@@ -440,7 +440,7 @@
440440
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
441441
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
442442
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_error/streams/test12.obu",
443-
"output_format": "None",
443+
"output_format": "Unknown",
444444
"result": ""
445445
},
446446
{
@@ -472,7 +472,7 @@
472472
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
473473
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
474474
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_not_annexb/streams/test12293_12304.obu",
475-
"output_format": "None",
475+
"output_format": "gray10le",
476476
"result": "266b24ac245fc94cf2ff96e07cc22f7d"
477477
},
478478
{
@@ -656,7 +656,7 @@
656656
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
657657
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
658658
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_error/streams/test242.obu",
659-
"output_format": "None",
659+
"output_format": "Unknown",
660660
"result": ""
661661
},
662662
{

‎test_suites/av1/AV1-ARGON-PROFILE0-STRESS-ANNEX-B.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
4949
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
5050
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_stress/streams/test50688.obu",
51-
"output_format": "Unknown",
51+
"output_format": "yuv420p10le",
5252
"result": "600e32ac4e4d93d25a81a92a0e0627ca"
5353
},
5454
{
@@ -168,7 +168,7 @@
168168
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
169169
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
170170
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_stress/streams/test23792.obu",
171-
"output_format": "Unknown",
171+
"output_format": "yuv420p10le",
172172
"result": "04499b24157642121d89398adca47144"
173173
},
174174
{
@@ -200,7 +200,7 @@
200200
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
201201
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
202202
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_stress/streams/test79399.obu",
203-
"output_format": "Unknown",
203+
"output_format": "yuv420p10le",
204204
"result": "a7c0ef2cfe9a2b2bdacc22861a6e29e9"
205205
},
206206
{
@@ -344,7 +344,7 @@
344344
"source": "https://aom-cwg-av1-argon-streams-public.s3.us-east-1.amazonaws.com/argon_coveragetool_av1_base_and_extended_profiles_v2.1.1.zip",
345345
"source_checksum": "5dd3554c3f73c80f06c7fceeaa1f5dd9",
346346
"input_file": "argon_coveragetool_av1_base_and_extended_profiles_v2.1/profile0_stress/streams/test29600.obu",
347-
"output_format": "Unknown",
347+
"output_format": "yuv420p10le",
348348
"result": "82591ecfd78b22df254031b6a76fc56f"
349349
},
350350
{

0 commit comments

Comments
 (0)