Commit d7c4f4ac authored by vaillancour's avatar vaillancour
Browse files

replacing norm_corr_ivas_fx with EVS version

parent 320799e1

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

lib_enc/acelp_core_switch_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static void encod_gen_voic_core_switch_fx( 
    set16_fx( dummyF, -1, NB_SUBFR16k ); /* hack to signal ACELP->HQ switching frame */

    pitch = pit_encode_fx( hBstr,

                           st_fx->acelp_cfg.pitch_bits, core_bitrate, 0, L_frame, GENERIC, &pitch_limit_flag, 0, exc, L_SUBFR, T_op, &T0_min, &T0_max, &T0, &T0_frac, h1, xn, 0 /*hStereoTD->tdm_Pitch_reuse_flag*/, dummyF /*hStereoTD->tdm_Pri_pitch_buf*/

#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR

#if defined REUSE_EVS_BE_ACELP_PITCH 

                           ,

                           st_fx->element_mode, Q_new

#endif
@@ -629,7 +629,7 @@ static void encod_gen_voic_core_switch_ivas_fx( 
#else

    pitch = pit_encode_fx( hBstr,

                           st_fx->acelp_cfg.pitch_bits, core_bitrate, 0, L_frame, GENERIC, &pitch_limit_flag, 0, exc, L_SUBFR, T_op, &T0_min, &T0_max, &T0, &T0_frac, h1, xn, 0 /*hStereoTD->tdm_Pitch_reuse_flag*/, dummyF /*hStereoTD->tdm_Pri_pitch_buf*/

#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR

#if defined REUSE_EVS_BE_ACELP_PITCH 

                           ,

                           st_fx->element_mode, Q_new

#endif

lib_enc/enc_amr_wb_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ void encod_amr_wb_fx( 


        *pt_pitch = pit_encode_fx( hBstr, st->acelp_cfg.pitch_bits, st->core_brate, 1, L_FRAME, -1, &pitch_limit_flag, i_subfr, exc,

                                   L_SUBFR, T_op, &T0_min, &T0_max, &T0, &T0_frac, h1, xn, 0 /*hStereoTD->tdm_Pitch_reuse_flag*/, NULL /*hStereoTD->tdm_Pri_pitch_buf*/

#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR

#if defined REUSE_EVS_BE_ACELP_PITCH 

                                   ,

                                   0, Q_new

#endif

lib_enc/enc_gen_voic_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ void encod_gen_voic_fx( 


        *pt_pitch_fx = pit_encode_fx( hBstr, st_fx->acelp_cfg.pitch_bits, st_fx->core_brate, 0, L_frame, st_fx->coder_type, &pitch_limit_flag, i_subfr_fx, exc_fx,

                                      L_SUBFR, st_fx->pitch, &T0_min_fx, &T0_max_fx, &T0_fx, &T0_frac_fx, h1_fx, xn_fx, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf

#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR

#if defined REUSE_EVS_BE_ACELP_PITCH 

                                      ,

                                      st_fx->element_mode, Q_new

#endif
@@ -613,7 +613,7 @@ void encod_gen_voic_ivas_fx( 
#else

        *pt_pitch_fx = pit_encode_fx( hBstr, st_fx->acelp_cfg.pitch_bits, st_fx->core_brate, 0, L_frame, st_fx->coder_type, &pitch_limit_flag, i_subfr_fx, exc_fx,

                                      L_SUBFR, st_fx->pitch, &T0_min_fx, &T0_max_fx, &T0_fx, &T0_frac_fx, h1_fx, xn_fx, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf

#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR

#if defined REUSE_EVS_BE_ACELP_PITCH 

                                      ,

                                      st_fx->element_mode, Q_new

#endif

lib_enc/enc_pit_exc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ void enc_pit_exc_fx( 
         *----------------------------------------------------------------*/

        *pt_pitch = pit_encode_fx( hBstr, st_fx->acelp_cfg.pitch_bits, Pitch_BR, 0, st_fx->L_frame, Pitch_CT, &pitch_limit_flag, i_subfr, exc,

                                   L_subfr, st_fx->pitch, &T0_min, &T0_max, T0, T0_frac, h1, xn, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf

#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR

#if defined REUSE_EVS_BE_ACELP_PITCH 

                                   ,

                                   st_fx->element_mode, Q_new

#endif
@@ -755,7 +755,7 @@ void enc_pit_exc_ivas_fx( 
#else

        *pt_pitch = pit_encode_fx( hBstr, st_fx->acelp_cfg.pitch_bits, Pitch_BR, 0, st_fx->L_frame, Pitch_CT, &pitch_limit_flag, i_subfr, exc,

                                   L_subfr, st_fx->pitch, &T0_min, &T0_max, T0, T0_frac, h1, xn, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf

#if defined REUSE_EVS_BE_ACELP_PITCH && !defined REUSE_EVS_ACELP_PITCH_NORM_CORR

#if defined REUSE_EVS_BE_ACELP_PITCH 

                                   ,

                                   st_fx->element_mode, Q_new

#endif