Commit b02c3b15 authored by advasila's avatar advasila
Browse files

fix overindexing in ACELP table

parent 15e51883

lib_com/bits_alloc.c

+44 −17
Original line number Diff line number Diff line
@@ -394,6 +394,9 @@ 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;
@@ -424,13 +427,31 @@ 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;

    }

    else

    {

        max_n = ACELP_FIXED_CDK_NB;

    }

    for ( cdbk = 0; cdbk < max_n; cdbk++ )

    {

        if ( fcb_table( cdbk, L_subfr ) * nb_subfr > *nBits )

        {

            break;

        }

    }

    cdbk--;

#else

    cdbk = 0;

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

    {

        cdbk++;

    }

    cdbk--;



#endif

#ifdef DEBUGGING

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

    {
@@ -455,6 +476,10 @@ 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 )

        {
@@ -477,7 +502,9 @@ 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

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ 
#define FIX_653_BUG_IN_SKIP_MATRIX                      /* Dlb: fix for issue #653, bug in the ivas_spar_get_skip_mat function*/

#define FIX_663_PARAM_ISM_EXT                           /* FhG: Issue 663: ParamISM EXT output improvement */

#define FIX_673_OMASA_OBJ_MD_SYNC                       /* Nokia: Fix issue 673 by updating metadata in the third subframe to account for audio delay. */



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



/* ################## End BE DEVELOPMENT switches ######################### */