COM-12787 (#227)

* COM-12787 MPEG4-AAC-ADTS generator has been added. * add missing test suites to pyproject.toml: AV1_ARGON_VECTORS MPEG4_AAC-MP4 * COM-12787 Json file updated into 'test_suites/aac/' folder. --------- Co-authored-by: rsanchez <[email protected]>
fluendo · Jan 7, 2025 · bb4df4f · bb4df4f
1 parent f18d6fb
commit bb4df4f
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 41 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -46,10 +46,12 @@ packages = ["fluster", "fluster.decoders"]
     "test_suites/aac/MPEG2_AAC-ADTS.json",
     "test_suites/aac/MPEG2_AAC-ADIF.json",
     "test_suites/aac/MPEG4_AAC-ADIF.json",
-    "test_suites/aac/MPEG4_AAC-ADTS.json"
+    "test_suites/aac/MPEG4_AAC-ADTS.json",
+    "test_suites/aac/MPEG4_AAC-MP4.json"
 ]
 "share/fluster/test_suites/av1" = [
     "test_suites/av1/AV1-TEST-VECTORS.json",
+    "test_suites/av1/AV1_ARGON_VECTORS.json",
     "test_suites/av1/CHROMIUM-10bit-AV1-TEST-VECTORS.json",
     "test_suites/av1/CHROMIUM-8bit-AV1-TEST-VECTORS.json"
 ]

diff --git a/scripts/gen_aac.py b/scripts/gen_aac.py
@@ -41,6 +41,7 @@
 URL_MPEG4 = BASE_URL + "ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/"
 URL_MPEG4_ADIF = URL_MPEG4 + "DVD1/mpeg4audio-conformance/compressedAdif/add-opt/"
 URL_MPEG4_MP4 = URL_MPEG4 + "DVD1/mpeg4audio-conformance/compressedMp4/"
+URL_MPEG4_ADTS = URL_MPEG4 + "DVD1/mpeg4audio-conformance/compressedAdts/add-opt/"
 
 BITSTREAM_EXTS = [".adts", ".adif", ".mp4"]
 
@@ -268,3 +269,13 @@ def generate(self, download: bool, jobs: int) -> None:
         True,
     )
     generator.generate(not args.skip_download, args.jobs)
+
+    generator = AACGenerator(
+        "MPEG4_AAC-ADTS",
+        "MPEG4_AAC-ADTS",
+        Codec.AAC,
+        "ISO IEC 14496-26 MPEG4 AAC ADTS test suite",
+        URL_MPEG4_ADTS,
+        True,
+    )
+    generator.generate(not args.skip_download, args.jobs)
diff --git a/test_suites/aac/MPEG4_AAC-ADTS.json b/test_suites/aac/MPEG4_AAC-ADTS.json
@@ -4,76 +4,76 @@
     "description": "ISO IEC 14496-26 MPEG4 AAC ADTS test suite",
     "test_vectors": [
         {
-            "name": "al18_08",
-            "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/al18_08.adts",
-            "source_checksum": "354eeece733c86fc4f22b63c2a6e0dbc",
-            "input_file": "al18_08.adts",
-            "output_format": "None",
-            "result": "b2927751ae7a97613a9d9d0d2748eca7"
+            "name": "al18_32",
+            "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/al18_32.adts",
+            "source_checksum": "fbfbcc287abaa61bb1d4e6209dc7b351",
+            "input_file": "al18_32.adts",
+            "output_format": "fltp",
+            "result": ""
         },
         {
             "name": "al18_22",
             "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/al18_22.adts",
             "source_checksum": "9bd1df720da86de0f12a5e13cd9bac3f",
             "input_file": "al18_22.adts",
-            "output_format": "None",
-            "result": "9c650228dea2c563560dcf3fbc31bff1"
+            "output_format": "fltp",
+            "result": ""
         },
         {
-            "name": "al18_32",
-            "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/al18_32.adts",
-            "source_checksum": "fbfbcc287abaa61bb1d4e6209dc7b351",
-            "input_file": "al18_32.adts",
-            "output_format": "None",
-            "result": "26c2430033002a138568d17ca3317ade"
+            "name": "ap04_48",
+            "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/ap04_48.adts",
+            "source_checksum": "07092bd549a107aab9546b4a7e0ececa",
+            "input_file": "ap04_48.adts",
+            "output_format": "fltp",
+            "result": ""
         },
         {
             "name": "al18_64",
             "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/al18_64.adts",
             "source_checksum": "908ef86a5c5b546f2707e7abf6a4fcbf",
             "input_file": "al18_64.adts",
-            "output_format": "None",
-            "result": "756d27e1b1bead05839758072cea9690"
+            "output_format": "fltp",
+            "result": ""
         },
         {
-            "name": "al18_96",
-            "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/al18_96.adts",
-            "source_checksum": "3a2cc79299fb52481170cced3441b5de",
-            "input_file": "al18_96.adts",
-            "output_format": "None",
-            "result": "02b0f333d4caa37379a8ab513dbc4dbf"
+            "name": "ap02_48",
+            "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/ap02_48.adts",
+            "source_checksum": "f918c11808e687e6dc5a64154d0685b3",
+            "input_file": "ap02_48.adts",
+            "output_format": "fltp",
+            "result": ""
+        },
+        {
+            "name": "al18_08",
+            "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/al18_08.adts",
+            "source_checksum": "354eeece733c86fc4f22b63c2a6e0dbc",
+            "input_file": "al18_08.adts",
+            "output_format": "fltp",
+            "result": ""
         },
         {
             "name": "ap01_48",
             "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/ap01_48.adts",
             "source_checksum": "fb59fdf49e4c6ca1b7a766ce2112e36f",
             "input_file": "ap01_48.adts",
-            "output_format": "None",
-            "result": "cb8a260c08236e342d2122496ae126d9"
-        },
-        {
-            "name": "ap02_48",
-            "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/ap02_48.adts",
-            "source_checksum": "f918c11808e687e6dc5a64154d0685b3",
-            "input_file": "ap02_48.adts",
-            "output_format": "None",
-            "result": "57f4964f065c75fa825bf7c795ae621f"
+            "output_format": "fltp",
+            "result": ""
         },
         {
-            "name": "ap04_48",
-            "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/ap04_48.adts",
-            "source_checksum": "07092bd549a107aab9546b4a7e0ececa",
-            "input_file": "ap04_48.adts",
-            "output_format": "None",
-            "result": "6e1767241de43646691c21587ccbab9f"
+            "name": "al18_96",
+            "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/al18_96.adts",
+            "source_checksum": "3a2cc79299fb52481170cced3441b5de",
+            "input_file": "al18_96.adts",
+            "output_format": "fltp",
+            "result": ""
         },
         {
             "name": "ap05_48",
             "source": "https://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_14496-26_2010_Bitstreams/DVD1/mpeg4audio-conformance/compressedAdts/add-opt/ap05_48.adts",
             "source_checksum": "9470863a3df3daf3d4a47a8226933501",
             "input_file": "ap05_48.adts",
-            "output_format": "None",
-            "result": "e5f3db7043119313eb29f6f670989ecd"
+            "output_format": "fltp",
+            "result": ""
         }
     ]
 }