Commit 8ce0c56e authored by Jan Kiene's avatar Jan Kiene
Browse files

accept FIX_562_ISM2_64KBPS

parent 65169a29

lib_com/ivas_ism_com.c

+0 −4
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ 
#define BETA_ISM_LOW_IMP    0.6f

#define BETA_ISM_MEDIUM_IMP 0.8f



#ifdef FIX_562_ISM2_64KBPS

#define MAX_BRATE_TCX_32k 48000

#endif





/*-------------------------------------------------------------------*
@@ -292,7 +290,6 @@ ivas_error ivas_ism_config( 
            bits_CoreCoder[ch] = tmp;

        }



#ifdef FIX_562_ISM2_64KBPS

        /* limitaton to avoid too high bitrate in one active TCX channel */

        if ( element_brate[0] >= SCE_CORE_16k_LOW_LIMIT && element_brate[0] <= IVAS_32k )

        {
@@ -307,7 +304,6 @@ ivas_error ivas_ism_config( 
                bits_CoreCoder[ch] = tmp;

            }

        }

#endif



        if ( diff > 0 )

        {

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ 
#define FIX_137_SID_MD_BITS                             /* Dlb: Fix issue #137 , SID bitrate mismatch correction */

#define FIX_470_MASA_JBM_EXT                            /* Nokia: Issue 470, fix MASA EXT output with JBM */

#define FIX_564                                         /* Nokia: Issue 564: Fix gains in JBM path for SBA with parametric binaural renderer */

#define FIX_562_ISM2_64KBPS                             /* VA: issue 562: fix ISM2 at 64kbps issue */

#define FIX_559_EXTL_IGF_MISMATCH                       /* VA: issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching */

#define FIX_571_REVERB_NOT_ACTIVATED_ISM                /* Philips: Issue 571: Reverb not activated for discrete and parametric ISM */

#define FIX_572_LFE_LPF_ENC                             /* FhG: issue 572: always apply the low pass filter to the LFE channel */

lib_dec/ivas_ism_metadata_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -512,12 +512,8 @@ ivas_error ivas_ism_metadata_dec( 
            hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0;

            if ( ism_mode == ISM_MODE_DISC )

            {

#ifdef FIX_562_ISM2_64KBPS

                if ( ism_imp[ch] == ISM_NO_META && ( ( total_brate[ch] < ACELP_8k00 && element_brate[ch] < SCE_CORE_16k_LOW_LIMIT ) ||

                                                     ( total_brate[ch] <= ACELP_16k_LOW_LIMIT && element_brate[ch] >= SCE_CORE_16k_LOW_LIMIT ) ) )

#else

                if ( ism_imp[ch] == ISM_NO_META && total_brate[ch] < ACELP_8k00 )

#endif

                {

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

                }

lib_enc/ivas_ism_metadata_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -576,12 +576,8 @@ ivas_error ivas_ism_metadata_enc( 
        hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0;

        if ( ism_mode == ISM_MODE_DISC )

        {

#ifdef FIX_562_ISM2_64KBPS

            if ( ism_imp[ch] == ISM_NO_META && ( ( total_brate[ch] < ACELP_8k00 && element_brate[ch] < SCE_CORE_16k_LOW_LIMIT ) ||

                                                 ( total_brate[ch] <= ACELP_16k_LOW_LIMIT && element_brate[ch] >= SCE_CORE_16k_LOW_LIMIT ) ) )

#else

            if ( ism_imp[ch] == ISM_NO_META && total_brate[ch] < ACELP_8k00 )

#endif

            {

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

            }