Commit a133128e authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_ISM_INACTIVE_BITS

parent 3fb102f1

lib_com/ivas_ism_config.c

+0 −12
Original line number Diff line number Diff line
@@ -199,11 +199,7 @@ ivas_error ivas_ism_config( 
        diff = 0;

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

        {

#ifdef FIX_ISM_INACTIVE_BITS

            int16_t limit;

#else

            int32_t limit;

#endif



            limit = MIN_BRATE_SWB_BWE / FRMS_PER_SECOND;

            if ( element_brate[ch] < MIN_BRATE_SWB_STEREO ) /* replicate function set_bw() -> check the coded audio band-width */
@@ -223,20 +219,12 @@ ivas_error ivas_ism_config( 
            else if ( ism_imp[ch] == ISM_LOW_IMP )

            {

                tmp = (int16_t) ( BETA_ISM_LOW_IMP * bits_CoreCoder[ch] );

#ifdef FIX_ISM_INACTIVE_BITS

                tmp = max( limit, tmp );

#else

                tmp = (int16_t) max( limit, bits_CoreCoder[ch] - tmp );

#endif

            }

            else if ( ism_imp[ch] == ISM_MEDIUM_IMP )

            {

                tmp = (int16_t) ( BETA_ISM_MEDIUM_IMP * bits_CoreCoder[ch] );

#ifdef FIX_ISM_INACTIVE_BITS

                tmp = max( limit, tmp );

#else

                tmp = (int16_t) max( limit, bits_CoreCoder[ch] - tmp );

#endif

            }

            else /* ism_imp[ch] == ISM_HIGH_IMP */

            {

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 
#define BRATE_SWITCHING_RENDERING                       /* Bitrate switching changes related to the renderers */

#define FIX_150                                         /* Issue 150: Crash in EVS mono, HQ_HARMONIC mode, related to BASOP_NOGLOB */

#define FIX_VBR_COMPLEXITY                              /* Issue 234: fix extremely high complexity numbers for IVAS EVS mode */

#define FIX_ISM_INACTIVE_BITS                           /* Issue 230: fix bitbudget distribution in inactive frames in ISM format */

#define IMPROVE_CMDLINE_ROBUSTNESS                      /* Issue 233: Improve robustness of command-line parameters */

#define FIX_MDCT_AND_MC_MONO_ISSUES                     /* Issue 242: Fix some issues with TCX-LTP and delay alignement for mono output */

lib_enc/ivas_ism_metadata_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ static void rate_ism_importance( 
    {

        ctype = hSCE[ch]->hCoreCoder[0]->coder_type_raw;



#ifdef FIX_ISM_INACTIVE_BITS

        if ( hSCE[ch]->hCoreCoder[0]->tcxonly )

        {

            if ( hSCE[ch]->hCoreCoder[0]->localVAD == 0 )
@@ -117,7 +116,6 @@ static void rate_ism_importance( 
                ctype = GENERIC;

            }

        }

#endif



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

        {