Commit bc7075b7 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_680_ACELP_TABLE_OMASA

parent 54bf1672

lib_com/bits_alloc.c

+0 −15
Original line number Diff line number Diff line
@@ -394,9 +394,7 @@ static ivas_error acelp_FCB_allocator( 
    int16_t nBits_tmp;

    int16_t *p_fixed_cdk_index;

    ivas_error error;

#ifdef FIX_680_ACELP_TABLE_OMASA

    int16_t max_n;

#endif



    error = IVAS_ERR_OK;
@@ -427,7 +425,6 @@ static ivas_error acelp_FCB_allocator( 
    }



    /* distribute the bit-budget equally between subframes */

#ifdef FIX_680_ACELP_TABLE_OMASA

    if ( L_subfr > L_SUBFR ) /* access fast_FCB_bits_2sfr */

    {

        max_n = 6;
@@ -444,14 +441,6 @@ static ivas_error acelp_FCB_allocator( 
        }

    }

    cdbk--;

#else

    cdbk = 0;

    while ( fcb_table( cdbk, L_subfr ) * nb_subfr <= *nBits )

    {

        cdbk++;

    }

    cdbk--;

#endif

#ifdef DEBUGGING

    if ( cdbk < 0 && coder_type != TRANSITION )

    {
@@ -476,10 +465,8 @@ static ivas_error acelp_FCB_allocator( 
    *nBits -= nBits_tmp * nb_subfr;



    /* try to increase the FCB bit-budget of the first subframe(s) */

#ifdef FIX_680_ACELP_TABLE_OMASA

    if ( cdbk < ACELP_FIXED_CDK_NB - 1 )

    {

#endif

        step = fcb_table( cdbk + 1, L_subfr ) - nBits_tmp;

        while ( *nBits >= step )

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

            }

        }

#ifdef FIX_680_ACELP_TABLE_OMASA

    }

#endif

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

    if ( tc_subfr >= L_SUBFR )

    {

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ 






#define FIX_680_ACELP_TABLE_OMASA                       /* Nokia: Fix for issue 680 preventing overindexing of PulseConfTable */

#define FIX_685_BER_IN_HVQ                              /* Eri: Fix for issue 685. Invalid configuration in EVS now happening in IVAS with variable rate core. Remove BER warning for IVAS. */



#define FIX_674_MISSING_TABLES_FOR_TDREND_REVERB        /* Eri: add tables for 32kHz, 16kHz (and update 48kHz) for left/right energies and coherence for late reverb in TD renderer path. Also read tables from binary when hrtf binaries are used. */