Commit e1dba184 authored by emerit's avatar emerit
Browse files

Merge branch... 

Merge branch '419-ism-bitrate-switching-with-dtx-return-decoding-error-ber-detected' into orange/no-diegetic-pan-with-radius
parents d3bfde3c 0ef2cba7

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ 
#define FIX_401_DIRAC_RENDERER_META_READ_INDICES        /* Nokia: Issue 401: Fix metadata reading indices in DirAC renderer. */

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

#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

+4 −0
Original line number Diff line number Diff line
@@ -505,10 +505,14 @@ ivas_error ivas_ism_metadata_dec( 
                /* IVAS_fmToDo: more work needed when the number of transported objects is not constant */

                return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "wrong bit stream!" );

            }

#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_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 )

                {

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

lib_enc/ivas_ism_metadata_enc.c

+5 −0
Original line number Diff line number Diff line
@@ -504,9 +504,14 @@ ivas_error ivas_ism_metadata_enc( 


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

    {

#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_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 )

            {

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