Commit a50af5b8 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'ivas_enc_preproc_front_ivas_acelp_core' into 'main' 

Preprocess front ivas and acelp core encoder functions converted

See merge request !442
parents 6febda76 74c6c062

lib_com/cldfb.c

+571 −35

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/cldfb_evs.c

+1 −1
Original line number Diff line number Diff line
@@ -1286,7 +1286,7 @@ void GetEnergyCldfb( Word32 *energyLookahead, /*!< o: Q(*sf_energyLookahead) 
        }

    }



    IF( GE_16( numberBands, freqTable[1] ) )

    IF( GE_16( numberBands, freqTable[1] ) && hTecEnc != NULL )

    {

        Word32 *tempEnergyValuesArry[CLDFB_NO_COL_MAX];

        Word16 ScaleX2;

lib_com/cng_exc_fx.c

+3 −2
Original line number Diff line number Diff line
@@ -307,9 +307,10 @@ IF( NE_16( Opt_AMR_WB, 1 ) ) 
    /* calculate the spectrum of random excitation signal */

    Copy( exc2, fft_io, L_frame );



    Word16 Q_new_inp, mem_decim_size; // TO be removed

    IF( EQ_16( L_frame, L_FRAME16k ) )

    {

        modify_Fs_fx( fft_io, L_FRAME16k, 16000, fft_io, 12800, exc_mem1, 0 );

        modify_Fs_fx( fft_io, L_FRAME16k, 16000, fft_io, 12800, exc_mem1, 0, &Q_new_inp, &mem_decim_size );

    }



    /* fft_rel(fft_io, L_FFT, LOG2_L_FFT); */
@@ -443,7 +444,7 @@ IF( NE_16( Opt_AMR_WB, 1 ) ) 


    IF( EQ_16( L_frame, L_FRAME16k ) )

    {

        modify_Fs_fx( fft_io, L_FFT, 12800, fft_io, 16000, exc_mem, 0 );

        modify_Fs_fx( fft_io, L_FFT, 12800, fft_io, 16000, exc_mem, 0, &Q_new_inp, &mem_decim_size );

    }



    /* enr1 = dotp( fft_io, fft_io, L_frame ) / L_frame; */

lib_com/cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -2881,6 +2881,7 @@ typedef enum SIGNAL_CLASSIFER_MODE 
#define SCALE_GAIN_ANA_16             ( 3 )

#define SCALE_GAIN_ANA_20             ( 3 )

#define SCALE_GAIN_ANA_32             ( 2 )

#define SCALE_GAIN_ANA_30             ( 2 )

#define SCALE_GAIN_ANA_40             ( 2 )

#define SCALE_GAIN_ANA_60             ( 1 )
@@ -2892,6 +2893,7 @@ typedef enum SIGNAL_CLASSIFER_MODE 
#define SCALE_CLDFB_ANA_32              ( SCALE_MODULATION + SCALE_GAIN_ANA_32  )

#define SCALE_CLDFB_ANA_40              ( SCALE_MODULATION + SCALE_GAIN_ANA_40  )

#define SCALE_CLDFB_ANA_60              ( SCALE_MODULATION + SCALE_GAIN_ANA_60  )

#define SCALE_CLDFB_ANA_30              ( SCALE_MODULATION + SCALE_GAIN_ANA_30  )



#define SCALE_CLDFB_SYN_10              ( SCALE_MODULATION + SCALE_GAIN_SYN )

#define SCALE_CLDFB_SYN_16              ( SCALE_MODULATION + SCALE_GAIN_SYN )
@@ -2899,6 +2901,7 @@ typedef enum SIGNAL_CLASSIFER_MODE 
#define SCALE_CLDFB_SYN_32              ( SCALE_MODULATION + SCALE_GAIN_SYN )

#define SCALE_CLDFB_SYN_40              ( SCALE_MODULATION + SCALE_GAIN_SYN )

#define SCALE_CLDFB_SYN_60              ( SCALE_MODULATION + SCALE_GAIN_SYN )

#define SCALE_CLDFB_SYN_30              ( SCALE_MODULATION + SCALE_GAIN_SYN )



/************************************************************************/

/* FFT                                                                  */

lib_com/ivas_mdct_imdct_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ void ivas_imdct_fx( 
 *

 * Sets/Maps the fft twiddle tables based on fft length

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



#ifdef IVAS_FLOAT_FIXED

void ivas_get_twid_factors_fx1(

    const Word16 length,

    const Word16 **pTwid_re,
@@ -388,7 +388,7 @@ void ivas_get_twid_factors_fx1( 


    return;

}



#endif



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

 * Function ivas_get_mdct_scaling_gain_fx()