Commit 1ad71464 authored by Arash Azizi's avatar Arash Azizi
Browse files

issue 2479: fixing removed switch - replacing leg_flag with EVS_MONO and... 

issue 2479: fixing removed switch - replacing leg_flag with EVS_MONO and removing leg_flag's definition and initiation
parent 1985d25f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
#define FIX_2455_HARMONIZE_configureFdCngEnc            /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

#define FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC            /* Nokia: Fix to convert non-converted binary operations */

#define FIX_2455_HARMONIZE_generate_comfort_noise_enc /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

#define FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC            /* Nokia: Fix to convert non-converted binary operations */

#define FIX_2455_HARMONIZE_configureFdCngEnc          /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

#define FIX_2479_HARM_PITCH_GAIN                        /* FhG: basop issue 2479: Harmonize tcx_ltp_pitch_search_*(), tcx_ltp_find_gain_*fx() */

lib_enc/tcx_ltp_enc_fx.c

+1 −3
Original line number Diff line number Diff line
@@ -693,8 +693,6 @@ void tcx_ltp_encode_fx( 
    Word16 Aest[M + 1];

    Word16 alpha, step;

#ifdef FIX_2479_HARM_PITCH_GAIN

    Word16 leg_flag;

    leg_flag = 1;

    Word16 border_case;

#endif // FIX_2479_HARM_PITCH_GAIN

    norm_corr = 0;
@@ -731,7 +729,7 @@ void tcx_ltp_encode_fx( 
#ifndef FIX_2479_HARM_PITCH_GAIN

        tcx_ltp_pitch_search( Top, pitch_int, pitch_fr, &ltp_param[1], &norm_corr, L_frame, wsp, pitmin, pitfr1, pitfr2, pitmax, pitres );

#else

        tcx_ltp_pitch_search_fx( Top, pitch_int, pitch_fr, &ltp_param[1], &norm_corr, L_frame, wsp, pitmin, pitfr1, pitfr2, pitmax, pitres, 1, &border_case, leg_flag );

        tcx_ltp_pitch_search_fx( Top, pitch_int, pitch_fr, &ltp_param[1], &norm_corr, L_frame, wsp, pitmin, pitfr1, pitfr2, pitmax, pitres, 1, &border_case, EVS_MONO );

#endif // !FIX_2479_HARM_PITCH_GAIN