Commit fa93785e authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_694_OMASA_ACELP

parent 61b05a1c

lib_com/bits_alloc.c

+0 −4
Original line number Diff line number Diff line
@@ -476,10 +476,8 @@ static ivas_error acelp_FCB_allocator( 
        }



        /* try to increase the FCB of the first subframe in cases when the next step is lower than the current step */

#ifdef NONBE_FIX_694_OMASA_ACELP

        if ( fixed_cdk_index[sfr] < ACELP_FIXED_CDK_NB - 1 )

        {

#endif

            step = fcb_table( fixed_cdk_index[sfr] + 1, L_subfr ) - fcb_table( fixed_cdk_index[sfr], L_subfr );

            if ( *nBits >= step && cdbk >= 0 )

            {
@@ -493,9 +491,7 @@ static ivas_error acelp_FCB_allocator( 
                    *nBits -= step;

                }

            }

#ifdef NONBE_FIX_694_OMASA_ACELP

        }

#endif

    }

    /* TRANSITION coding: allocate highest FCBQ bit-budget to the subframe with the glottal-shape codebook */

    if ( tc_subfr >= L_SUBFR )

lib_com/ivas_stereo_td_bit_alloc.c

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

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



#ifdef NONBE_FIX_694_OMASA_ACELP

        if ( coder_type == INACTIVE )

        {

            *total_brate_sec = max( *total_brate_sec, tdm_bit_allc_tbl[0][0] ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */
@@ -317,9 +316,6 @@ void tdm_bit_alloc( 
        {

            *total_brate_sec = max( *total_brate_sec, 3500 ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */

        }

#else

        *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
@@ -175,7 +175,6 @@ 
/* all switches in this category should start with "NONBE_" */





#define NONBE_FIX_694_OMASA_ACELP                             /* Nokia: Issue #694: OMASA crash in ACELP with extreme item */

#define NONBE_FIX_770_PLANAR_SBA_JBM                          /* FhG  : Issue #770: Crash in planar FOA decoding with JBM caused by uninitialized value */

#define NONBE_FIX_760_COHERENCE_MASA                          /* Nokia: Issue 760: fixes decoder crash for some cases when all energy ratios are 1 */

#define NONBE_FIX_752_OSBA_MISCONFIG_MCT                      /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/