Commit 0ef2cba7 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec

parents d55bd7be 7797b371

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -170,7 +170,9 @@ 
#define FIX_401_DIRAC_RENDERER_META_READ_INDICES        /* Nokia: Issue 401: Fix metadata reading indices in DirAC renderer. */

#define FIX_406_IVAS_POSITION                           /* Eri: Issue 406: Unify IVAS_POSITION to use IVAS_VECTOR3 instead */

#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */

#define FIX_419_ISM_BRATE_DTX                           /* VA: issue 419: fir ISM Bitrate Switching with dtx */

#define FIX_419_ISM_MD_FIX                              /* VA: Issue 419: fix the upper value limitation for parameter angle1_diff_cnt */

#define FIX_419_ISM_BRATE_SW_DTX                        /* VA: issue 419: fix ISM Bitrate Switching with dtx */







/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_ism_metadata_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -595,12 +595,12 @@ ivas_error ivas_ism_metadata_dec( 
        {

            hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag;



#ifdef FIX_419_ISM_BRATE_DTX

#ifdef FIX_419_ISM_BRATE_SW_DTX

            hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0;

#endif

            if ( ism_mode == ISM_MODE_DISC )

            {

#ifndef FIX_419_ISM_BRATE_DTX

#ifndef FIX_419_ISM_BRATE_SW_DTX

                hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0;

#endif

                if ( hIsmMeta[ch]->ism_metadata_flag == 0 && localVAD[ch] == 0 && ism_metadata_flag_global )

lib_enc/ivas_ism_metadata_enc.c

+6 −2
Original line number Diff line number Diff line
@@ -549,12 +549,12 @@ ivas_error ivas_ism_metadata_enc( 


    for ( ch = 0; ch < nchan_transport; ch++ )

    {

#ifdef FIX_419_ISM_BRATE_DTX

#ifdef FIX_419_ISM_BRATE_SW_DTX

        hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0;

#endif

        if ( ism_mode == ISM_MODE_DISC )

        {

#ifndef FIX_419_ISM_BRATE_DTX

#ifndef FIX_419_ISM_BRATE_SW_DTX

            hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0;

#endif

            if ( hIsmMeta[ch]->ism_metadata_flag == 0 && localVAD[ch] == 0 && ism_metadata_flag_global )
@@ -855,7 +855,11 @@ static void encode_angle_indices( 
    if ( *flag_abs_angle1 == 0 )

    {

        angle->angle1_diff_cnt++;

#ifdef FIX_419_ISM_MD_FIX

        angle->angle1_diff_cnt = min( angle->angle1_diff_cnt, ISM_FEC_MAX );

#else

        angle->angle2_diff_cnt = min( angle->angle2_diff_cnt, ISM_FEC_MAX );

#endif

    }

    else

    {

scripts/config/self_test.prm

+2 −2
Original line number Diff line number Diff line
@@ -420,11 +420,11 @@ 




// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, directivity configuration, random FEC at 5%

../IVAS_cod -ism +4 testv/stvISM+1.csv testv/stvISM+2.csv testv/stvISM+3.csv testv/stvISM+4.csv 256000 48 testv/stv4ISM48s.wav bit

../IVAS_cod -ism +4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit

../IVAS_dec -fec 5 -render_config testv/config_directivity.cfg -t testv/headrot_case04_3000_q.csv BINAURAL 48 bit testv/stv+4ISM48s.wav_256000_48-48_binaural_file_TDHR_DirConfig_FEC5.tst



// 4 ISM with and without extended metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out

../IVAS_cod -dtx -ism +4 testv/stvISM+1.csv NULL testv/stvISM+3.csv testv/stvISM+4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.wav bit

../IVAS_cod -dtx -ism +4 testv/stvISM1.csv NULL testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.wav bit

../IVAS_dec BINAURAL 48 bit testv/stv+4ISM48s.wav_brate_sw_48-48_DTX_binaural.tst

scripts/testv/stvISM+1.csv

deleted100644 → 0
+0 −1500

File deleted.

Preview size limit exceeded, changes collapsed.