Commit a96b651a authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2585_BIT_ALLOCATION_DIFF

parent c8406cae

lib_com/gs_bitallocation.c

+0 −8
Original line number Diff line number Diff line
@@ -1022,21 +1022,13 @@ static Word16 Find_bit_alloc_IVAS( 
            sum_bit = L_add( sum_bit, L_sub( bits_per_bands[i], Q18_112 ) );

            /* bits_per_bands[i] = 112; */

            bits_per_bands[i] = Q18_112;

#ifndef FIX_2585_BIT_ALLOCATION_DIFF

            j = add( j, add( i, 1 ) );

#else

            j = add( i, 1 );

#endif

        }

        /* safety check for overage bit reallocation */

        /* else if (bits_per_bands[i] + sum_bit / 3 > 112) */

        else if ( L_add( bits_per_bands[i], Mpy_32_16_1( sum_bit, Q15_0_33 ) ) > Q18_112 )

        {

#ifndef FIX_2585_BIT_ALLOCATION_DIFF

            j = add( j, add( i, 1 ) );

#else

            j = add( i, 1 );

#endif

        }

    }

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ 
/* any switch which is non-be wrt. TS 26.258 V3.0 */



#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define FIX_2585_BIT_ALLOCATION_DIFF                    /* VA : issue 2585, bit allocation different behaviors between float and fixed-point for corner cases */

#define FIX_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI         /* Nokia: BASOP issue 2442: Aligns float with identical diffuse gain limitation to minimize diff */



/* ##################### End NON-BE switches ########################### */