Commit 9aea06c2 authored by Manuel Jander's avatar Manuel Jander
Browse files

Restore changes lost because of merge conflict.

parent 25546392

lib_com/prot_fx.h

+14 −0
Original line number Diff line number Diff line
@@ -9472,8 +9472,15 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T 
void IMDCT_ivas_fx(

    Word32 *x_fx,

    Word16 q_x,

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT_QWIN

    Word16 *old_syn_overl_fx,

    Word16 *Q_old_syn_overl_fx,

    Word16 *syn_Overl_TDAC_fx,

    Word16 *Q_syn_Overl_TDAC_fx,

#else

    Word16 *old_syn_overl_fx,

    Word16 *syn_Overl_TDAC_fx,

#endif

    Word16 *xn_buf_fx,

    const Word16 *tcx_aldo_window_1_fx,

    const PWord16 *tcx_aldo_window_1_trunc_fx,
@@ -9495,11 +9502,18 @@ void IMDCT_ivas_fx( 
    const Word16 frame_cnt,

    const Word16 bfi,

    Word16 *old_out_fx,

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT_DYNAMIC_QOLD

    Word16 *q_old_out_fx,

#endif

    const Word16 FB_flag,

    Decoder_State *st,

    const Word16 fullbandScale,

    Word16 *acelp_zir_fx,

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT_QWIN

    Word16 *pq_win );

#else

    Word16 q_win );

#endif















void v_mult16_fixed(















    const Word16 x1[], /* i  : Input vector 1                                   */