Commit 7f8c8cf6 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_694_OMASA_EXTREME

parent 406c8aac

lib_com/ivas_omasa_com.c

+0 −6
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ int32_t ivas_interformat_brate( 
                  ( ism_mode == ISM_MASA_MODE_DISC && element_brate == 9600 ) /* this condition corresponds to the ivas_total_brate = 24400 and 1 object */

        )

        {

#ifdef FIX_694_OMASA_EXTREME

            if ( ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && element_brate == IVAS_13k2 )

            {

                if ( ism_imp == ISM_LOW_IMP )
@@ -257,7 +256,6 @@ int32_t ivas_interformat_brate( 
            }

            else

            {

#endif

                if ( ism_imp == ISM_LOW_IMP )

                {

                    nBits = (int16_t) ( nBits * GAMMA_ISM_LOW_IMP3 );
@@ -270,11 +268,8 @@ int32_t ivas_interformat_brate( 
                {

                    nBits = (int16_t) ( nBits * GAMMA_ISM_HIGH_IMP3 );

                }

#ifdef FIX_694_OMASA_EXTREME

            }

#endif

        }

#ifdef FIX_694_OMASA_EXTREME

        else if ( ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ && element_brate == 16000 )

        {

            if ( ism_imp == ISM_LOW_IMP )
@@ -290,7 +285,6 @@ int32_t ivas_interformat_brate( 
                nBits = (int16_t) ( nBits * GAMMA_ISM_HIGH_IMP3 );

            }

        }

#endif

        else

        {

            if ( ism_imp == ISM_LOW_IMP )

lib_com/ivas_stereo_td_bit_alloc.c

+0 −2
Original line number Diff line number Diff line
@@ -308,9 +308,7 @@ void tdm_bit_alloc( 
    {

        *total_brate_sec = min( *total_brate_sec, element_brate_wo_meta - ( 5900 + BWE_brate ) );



#ifdef FIX_694_OMASA_EXTREME

        *total_brate_sec = max( *total_brate_sec, tdm_bit_allc_tbl[idx][coder_type] ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */

#endif

    }



    /* Secondary channel bitrate adjusment                                                      */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ 
#define OSBA_SPLIT_RENDERING

#endif



#define FIX_694_OMASA_EXTREME                           /* Nokia: fix for crash in OMASA on extreme sample */

#define FIX_679_JBM_MC2SBA                              /* FhG: fix issue 679: check for transport vs. internal channel count in JBM prior to ivas_mc2sba() */

#define FIX_591_PARAMISM_JBM_ENER_CORRECTION            /* FhG: fix energy correction in ParamISM rendering */

#define FIX_551_HEADTRACKER_INIT                        /* FhG: move setting of orientation tracking type to earlier    */