Commit ee6d00ba authored by vaclav's avatar vaclav
Browse files

fix compilation with FIX_I4_OL_PITCH

parent 23bf59b5

lib_enc/evs_enc_fx.c

+7 −5
Original line number Diff line number Diff line
@@ -176,17 +176,19 @@ ivas_error evs_enc_fx( 
     *---------------------------------------------------------------------*/



#ifdef FIX_I4_OL_PITCH

#ifdef HARMONIZE_ACELP_ENC

    pre_proc_fx( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, &Etot, &ener, A, Aw, epsP, lsp_new, lsp_mid, &vad_hover_flag,

#else

    pre_proc_fx( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, &Etot, &ener, A, Aw, epsP_h, epsP_l, epsP, lsp_new, lsp_mid, &vad_hover_flag,

#endif

                 &attack_flag, new_inp_resamp16k, &Voicing_flag, realBuffer, imagBuffer, &cldfbScale, hLPDmem->old_exc, &hq_core_type, &Q_new, &shift, Q_r );

#else

    pre_proc_fx( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, &Etot, &ener,

#ifdef HARMONIZE_ACELP_ENC

                 pitch_orig, A, Aw, epsP, lsp_new, lsp_mid, &vad_hover_flag,

    pre_proc_fx( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, &Etot, &ener, pitch_orig, A, Aw, epsP, lsp_new, lsp_mid, &vad_hover_flag,

#else

                 pitch_orig, A, Aw, epsP_h, epsP_l, epsP, lsp_new, lsp_mid, &vad_hover_flag,

    pre_proc_fx( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, &Etot, &ener, pitch_orig, A, Aw, epsP_h, epsP_l, epsP, lsp_new, lsp_mid, &vad_hover_flag,

#endif

                 &attack_flag, new_inp_resamp16k, &Voicing_flag, realBuffer, imagBuffer, &cldfbScale, hLPDmem->old_exc,

                 &hq_core_type, &Q_new, &shift, Q_r );

                 &attack_flag, new_inp_resamp16k, &Voicing_flag, realBuffer, imagBuffer, &cldfbScale, hLPDmem->old_exc, &hq_core_type, &Q_new, &shift, Q_r );

#endif



    IF( EQ_16( st->mdct_sw, MODE2 ) )