Commit 33d9c411 authored by vaillancour's avatar vaillancour
Browse files

addition of REUSE_EVS_ACELP_PITCH_NORM_CORR, which uses EVS norm_corr_fx... 

addition of REUSE_EVS_ACELP_PITCH_NORM_CORR, which uses EVS norm_corr_fx instead of norm_corr_ivas_fx. This will affect exc BE
parent eaafacd5

lib_com/options.h

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


#define REUSE_EVS_ACELP_corr_xh_fx    // this one could be non-bit-exact on very low level signal, as summation is initialized with 1 instead of 0

#define REUSE_EVS_GAUSS_L2  // The gain is computed slightly differently, gauss_L2_ivas_fx was actually not using the right scaling. not BE 

#define REUSE_EVS_ACELP_PITCH_NORM_CORR // -> computation slightly different, make the pitch not BE, could be harmonized but won't be BE



#endif

#define FIX_ISSUE_1817_REPLACE_CARRY_OVERFLOW  /* FhG: bit-exact, replace carry and overflow operations by 64-bit operations, MR 1931 */

lib_enc/pit_enc_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -1645,7 +1645,7 @@ Word16 pitch_fr4_fx( /* o : chosen integer pitch lag 


    return ( t0 );

}



#ifndef REUSE_EVS_ACELP_PITCH_NORM_CORR

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

 * norm_corr()

 *
@@ -1751,7 +1751,7 @@ void norm_corr_ivas_fx( 


    return;

}



#endif



void norm_corr_fx(

    const Word16 exc[],  /* i  : excitation buffer                          Q_new*/

lib_enc/prot_fx_enc.h

+2 −1
Original line number Diff line number Diff line
@@ -937,6 +937,7 @@ void norm_corr_fx( 
    const Word16 L_subfr /* i  : subframe size                              */

);



#ifndef REUSE_EVS_ACELP_PITCH_NORM_CORR

void norm_corr_ivas_fx(

    const Word16 exc[],   /* i  : excitation buffer                          Q_new                */

    const Word16 xn[],    /* i  : target signal                              Q_new-1              */
@@ -947,7 +948,7 @@ void norm_corr_ivas_fx( 
    const Word16 L_subfr, /* i  : subframe size                                                   */

    Word16 Q_new          /* i                                                                    */

);



#endif

Word16 peak_avrg_ratio_fx(

    const Word32 total_brate,  /* Q0 */

    const Word32 *input_hi_fx, /* i  : i   signal           Q_coeff*/