Commit a459d38d authored by kinuthia's avatar kinuthia
Browse files

Merge branch '1229-dpid-0-used-irrespective-of-the-specified-one-for-ism1' into 'main' 

[Non-BE] Resolve "dpid 0 used irrespective of the specified one for ism1"

See merge request !1872
parents 024f679b ca5f9464

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,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 ########################### */

lib_util/render_config_reader.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

        }

scripts/config/self_test.prm

+3 −0
Original line number Diff line number Diff line
@@ -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

scripts/config/self_test_ltv.prm

+3 −0
Original line number Diff line number Diff line
@@ -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