Commit 0b8d71a4 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 666-switch-fix_613_dirac_null_ptr_usan-missing-from-options-h
parents cf9aa428 8b50bb0d

lib_dec/ivas_stereo_ica_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -148,8 +148,6 @@ void stereo_tca_dec( 


    prevNCShift = (int16_t) abs( hStereoTCA->prevCorrLagStats );

    currentNCShift = (int16_t) abs( hStereoTCA->corrLagStats );

    /* IVAS_fmToDo: QCTodo: Need to address [16, 32] kHz @ Encoder --> 48 kHz Decoder. 48kHz-->48kHz is ok */

    /*target_idx = (hStereoTCA->refChanIndx == L_CH_INDX) ? R_CH_INDX : L_CH_INDX;*/



    if ( hCPE->element_mode == IVAS_CPE_TD && hCPE->last_element_mode == IVAS_CPE_TD )

    {

lib_dec/ivas_stereo_icbwe_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -739,7 +739,6 @@ void stereo_icBWE_decproc( 
            {

                if ( hCPE->element_mode == IVAS_CPE_TD )

                {

                    /* QC: TODO - TBV */

                    v_add( output[0], hStereoICBWE->memOutHB[hStereoICBWE->prev_refChanIndx_bwe], output[0], memOffset );

                    v_add( output[1], hStereoICBWE->memOutHB[!hStereoICBWE->prev_refChanIndx_bwe], output[1], memOffset );

                }

scripts/config/self_test.prm

+12 −12
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ 


// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out, random FEC at 5%

../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 13200 48 testv/stv48n.wav bit

../IVAS_dec -fec 5 BINAURAL 48 bit testv/stv48n.wav_13200_48-48_DTX_FEC5_BINAURAL.tst

../IVAS_dec -fec 5 BINAURAL 48 bit testv/stv48n.wav_1ISM_13200_48-48_DTX_FEC5_BINAURAL.tst



// 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out

../IVAS_cod -ism 1 testv/stvISM1.csv 16400 48 testv/stv1ISM48s.wav bit
@@ -268,7 +268,7 @@ 


// 1 ISM with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, MONO out

../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 32000 32 testv/stv32n.wav bit

../IVAS_dec MONO 32 bit testv/stv32n.wav_32000_32-32_DTX_MONO.tst

../IVAS_dec MONO 32 bit testv/stv32n.wav_1ISM_32000_32-32_DTX_MONO.tst



// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, head rotation, random FEC at 5%

../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit
@@ -284,19 +284,19 @@ 


// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), head rotation, random FEC at 5%

../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit

../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.wav_80000_48-16_binaural_file_TDHR_FEC5.tst

../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv1ISM48s.wav_80000_48-16_binaural_file_TDHR_FEC5.tst



// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), head rotation, external orientation, random FEC at 5%

../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit

../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.wav_80000_48-16_binaural_file_TDHR_EXOF_FEC5.tst

../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv1ISM48s.wav_80000_48-16_binaural_file_TDHR_EXOF_FEC5.tst



// 1 ISM with metadata at 96 kbps, 48 kHz in, 16 kHz out, EXT out

../IVAS_cod -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.wav bit

../IVAS_dec EXT 16 bit testv/stv2ISM48s.wav_96000_48-16_EXT.tst

../IVAS_dec EXT 16 bit testv/stv1ISM48s.wav_96000_48-16_EXT.tst



// 1 ISM with metadata bitrate switching from 13.2 kbps to 128 kbps, 32 kHz in, 32 kHz out, EXT out, DTX on

../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_brate_sw_32-32_EXT_dtx.tst

../IVAS_dec EXT 32 bit testv/stv32c.wav_1ISM_brate_sw_32-32_EXT_dtx.tst





// 2 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, STEREO out
@@ -309,11 +309,11 @@ 


// 2 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, DTX on, HOA2 out

../IVAS_cod -dtx -ism 2 testv/stvISM1.csv testv/stvISM2.csv 32000 48 testv/stvST48c.wav bit

../IVAS_dec HOA2 48 bit testv/stv2ST48c.wav_32000_48-48_DTX_HOA2.tst

../IVAS_dec HOA2 48 bit testv/stvST48c.wav_2ISM_32000_48-48_DTX_HOA2.tst



// 2 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, DTX on, EXTERNAL out

../IVAS_cod -dtx -ism 2 testv/stvISM1.csv testv/stvISM2.csv 32000 48 testv/stvST48c.wav bit

../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_32000_48-48_DTX_external.tst

../IVAS_dec EXT 48 bit testv/stvST48c.wav_2ISM_32000_48-48_DTX_external.tst



// 2 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out, random FEC at 5%

../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stv2ISM48s.wav bit
@@ -333,7 +333,7 @@ 


// 2 ISM with metadata at 80 kbps, 48 kHz in, 48 kHz out, DTX on, stereo out

../IVAS_cod -dtx -ism 2 testv/stvISM1.csv testv/stvISM2.csv 80000 48 testv/stvST48c.wav bit

../IVAS_dec STEREO 48 bit testv/stv2ST48c.wav_80000_48-48_DTX_STEREO.tst

../IVAS_dec STEREO 48 bit testv/stvST48c.wav_2ISM_80000_48-48_DTX_STEREO.tst



// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), head rotation

../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.wav bit
@@ -362,15 +362,15 @@ 


// 3 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 48000 48 testv/stv3ISM48s.wav bit

../IVAS_dec MONO 48 bit testv/stv43ISM48s_48000_48-48_MONO.tst

../IVAS_dec MONO 48 bit testv/stv3ISM48s.48000_48-48_MONO.tst



// 3 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 64000 48 testv/stv3ISM48s.wav bit

../IVAS_dec EXT 48 bit testv/stv43ISM48s_64000_48-48_EXT.tst

../IVAS_dec EXT 48 bit testv/stv3ISM48s.64000_48-48_EXT.tst



// 3 ISM with metadata at 96 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 96000 48 testv/stv3ISM48s.wav bit

../IVAS_dec EXT 48 bit testv/stv43ISM48s_96000_48-48_EXT.tst

../IVAS_dec EXT 48 bit testv/stv3ISM48s.96000_48-48_EXT.tst



// 3 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, HOA3 out, random FEC at 5%

../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stv3ISM48s.wav bit