diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81e3d0a3d601d6dbf451343a34f97d208cd5e424..e924aa9134b03fdd0e4784032bff24ff4974228b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information - IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF main + IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF new-format-switching-tests # If you need to set some config variable only in a local branch, then add an overwrite here # One example is DISABLE_HRTF - this will be set on a branch which is about to be merged and will be removed in a subsequent second MR # this is more easily done directly here in the child repo diff --git a/scripts/testv/fmt_sw_bitstreams/5_1_2_48000.192 b/scripts/testv/fmt_sw_bitstreams/5_1_2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..c900e10c4427a1e96c76eff47e7a7889493acc84 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/5_1_2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/5_1_48000.192 b/scripts/testv/fmt_sw_bitstreams/5_1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..f532749302994ee528996aa1f9ae46813eb87d2d Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/5_1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/5_1_4_48000.192 b/scripts/testv/fmt_sw_bitstreams/5_1_4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..458ada859ff46745af2b051a91293b02a549193f Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/5_1_4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/7_1_48000.192 b/scripts/testv/fmt_sw_bitstreams/7_1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..d93ebd850c3791c56c4b052c5cf46bcb64280707 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/7_1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/7_1_4_48000.192 b/scripts/testv/fmt_sw_bitstreams/7_1_4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..2f01eb418b288b8ab167a4031a21b376ef956a73 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/7_1_4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/FOA_48000.192 b/scripts/testv/fmt_sw_bitstreams/FOA_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..04133dfc090fcd73704af5fed171b08e72bca34d Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/FOA_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/FOA_ISM1_48000.192 b/scripts/testv/fmt_sw_bitstreams/FOA_ISM1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..a47eae3a650226cdb76b7f2c2ea3e1bab793352b Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/FOA_ISM1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/FOA_ISM2_48000.192 b/scripts/testv/fmt_sw_bitstreams/FOA_ISM2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..28267cebca73335148730d3b313b1c2ae96091f4 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/FOA_ISM2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/FOA_ISM3_48000.192 b/scripts/testv/fmt_sw_bitstreams/FOA_ISM3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..4b546c2ae18fa6fdcde6202782b4378008077da8 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/FOA_ISM3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/FOA_ISM4_48000.192 b/scripts/testv/fmt_sw_bitstreams/FOA_ISM4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..d5060be7ce3c86b027a1929e7891a344648f2997 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/FOA_ISM4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/HOA2_48000.192 b/scripts/testv/fmt_sw_bitstreams/HOA2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..12493be3b230caf24b3b05ff1970a0702c1b9dc6 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/HOA2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/HOA2_ISM1_48000.192 b/scripts/testv/fmt_sw_bitstreams/HOA2_ISM1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..af6d9362129993b9cca5074c56e47cf60e3e2f7b Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/HOA2_ISM1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/HOA2_ISM2_48000.192 b/scripts/testv/fmt_sw_bitstreams/HOA2_ISM2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..bdce34419b166d7da64d7117b09644cb9893a4ba Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/HOA2_ISM2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/HOA2_ISM3_48000.192 b/scripts/testv/fmt_sw_bitstreams/HOA2_ISM3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..94f0041a3e1025eec8cff84117850b62fe31e6d0 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/HOA2_ISM3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/HOA2_ISM4_48000.192 b/scripts/testv/fmt_sw_bitstreams/HOA2_ISM4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..a08914e92e84a72ecfd77ec7b4f4150fb906ec62 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/HOA2_ISM4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/HOA3_48000.192 b/scripts/testv/fmt_sw_bitstreams/HOA3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..66cdcbb930c95ba18fce5bbe4b2d91ec687c954e Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/HOA3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/HOA3_ISM1_48000.192 b/scripts/testv/fmt_sw_bitstreams/HOA3_ISM1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..1120e6be2295e875e99bc61f25e80ab7641523f2 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/HOA3_ISM1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/HOA3_ISM2_48000.192 b/scripts/testv/fmt_sw_bitstreams/HOA3_ISM2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..1b29b53f59be1b85cd145891533127934e407ff1 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/HOA3_ISM2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/HOA3_ISM3_48000.192 b/scripts/testv/fmt_sw_bitstreams/HOA3_ISM3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..90869b60f4e55635aae092776cde972817919f7d Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/HOA3_ISM3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/HOA3_ISM4_48000.192 b/scripts/testv/fmt_sw_bitstreams/HOA3_ISM4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..a166a392e0fb7e26cc8fa6d79658a7b41b062db4 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/HOA3_ISM4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/ISM1_48000.192 b/scripts/testv/fmt_sw_bitstreams/ISM1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..e91bf878ff13ee3cb0e3c5864c748dae8c017710 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/ISM1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/ISM2_48000.192 b/scripts/testv/fmt_sw_bitstreams/ISM2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..347df7caada921696a632f94248875df7b4acf5a Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/ISM2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/ISM3_48000.192 b/scripts/testv/fmt_sw_bitstreams/ISM3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..f3d1e52175f1586daec03b1e9a42a30b0c20a377 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/ISM3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/ISM4_48000.192 b/scripts/testv/fmt_sw_bitstreams/ISM4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..844daa11da3f185a87c5f68538636b4973076ad8 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/ISM4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/MASA1TC_48000.192 b/scripts/testv/fmt_sw_bitstreams/MASA1TC_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..0f4e6014d28502b1e66d3555097bf1544673a514 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/MASA1TC_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/MASA1TC_ISM1_48000.192 b/scripts/testv/fmt_sw_bitstreams/MASA1TC_ISM1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..b7e603803e4babd346a2ad30691ddc355b6c16b1 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/MASA1TC_ISM1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/MASA1TC_ISM2_48000.192 b/scripts/testv/fmt_sw_bitstreams/MASA1TC_ISM2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..8b9a025a455a8484136f5456a281ee70d83f8587 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/MASA1TC_ISM2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/MASA1TC_ISM3_48000.192 b/scripts/testv/fmt_sw_bitstreams/MASA1TC_ISM3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..d210d41ce00d06fc40868585061a80abc7101c56 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/MASA1TC_ISM3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/MASA1TC_ISM4_48000.192 b/scripts/testv/fmt_sw_bitstreams/MASA1TC_ISM4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..de1d2dc4cabbc191c12e1f26a1652440e821346c Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/MASA1TC_ISM4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/MASA2TC_48000.192 b/scripts/testv/fmt_sw_bitstreams/MASA2TC_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..7e0f3a89fa17dec659a299dce4d5e92e715e6f9e Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/MASA2TC_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/MASA2TC_ISM1_48000.192 b/scripts/testv/fmt_sw_bitstreams/MASA2TC_ISM1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..afb103c88badb6f181cab87345a8c5fd5df0cb0f Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/MASA2TC_ISM1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/MASA2TC_ISM2_48000.192 b/scripts/testv/fmt_sw_bitstreams/MASA2TC_ISM2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..ac60aa3449ce84420f873c2897260cf4668f8461 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/MASA2TC_ISM2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/MASA2TC_ISM3_48000.192 b/scripts/testv/fmt_sw_bitstreams/MASA2TC_ISM3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..7c86402d430c0f9c1f94b269e23abc688474b6cc Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/MASA2TC_ISM3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/MASA2TC_ISM4_48000.192 b/scripts/testv/fmt_sw_bitstreams/MASA2TC_ISM4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..f53351bee2db3f226be91fa56b40de8db981d7fb Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/MASA2TC_ISM4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/MONO_48000.192 b/scripts/testv/fmt_sw_bitstreams/MONO_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..97d77cfc4321122e70e246e56ecb6b31641532d7 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/MONO_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams/STEREO_48000.192 b/scripts/testv/fmt_sw_bitstreams/STEREO_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..e5d1b02f2f79bdfe418858ac73184b65fb8a654f Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams/STEREO_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/5_1_2_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/5_1_2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..604b53e5116cf6ea09cacd4af32782975df72e2f Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/5_1_2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/5_1_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/5_1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..c652245c949419734a5b58a0db409145ed319622 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/5_1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/5_1_4_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/5_1_4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..7ddd6447237ad11e3637fa75a7e9b18d2995b59d Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/5_1_4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/7_1_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/7_1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..1057d8fb22a91192e468daa7ef7e3338d2b12eeb Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/7_1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/7_1_4_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/7_1_4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..3d956e3b9ea87727e225e69fb076ee9ef345078b Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/7_1_4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/FOA_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/FOA_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..d9bfab2276989133aa48b78588594442e5f44133 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/FOA_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/FOA_ISM1_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/FOA_ISM1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..c4ad74e5b0338e8c4546793b59ff9ed87d32112a Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/FOA_ISM1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/FOA_ISM2_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/FOA_ISM2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..4ddd2efc308034208ceeb3d3dda32f3d8a8fa20a Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/FOA_ISM2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/FOA_ISM3_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/FOA_ISM3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..d120146fca766b408fed8f411ea847d13d0a1993 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/FOA_ISM3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/FOA_ISM4_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/FOA_ISM4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..7991cb9b91440f7121332026644f87c44afd8a53 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/FOA_ISM4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/HOA2_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/HOA2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..965a9ccccf20da6919c422dcc4d58cdcc3b76529 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/HOA2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/HOA2_ISM1_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/HOA2_ISM1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..2b9540c8eeabda0a8206f054493c858828dc77d7 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/HOA2_ISM1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/HOA2_ISM2_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/HOA2_ISM2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..dae2fec2c217b56c28dfb54aadcda6d7b0be3ea8 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/HOA2_ISM2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/HOA2_ISM3_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/HOA2_ISM3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..1a93e8d8aa39ef3307fdb39d299ed20d0b8bba2e Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/HOA2_ISM3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/HOA2_ISM4_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/HOA2_ISM4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..4142677a43912256b1c2bae43c0ab67306f3cde7 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/HOA2_ISM4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/HOA3_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/HOA3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..53f36cff0e2a1a0658e25978ff6bdccb01b4241f Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/HOA3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/HOA3_ISM1_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/HOA3_ISM1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..148d61df80d992ad473c9ec3823899f06b2140ec Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/HOA3_ISM1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/HOA3_ISM2_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/HOA3_ISM2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..946ebf63eeda956194f4774c5582ff5570c3733e Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/HOA3_ISM2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/HOA3_ISM3_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/HOA3_ISM3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..7736f6aefaab8d1149daa0f73d2c7e2619d7687e Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/HOA3_ISM3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/HOA3_ISM4_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/HOA3_ISM4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..5b6cefdc53d7eeabde25afe247f9e9be475bc770 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/HOA3_ISM4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/ISM1_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/ISM1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..550bf08fdd6ad2369b7e6016b0ced2fbe6dff250 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/ISM1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/ISM2_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/ISM2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..9d6ef24be9d7f72252eeff4360061851e87ea860 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/ISM2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/ISM3_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/ISM3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..f5ba3ad32e989fd07634382636a3ced56b4ebb32 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/ISM3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/ISM4_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/ISM4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..26b370f4472b1a62c62ef0b214bd998ef87dee91 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/ISM4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..eded2ba9bc45f314c3515dd0827f550f8eb17f4f Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_ISM1_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_ISM1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..40907f5627aeaf69a29f6bb041b1933e0776b503 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_ISM1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_ISM2_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_ISM2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..02d6e7abb79c9e3dc92c022cff8c8891d4d47a4d Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_ISM2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_ISM3_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_ISM3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..da6ca2049c2306d4279f6e9cbaf01e8c6b15ec87 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_ISM3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_ISM4_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_ISM4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..988a43c7479c093b10f50fb19b6fd9431e62269c Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/MASA1TC_ISM4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..9b427b16dbd363a02735746bdc98ad55d178f22a Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_ISM1_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_ISM1_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..0ad8ede81783f7bc172a34277e0f2a310c3fda82 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_ISM1_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_ISM2_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_ISM2_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..9d94af7352d70087cb50de40e5d8fbe4153ce9e9 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_ISM2_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_ISM3_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_ISM3_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..337c60364962b760dae83cc7dd636bf536c7d770 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_ISM3_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_ISM4_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_ISM4_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..65c07f85aed4fc5c3eed16132c7bedc11317b15b Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/MASA2TC_ISM4_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/MONO_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/MONO_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..77709f10ced9f42c6b2fa5ca7f48f11300fcdfa3 Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/MONO_48000.192 differ diff --git a/scripts/testv/fmt_sw_bitstreams_long/STEREO_48000.192 b/scripts/testv/fmt_sw_bitstreams_long/STEREO_48000.192 new file mode 100644 index 0000000000000000000000000000000000000000..9c0d8564e53f84adfaec8d6098ee15c36fd2830e Binary files /dev/null and b/scripts/testv/fmt_sw_bitstreams_long/STEREO_48000.192 differ diff --git a/tests/format_switching/__init__.py b/tests/format_switching/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/tests/format_switching/compare/cut/.gitkeep b/tests/format_switching/compare/cut/.gitkeep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/tests/format_switching/compare/ref/.gitkeep b/tests/format_switching/compare/ref/.gitkeep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/tests/format_switching/constants.py b/tests/format_switching/constants.py new file mode 100644 index 0000000000000000000000000000000000000000..e2fd7ec0de427ec4015c2a0909efed56982e4721 --- /dev/null +++ b/tests/format_switching/constants.py @@ -0,0 +1,104 @@ +from enum import Enum +import pathlib + +HERE = pathlib.Path(__file__).parent +SMOKE_TEST_DIR = HERE.joinpath("smoke-test-output") +COMPARE_TEST_DIR_REF = HERE.joinpath("compare/ref") +COMPARE_TEST_DIR_CUT = HERE.joinpath("compare/cut") + + +class TestMode(str, Enum): + SMOKE_TEST = "smoke-test" + COMPARE_CREATE_REF = "create-ref" + COMPARE_CREATE_CUT = "create-cut" + + +OUTPUT_DIR = { + TestMode.SMOKE_TEST: SMOKE_TEST_DIR, + TestMode.COMPARE_CREATE_REF: COMPARE_TEST_DIR_REF, + TestMode.COMPARE_CREATE_CUT: COMPARE_TEST_DIR_CUT, +} + +BS_DIR = { + TestMode.SMOKE_TEST: HERE.parent.parent.joinpath("scripts/testv/fmt_sw_bitstreams"), + TestMode.COMPARE_CREATE_CUT: HERE.parent.parent.joinpath( + "scripts/testv/fmt_sw_bitstreams_long" + ), + TestMode.COMPARE_CREATE_REF: HERE.parent.parent.joinpath( + "scripts/testv/fmt_sw_bitstreams_long" + ), +} + +BITSTREAM_FILES = { + "MONO": "MONO_48000.192", + "STEREO": "STEREO_48000.192", + "ISM1": "ISM1_48000.192", + "ISM2": "ISM2_48000.192", + "ISM3": "ISM3_48000.192", + "ISM4": "ISM4_48000.192", + "FOA": "FOA_48000.192", + "HOA2": "HOA2_48000.192", + "HOA3": "HOA3_48000.192", + "MASA1TC": "MASA1TC_48000.192", + "MASA2TC": "MASA2TC_48000.192", + "5_1": "5_1_48000.192", + "5_1_2": "5_1_2_48000.192", + "5_1_4": "5_1_4_48000.192", + "7_1": "7_1_48000.192", + "7_1_4": "7_1_4_48000.192", + "FOA_ISM1": "FOA_ISM1_48000.192", + "FOA_ISM2": "FOA_ISM2_48000.192", + "FOA_ISM3": "FOA_ISM3_48000.192", + "FOA_ISM4": "FOA_ISM4_48000.192", + "HOA2_ISM1": "HOA2_ISM1_48000.192", + "HOA2_ISM2": "HOA2_ISM2_48000.192", + "HOA2_ISM3": "HOA2_ISM3_48000.192", + "HOA2_ISM4": "HOA2_ISM4_48000.192", + "HOA3_ISM1": "HOA3_ISM1_48000.192", + "HOA3_ISM2": "HOA3_ISM2_48000.192", + "HOA3_ISM3": "HOA3_ISM3_48000.192", + "HOA3_ISM4": "HOA3_ISM4_48000.192", + "MASA1TC_ISM1": "MASA1TC_ISM1_48000.192", + "MASA1TC_ISM2": "MASA1TC_ISM2_48000.192", + "MASA1TC_ISM3": "MASA1TC_ISM3_48000.192", + "MASA1TC_ISM4": "MASA1TC_ISM4_48000.192", + "MASA2TC_ISM1": "MASA2TC_ISM1_48000.192", + "MASA2TC_ISM2": "MASA2TC_ISM2_48000.192", + "MASA2TC_ISM3": "MASA2TC_ISM3_48000.192", + "MASA2TC_ISM4": "MASA2TC_ISM4_48000.192", +} + +COMPARE_TEST_MODES_TO_KEEP = [ + "MONO", + "STEREO", + "ISM4", + "HOA3", + "MASA2TC", + "7_1_4", + "HOA2_ISM3", + "MASA1TC_ISM2", +] + +IVAS_IN_FORMATS = list(BITSTREAM_FILES.keys()) +IVAS_OUT_FORMATS = [ + "MONO", + "STEREO", + "5_1", + "5_1_2", + "5_1_4", + "7_1", + "7_1_4", + "FOA", + "HOA2", + "HOA3", + "BINAURAL", + "BINAURAL_ROOM_IR", + "BINAURAL_ROOM_REVERB", + "EXT", +] + + +class BitstreamFormat(str, Enum): + G192 = "g192" + VOIP = "voip" + RTP = "rtp" diff --git a/tests/format_switching/smoke-test-output/.gitkeep b/tests/format_switching/smoke-test-output/.gitkeep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/tests/format_switching/test_format_switching.py b/tests/format_switching/test_format_switching.py new file mode 100644 index 0000000000000000000000000000000000000000..ab5eb111dcdd0a72b364cf63534a958ca99a10ae --- /dev/null +++ b/tests/format_switching/test_format_switching.py @@ -0,0 +1,80 @@ +import pytest +from tests.conftest import DecoderFrontend +from .constants import ( + BITSTREAM_FILES, + BS_DIR, + COMPARE_TEST_MODES_TO_KEEP, + BitstreamFormat, + IVAS_OUT_FORMATS, + IVAS_IN_FORMATS, + TestMode, + OUTPUT_DIR, +) +from .utils import concat_files +from ..cmp_pcm import cmp_pcm + + +@pytest.mark.parametrize("output_fmt", IVAS_OUT_FORMATS) +@pytest.mark.parametrize("bs_fmt", [BitstreamFormat.G192]) +@pytest.mark.parametrize("ivas_fmt_b", IVAS_IN_FORMATS) +@pytest.mark.parametrize("ivas_fmt_a", IVAS_IN_FORMATS) +def test_format_switching( + test_info, + ref_decoder_frontend: DecoderFrontend, + dut_decoder_frontend: DecoderFrontend, + ivas_fmt_a, + ivas_fmt_b, + bs_fmt, + output_fmt, +): + # --------- skipping logic -------------- + if bs_fmt == BitstreamFormat.G192 and ( + ivas_fmt_a == "MONO" or ivas_fmt_b == "MONO" + ): + pytest.skip("Fmt switching with MONO only possible with RTP bitstream") + + if ivas_fmt_a == ivas_fmt_b: + pytest.skip("Skipping same format case") + + test_mode = TestMode.SMOKE_TEST + if test_info.config.option.create_ref: + test_mode = TestMode.COMPARE_CREATE_REF + if test_info.config.option.create_cut: + test_mode = TestMode.COMPARE_CREATE_CUT + + if ( + test_mode == TestMode.COMPARE_CREATE_REF + or test_mode == TestMode.COMPARE_CREATE_CUT + ): + if ( + ivas_fmt_a not in COMPARE_TEST_MODES_TO_KEEP + or ivas_fmt_b not in COMPARE_TEST_MODES_TO_KEEP + ): + pytest.skip("Skip this mode for COMPARE test") + + # --------- actual test -------------- + bs_dir = BS_DIR[test_mode] + bs_a = bs_dir / BITSTREAM_FILES[ivas_fmt_a] + bs_b = bs_dir / BITSTREAM_FILES[ivas_fmt_b] + + outname_head = f"from-{ivas_fmt_a}-to-{ivas_fmt_b}" + + output_dir = OUTPUT_DIR[test_mode] + bs_concat = output_dir / f"{outname_head}.192" + + if bs_fmt == BitstreamFormat.G192: + concat_files([bs_a, bs_b], bs_concat) + + output_file_name = f"{outname_head}-dec_to-{output_fmt}.wav" + output_file_path = output_dir / output_file_name + if test_mode == TestMode.COMPARE_CREATE_REF: + ref_decoder_frontend.run(output_fmt, 48, bs_concat, output_file_path) + else: + dut_decoder_frontend.run(output_fmt, 48, bs_concat, output_file_path) + + if test_mode == TestMode.COMPARE_CREATE_CUT: + ref_file = OUTPUT_DIR[TestMode.COMPARE_CREATE_REF] / output_file_name + output_differs, reason = cmp_pcm(ref_file, output_file_path, output_fmt, 48) + + if output_differs[0]: + pytest.fail(f"Output differs: ({reason[0]})") diff --git a/tests/format_switching/utils.py b/tests/format_switching/utils.py new file mode 100644 index 0000000000000000000000000000000000000000..8f32cd03cf372e23145f631f913572fb17fb8a27 --- /dev/null +++ b/tests/format_switching/utils.py @@ -0,0 +1,8 @@ +import pathlib + + +def concat_files(files: list[pathlib.Path], outfile: pathlib.Path): + with open(outfile, "wb") as out_f: + for f in files: + with open(f, "rb") as in_f: + out_f.write(in_f.read()) diff --git a/tests/rtp/test_format_switching.py b/tests/rtp/test_format_switching.py deleted file mode 100644 index 9c200b4475dbd1cf61950f7fe81e5d9d1e219271..0000000000000000000000000000000000000000 --- a/tests/rtp/test_format_switching.py +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env python3 - -__copyright__ = """ -(C) 2022-2026 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, -Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -contributors to this repository. All Rights Reserved. - -This software is protected by copyright law and by international treaties. -The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, -Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -contributors to this repository retain full ownership rights in their respective contributions in -the software. This notice grants no license of any kind, including but not limited to patent -license, nor is any license granted by implication, estoppel or otherwise. - -Contributors are required to enter into the IVAS codec Public Collaboration agreement before making -contributions. - -This software is provided "AS IS", without any express or implied warranties. The software is in the -development stage. It is intended exclusively for experts who have experience with such software and -solely for the purpose of inspection. All implied warranties of non-infringement, merchantability -and fitness for a particular purpose are hereby disclaimed and excluded. - -Any dispute, controversy or claim arising under or in relation to providing this software shall be -submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in -accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and -the United Nations Convention on Contracts on the International Sales of Goods. -""" - -__doc__ = """ -To configure test modules. -""" - -import os -import sys -import pytest -from tempfile import TemporaryDirectory -from pathlib import Path - -ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path.append(ROOT_DIR) - -from tests.conftest import EncoderFrontend, DecoderFrontend -from tests.renderer.constants import ( - FORMAT_TO_FILE_COMPARETEST, - FORMAT_TO_METADATA_FILES, -) -import platform - -BIN_EXT = ".exe" if platform.system() == "Windows" else "" - -FORMAT_ARGUMENT_MAPPING = { - "MONO": [], - "STEREO": ["-stereo"], - "5_1": ["-mc", "5_1"], - "7_1": ["-mc", "7_1"], - "5_1_2": ["-mc", "5_1_2"], - "5_1_4": ["-mc", "5_1_4"], - "7_1_4": ["-mc", "7_1_4"], - "FOA": ["-sba", "+1"], - "HOA2": ["-sba", "+2"], - "HOA3": ["-sba", "+3"], - "ISM1": ["-ism", "1"], - "ISM2": ["-ism", "2"], - "ISM3": ["-ism", "3"], - "ISM4": ["-ism", "4"], - "MASA1": ["-masa", "1"], - "MASA2": ["-masa", "2"], - "ISM1MASA1": ["-ism_masa", "1", "1"], - "ISM2MASA1": ["-ism_masa", "2", "1"], - "ISM3MASA1": ["-ism_masa", "3", "1"], - "ISM4MASA1": ["-ism_masa", "4", "1"], - "ISM1MASA2": ["-ism_masa", "1", "2"], - "ISM2MASA2": ["-ism_masa", "2", "2"], - "ISM3MASA2": ["-ism_masa", "3", "2"], - "ISM4MASA2": ["-ism_masa", "4", "2"], - "ISM1SBA1": ["-ism_sba", "1", "+1"], - "ISM1SBA2": ["-ism_sba", "1", "+2"], - "ISM1SBA3": ["-ism_sba", "1", "+3"], - "ISM2SBA1": ["-ism_sba", "2", "+1"], - "ISM2SBA2": ["-ism_sba", "2", "+2"], - "ISM2SBA3": ["-ism_sba", "2", "+3"], - "ISM3SBA1": ["-ism_sba", "3", "+1"], - "ISM3SBA2": ["-ism_sba", "3", "+2"], - "ISM3SBA3": ["-ism_sba", "3", "+3"], - "ISM4SBA1": ["-ism_sba", "4", "+1"], - "ISM4SBA2": ["-ism_sba", "4", "+2"], - "ISM4SBA3": ["-ism_sba", "4", "+3"], -} - - -@pytest.mark.skip(reason="Needs to be replaced with new test using the normal encoder") -def test_format_switching_new_encoder( - record_property, dut_decoder_frontend: DecoderFrontend -): - bitrate = 48000 - fs = 48 - outMode = "" - cut_suffix = "_cut.wav" - - dut_encoder_path = Path(ROOT_DIR).joinpath(f"IVAS_cod{BIN_EXT}") - dut_encoder_fmtsw_path = Path(ROOT_DIR).joinpath(f"IVAS_cod_fmtsw{BIN_EXT}") - dut_encoder_fmtsw_frontend = EncoderFrontend( - dut_encoder_fmtsw_path, "DUT", record_property - ) - - with TemporaryDirectory() as tmp_dir: - # Create file for encoding commands - temp_format_switching_file = ( - Path(tmp_dir).joinpath("format_switching_input.txt").absolute() - ) - temp_rtpdump = Path(tmp_dir).joinpath("output_concatenated.rtpdump").absolute() - with open(temp_format_switching_file, mode="a") as outFile: - for key, audioFile in FORMAT_TO_FILE_COMPARETEST.items(): - if key in ["META", "16ch_8+4+4", "4d4", "t_design_4"]: - break - - encoder_args = [] - encoder_args += [str(dut_encoder_path)] - encoder_args += ["-rtpdump", "1"] - encoder_args += FORMAT_ARGUMENT_MAPPING[key] - if key in FORMAT_TO_METADATA_FILES: - encoder_args += FORMAT_TO_METADATA_FILES[key] - elif "SBA" in key: - # ISM metadata files for OSBA - encoder_args += FORMAT_TO_METADATA_FILES[key[:4]] - encoder_args += [str(bitrate)] - encoder_args += [str(fs)] - cutFile = Path(str(audioFile).replace(".wav", cut_suffix)) - encoder_args += [str(cutFile)] - encoder_args += [str(temp_rtpdump)] - - outFile.write(" ".join(encoder_args)) - outFile.write("\n") - - # Encode with the format switch encoder - dut_encoder_fmtsw_frontend.run( - bitrate="", - input_sampling_rate="", - input_path=temp_format_switching_file, - output_bitstream_path="", - quiet_mode=False, - fmtsw_command=True, - ) - - # Decode the combined bitstreams - cat_output_rtpdump = ( - Path(tmp_dir).joinpath(f"output_concatenated.wav").absolute() - ) - - dut_decoder_frontend.run( - output_config=outMode, - output_sampling_rate=48, - input_bitstream_path=temp_rtpdump, - output_path=cat_output_rtpdump, - add_option_list=["-VOIP_HF_ONLY=1"], - )