From 0b5d9807cca6e69d39315cdc1023f36d2f7eb17f Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 23 Sep 2024 06:48:14 +0000 Subject: [PATCH 1/3] Add MASA LTV cases to remove_unsupported_testcases.py --- ci/remove_unsupported_testcases.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/remove_unsupported_testcases.py b/ci/remove_unsupported_testcases.py index 39ecf34d53..4be1c2bdde 100644 --- a/ci/remove_unsupported_testcases.py +++ b/ci/remove_unsupported_testcases.py @@ -64,6 +64,8 @@ TESTCASES = [ "MASA 1dir 1TC at 256 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out, HR custom configuration", "MASA 1dir 1 TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration", "MASA 1dir 1TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration", + "MASA 1 TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration", + "MASA 1TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration", ] -- GitLab From 13d1d2b2e986f6118a2b50b24fdae4033d272421 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Thu, 26 Sep 2024 08:43:04 +0200 Subject: [PATCH 2/3] Remove duplicated test case --- apps/decoder.c | 6 ++++++ ci/remove_unsupported_testcases.py | 2 -- scripts/config/self_test.prm | 6 +----- scripts/config/self_test_ltv.prm | 6 +----- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index fc003928e9..2f9edb394d 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -2684,6 +2684,12 @@ static ivas_error decodeG192( } } vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len; + + if ( frame == 200 ) + { + exit( -1 ); + } + #ifdef WMOPS if ( vec_pos_update == 0 ) { diff --git a/ci/remove_unsupported_testcases.py b/ci/remove_unsupported_testcases.py index 4be1c2bdde..05132e0f3c 100644 --- a/ci/remove_unsupported_testcases.py +++ b/ci/remove_unsupported_testcases.py @@ -62,9 +62,7 @@ TESTCASES = [ "Multi-channel 5_1 at 64 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (FastConv)", "Multi-channel 5_1 at 32 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (ParamBin)", "MASA 1dir 1TC at 256 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out, HR custom configuration", - "MASA 1dir 1 TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration", "MASA 1dir 1TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration", - "MASA 1 TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration", "MASA 1TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration", ] diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 92bdb41bec..e8ba281af6 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -1219,7 +1219,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 256000 48 testv/stv1MASA1TC48c.wav bit ../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stv1MASA1TC48c.wav_BINAURAL_ROOM_REVERB_256000_48-48.tst -// MASA 1dir 1 TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration +// MASA 1dir 1TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 256000 48 testv/stv1MASA1TC48c.wav bit ../IVAS_dec -render_config testv/rend_config_combined.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv1MASA1TC48c.wav_BINAURAL_ROOM_REVERB_256000_48-48_custom_config.tst @@ -1228,10 +1228,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error ../IVAS_dec BINAURAL_ROOM_REVERB 48 bit_error testv/stv1MASA1TC48c.wav_256000_48-48_BINAURAL_ROOM_REVERB_FER5.tst -// MASA 1dir 1TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration -../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 256000 48 testv/stv1MASA1TC48c.wav bit -../IVAS_dec -render_config testv/rend_config_combined.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv1MASA1TC48c.wav_256000_48-48_BINAURAL_ROOM_REVERB_FER5_custom_config.tst - // MASA 1dir 1TC at 256 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out, HR deafult configuration ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 256000 48 testv/stv1MASA1TC48c.wav bit ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_REVERB 48 bit testv/stv1MASA1TC48c.wav_BINAURAL_ROOM_REVERB_256000_48-48_Headrot.tst diff --git a/scripts/config/self_test_ltv.prm b/scripts/config/self_test_ltv.prm index b24adb8885..fcd95ac2f0 100644 --- a/scripts/config/self_test_ltv.prm +++ b/scripts/config/self_test_ltv.prm @@ -1215,7 +1215,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 256000 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MASA1TC.wav_BINAURAL_ROOM_REVERB_256000_48-48.tst -// MASA 1 TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration +// MASA 1TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 256000 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec -render_config testv/rend_config_combined.cfg BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MASA1TC.wav_BINAURAL_ROOM_REVERB_256000_48-48_custom_config.tst @@ -1234,10 +1234,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error ../IVAS_dec BINAURAL_ROOM_REVERB 48 bit_error testv/ltv48_MASA1TC.wav_256000_48-48_BINAURAL_ROOM_REVERB_FER5.tst -// MASA 1TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration -../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 256000 48 testv/ltv48_MASA1TC.wav bit -../IVAS_dec -render_config testv/rend_config_combined.cfg BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MASA1TC.wav_256000_48-48_BINAURAL_ROOM_REVERB_FER5_custom_config.tst - // MASA 1TC at 256 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out, HR deafult configuration ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 256000 48 testv/ltv48_MASA1TC.wav bit ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MASA1TC.wav_BINAURAL_ROOM_REVERB_256000_48-48_Headrot.tst -- GitLab From 0c15890feb722058dbcb3943193fd75cacd85cc3 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Thu, 26 Sep 2024 08:46:52 +0200 Subject: [PATCH 3/3] Revert unintentionally committed debugging code --- apps/decoder.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index 2f9edb394d..fc003928e9 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -2684,12 +2684,6 @@ static ivas_error decodeG192( } } vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len; - - if ( frame == 200 ) - { - exit( -1 ); - } - #ifdef WMOPS if ( vec_pos_update == 0 ) { -- GitLab