Commit 0a46a2b5 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Fix for inconsistent issues

parent 08c5b51b

lib_com/cldfb.c

+4 −0
Original line number Diff line number Diff line
@@ -2468,6 +2468,10 @@ void cldfb_restore_memory_ivas_fx( 
    }

    hs->cldfb_state_length = size;

    hs->memory_length = 0;

#if 1 //Remove later

    free(hs->memory_flt);

    hs->memory_flt = NULL;

#endif

    free( hs->memory32 );

    hs->memory32 = NULL;

lib_com/ivas_prot_fx.h

+4 −0
Original line number Diff line number Diff line
@@ -1973,7 +1973,11 @@ void ivas_mct_side_bits_fx( 
    const Word16 nb_bits_metadata       /* i  : number of metadata bits */

);



#ifdef BASOP_NOGLOB      /*Critical overflow */

Flag conv_fx_32(

#else

void conv_fx_32(

#endif

    const Word16 x[],   /* i  : i   vector                              Q_new*/

    const Word16 h[],   /* i  : impulse response (or second i   vector) Q(15)*/

    Word32 y[],   /* o  : output vetor (result of convolution)      12 bits*/

lib_com/ivas_stereo_ica_com_fx.c

+2 −14
Original line number Diff line number Diff line
@@ -188,20 +188,8 @@ static void interpTargetChannel_fx( 
            ptr2_fx[i] = 0;

            /* lim1 = ceil((i - SINC_ORDER1)*SPREAD_FACTOR1); */

            /* lim2 = floor((i + SINC_ORDER1)*SPREAD_FACTOR1); */

            temp_int = shr( ( i - SINC_ORDER1 ), 1 );

            tempF_fx = ( i - SINC_ORDER1 ) % 2; //*SPREAD_FACTOR1

            lim1 = (Word16) ( temp_int );

            IF( tempF_fx == 1 )

            {

                lim1++;

            }

            tempF_fx = ( i + SINC_ORDER1 ) % 2;       //*SPREAD_FACTOR1

            temp_int = shr( ( i + SINC_ORDER1 ), 1 ); //*SPREAD_FACTOR1

            lim2 = (Word16) ( temp_int );

            IF( tempF_fx == -1 )

            {

                lim2--;

            }

            lim1 = add(shr((i - SINC_ORDER1), 1), 1);

            lim2 = shr((i + SINC_ORDER1), 1);

            FOR( j = lim1; j <= lim2; j++ )

            {

                ptr2_fx[i] = L_add( Mpy_32_32( win_fx[j * INTERP_FACTOR1 - i], ptr1_fx[j] ), ptr2_fx[i] );

lib_com/tools_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1370,7 +1370,11 @@ void conv_fx( 
 * convolution are considered.

 *-------------------------------------------------------------------*/



#ifdef BASOP_NOGLOB      /*Critical overflow */

Flag conv_fx_32(

#else

void conv_fx_32(

#endif

    const Word16 x[],   /* i  : input vector                              Q_new*/

    const Word16 h[],   /* i  : impulse response (or second input vector) Q(15)*/

    Word32 y[],   /* o  : output vetor (result of convolution)      12 bits*/

lib_dec/acelp_core_switch_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ ivas_error acelp_core_switch_dec_bfi_ivas_fx( 
  Copy_Scale_sig_32_16(synth32, synth_out, L_FRAME48k, -5);



    /* output to Q0 */

	Copy_Scale_sig32_16(syn32, synth_out, L_FRAME48k, -5);

    Copy_Scale_sig32_16(syn32, synth_out, L_FRAME16k, -5);

    //Scale_sig(synth_out,L_FRAME48k, negate(st_fx->Q_syn));



    cldfb_restore_memory_ivas_fx( st_fx->cldfbSyn );