Commit 0bb0dfd5 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_419_ISM_BRATE_SW_DTX

parent 5b209963

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 
/*#define FIX_XXX_JBM_FIFO_BUFFER  */                   /* FhG: prevent wraparound of a length identifier in cause of large frames and many channels*/





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

#define FIX_422                                         /* FhG: Issue 422: re-introduce fix for noisy speech buffer in ParamISM */



#define ERI_MSVQ_CLEANUP                                /* Eri: Contribution #31  BE modularization of msvq encoder side DCT21&DCT24 within msvq_enc()        */

lib_dec/ivas_ism_metadata_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -488,14 +488,9 @@ ivas_error ivas_ism_metadata_dec( 
        {

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



#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

+0 −5
Original line number Diff line number Diff line
@@ -569,14 +569,9 @@ 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;