Commit ba11d5e9 authored by vaclav's avatar vaclav
Browse files

merge REMOVE_EVS_DUPLICATES2 into REMOVE_EVS_DUPLICATES

parent acd836a8

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -176,5 +176,4 @@ 
#define FIX_ISSUE_1376                          /* VA: Fix for issue 1376 (issue with GSC excitation) */



#define REMOVE_EVS_DUPLICATES                   /* remove core-coder duplicated functions, ACELP low-band decoder */

#define REMOVE_EVS_DUPLICATES2

#endif

lib_com/prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -3284,7 +3284,7 @@ void synthesise_fb_high_band_fx( 
    Word16 bpf_memory_Q[],

    Word16 Qout );













#ifndef REMOVE_EVS_DUPLICATES2













#ifndef REMOVE_EVS_DUPLICATES















void prep_tbe_exc_fx(















    const Word16 L_frame_fx, /* i : length of the frame */















#ifdef ADD_IVAS_TBE_CODE

































lib_com/swb_tbe_com_fx.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -7324,7 +7324,7 @@ void tbe_celp_exc(













/* _ None */















/*======================================================================================*/





























#ifndef REMOVE_EVS_DUPLICATES2













#ifndef REMOVE_EVS_DUPLICATES















void prep_tbe_exc_fx(















    const Word16 L_frame_fx, /* i : length of the frame */















#ifdef ADD_IVAS_TBE_CODE

































lib_dec/acelp_core_dec_fx.c



+1
−2




























Original line number
Diff line number
Diff line








@@ -1658,8 +1658,7 @@ ivas_error acelp_core_dec_fx(













                hf_synth_reset_fx( st_fx->hBWE_zero );















            }















#else













            hf_synth_fx( st_fx->hBWE_zero, st_fx->core_brate, output_frame, Aq_fx, exc2_fx, syn_fx, synth_out, st_fx->Q_exc,













                         st_fx->Q_syn2, st_fx->hBWE_zero->delay_syn_hf_fx, &st_fx->hBWE_zero->memExp1, st_fx->hBWE_zero->mem_hp_interp_fx, st_fx->extl, st_fx->CNG_mode );













            hf_synth_fx( st_fx->hBWE_zero, st_fx->core_brate, output_frame, Aq_fx, exc2_fx, syn_fx, synth_out, st_fx->Q_exc, st_fx->Q_syn2 );































#endif















        }

































lib_dec/dec_LPD_fx.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -556,7 +556,7 @@ void decoder_LPD_fx(













                        move16();















                    }





























#ifdef REMOVE_EVS_DUPLICATES2













#ifdef REMOVE_EVS_DUPLICATES















                    int_lsp4_ivas_fx( L_frame, &lsp[0], lspmid, &lsp[M], Aq, M, st->relax_prev_lsf_interp );















#else















                    int_lsp4_fx( L_frame, &lsp[0], lspmid, &lsp[M], Aq, M, st->relax_prev_lsf_interp );