Commit 96647b86 authored by vaclav's avatar vaclav
Browse files

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

Merge remote-tracking branch 'remotes/origin/main' into 664-encode_ratio_ism_subframe-compiler-warning-with-debugging-disabled
parents 40a18f24 c33d864a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ 
#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_PRED_QUANT_63_PNTS

#define SPLIT_REND_WITH_HEAD_ROT_PARAMBIN               /* Nokia: Issue 623: Split rendering support for parambin renderer */

#define FIX_658_SPLIT_REND_MASA                         /*Dlb : Fix for issue 658, uninitialized memory access in MASA in Split rendering 0DOF mode*/                 

#endif

#define FIX_594_STL_INCLUDE                             /* FhG: issue 594: Missing include of stl.h */

lib_rend/ivas_dirac_dec_binaural_functions.c

+5 −1
Original line number Diff line number Diff line
@@ -960,8 +960,12 @@ static void ivas_dirac_dec_binaural_internal( 


#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN

    pMultiBinPoseData = &st_ivas->splitBinRend.splitrend.multiBinPoseData;



#ifdef FIX_658_SPLIT_REND_MASA

    if ( ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED ||

           st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

#else

    if ( pMultiBinPoseData != NULL && pMultiBinPoseData->num_poses > 1 )

#endif

    {

        ivas_dirac_dec_binaural_process_output( hDiracDecBin, hSpatParamRendCom, st_ivas->cldfbSynDec, output_f, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in,

                                                max_band_decorr, numInChannels, config_data.processReverb, subframe, tmp_Cldfb_out_re, tmp_Cldfb_out_im,

lib_rend/lib_rend.c

+29 −12
Original line number Diff line number Diff line
@@ -3243,7 +3243,12 @@ static DecoderDummy *initDecoderDummy( 
    decDummy->splitBinRend.hMultiBinCldfbData = NULL;

    ivas_init_split_rend_handles( &decDummy->splitBinRend.splitrend );

    decDummy->splitBinRend.splitrend = *pSplitRendWrapper;

#ifdef FIX_658_SPLIT_REND_MASA

    if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ||

         outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#else

    if ( decDummy->splitBinRend.splitrend.multiBinPoseData.num_poses > 1 )

#endif

    {

        if ( ( decDummy->splitBinRend.hMultiBinCldfbData = (IVAS_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA_HANDLE) malloc( sizeof( IVAS_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA ) ) ) == NULL )

        {
@@ -4160,6 +4165,11 @@ ivas_error IVAS_REND_AddInput( 
        {

            cldfb_in = 1;

        }

#ifdef FIX_658_SPLIT_REND_MASA

        ivas_split_rend_choose_default_codec( &hIvasRend->hRendererConfig->split_rend_config.codec,

                                              ( cldfb_in == 0 ),

                                              hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM );

#endif

        if ( ( error = initSplitRend( &hIvasRend->splitRendWrapper,

                                      &hIvasRend->splitRendEncBuffer,

                                      &hIvasRend->hRendererConfig->split_rend_config,
@@ -5014,7 +5024,13 @@ int16_t IVAS_REND_FeedRenderConfig( 
    }



    /* Must re-initialize split rendering config in case renderer config is updated after adding renderer inputs */

#ifdef FIX_658_SPLIT_REND_MASA

    /*if its not initialized yet then no need to re-initialize, initialization will happen while adding inputs*/

    if ( hIvasRend->splitRendEncBuffer.data != NULL && hIvasRend->hRendererConfig != NULL )

#endif

    {

        closeSplitRend( &hIvasRend->splitRendWrapper, &hIvasRend->splitRendEncBuffer );

        /* TODO : Do not hard code TDin to 1 here*/

        ivas_split_rend_choose_default_codec( &hIvasRend->hRendererConfig->split_rend_config.codec,

                                              1,

                                              hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM );
@@ -5028,6 +5044,7 @@ int16_t IVAS_REND_FeedRenderConfig( 
        {

            return error;

        }

    }

#endif



    return IVAS_ERR_OK;

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