diff --git a/lib_com/options.h b/lib_com/options.h index 51db29c99c91e00c1888a00c7fcb2ecc3cfadf4f..82ffff33b79e0c396878bb7186cae70e3355d53e 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -171,6 +171,7 @@ #define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */ #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 f602d16e62b65f273780a16d0377ec53080c5150..2e8b426ca6297a8a3885418c239dd9ee598073ee 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; } diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index b1396d19551206909eb2851cde91f7243dcf80ca..ce1b05b8454907a538772305dca620338e658144 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 diff --git a/scripts/config/self_test_ltv.prm b/scripts/config/self_test_ltv.prm index 68279e45fb5e31b421b8d0e82b750e811a1ec6d7..55ab4fb49ee810ceadea05481a2cbd896dd2167d 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