From ca4aff3854e0b674956733b40da5528fde11d50f Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Tue, 26 Nov 2024 09:58:39 +0100 Subject: [PATCH 1/4] [fix] for ISM 1, specifying dpid works as expected. --- lib_util/render_config_reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index f602d16e62..14ec980eee 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -3034,7 +3034,7 @@ ivas_error RenderConfigReader_getDirectivity( } } /* case when -dpid is not specified, select first directivity pattern from config file */ - if ( n == 0 ) + if ( last_specified_id == 65535 ) { last_specified_id = (uint16_t) pRenderConfigReader->pDP[0].id; } -- GitLab From daa5f7b510f1f268f503fcb393b583dca9be8767 Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Tue, 26 Nov 2024 11:28:05 +0100 Subject: [PATCH 2/4] wrap bug fix with define --- lib_com/options.h | 1 + lib_util/render_config_reader.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index f7f4bc74e4..5377a6bd9b 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -179,6 +179,7 @@ #define NONBE_FIX_1205_TD_STEREO_MOD_CT /* VA: fix mismatch of coder_type (mod_ct) btw. TD stereo encoder and decoder */ #define NONBE_1203_MDCT2DFT_SWITCHING /* VA: issue 1203: fix severe artifacts during MDCT to DFT stereo switching when MDCT ITD is not used */ #define NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */ +#define NONBE_1229_FIX_ISM1_DPID /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index 14ec980eee..2e8b426ca6 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -3034,7 +3034,11 @@ ivas_error RenderConfigReader_getDirectivity( } } /* case when -dpid is not specified, select first directivity pattern from config file */ +#ifdef NONBE_1229_FIX_ISM1_DPID if ( last_specified_id == 65535 ) +#else + if ( n == 0 ) +#endif { last_specified_id = (uint16_t) pRenderConfigReader->pDP[0].id; } -- GitLab From 7d4a070121e63aa036dc986bb0202dacb7c8c79e Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Thu, 28 Nov 2024 14:26:11 +0100 Subject: [PATCH 3/4] add test case for ISM +1 with -dpid --- scripts/config/self_test.prm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index b1396d1955..ce1b05b845 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -356,6 +356,9 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -dtx -ism 1 testv/stvISM1.csv ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stv32c.wav bit ../IVAS_dec EXT 32 bit testv/stv32c.wav_1ISM_brate_sw_32-32_EXT_dtx.tst +// 1 ISM with extended metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL out, rendconf dir w id +../IVAS_cod -ism +1 testv/stvISM1.csv 64000 48 testv/stv1ISM48s.wav bit +../IVAS_dec -render_config testv/config_directivity_txt.cfg -dpid 2 BINAURAL 48 bit stv1ISM48s.wav_64000_48-48_render_config_directivity_txt_dpid_2_binaural.tst // 2 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, STEREO out ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 16400 48 testv/stv2ISM48s.wav bit -- GitLab From f38084d481663f8fec60df91678c37a75d0821d6 Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Tue, 3 Dec 2024 08:22:48 +0100 Subject: [PATCH 4/4] add corresponding test case for ltv --- scripts/config/self_test_ltv.prm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/config/self_test_ltv.prm b/scripts/config/self_test_ltv.prm index 68279e45fb..55ab4fb49e 100644 --- a/scripts/config/self_test_ltv.prm +++ b/scripts/config/self_test_ltv.prm @@ -355,6 +355,9 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -dtx -ism 1 testv/ltvISM1.csv ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/ltv32_1ISM.wav bit ../IVAS_dec EXT 32 bit testv/ltv32_1ISM.wav_1ISM_brate_sw_32-32_EXT_dtx.tst +// 1 ISM with extended metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL out, rendconf dir w id +../IVAS_cod -ism +1 testv/ltvISM1.csv 64000 48 testv/ltv48_1ISM.wav bit +../IVAS_dec -render_config testv/config_directivity_txt.cfg -dpid 2 BINAURAL 48 bit ltv48_1ISM.wav_64000_48-48_render_config_directivity_txt_dpid_2_binaural.tst // 2 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, STEREO out ../IVAS_cod -ism 2 testv/ltvISM1.csv testv/ltvISM2.csv 16400 48 testv/ltv48_2ISM.wav bit -- GitLab