Commit 815e5d0a authored by Manuel Jander's avatar Manuel Jander
Browse files

Mergre conflict

parents b69b11e3 2805f2da

lib_com/prot_fx.h

+2 −29
Original line number Diff line number Diff line
@@ -3294,8 +3294,8 @@ void prep_tbe_exc_fx( 
    const Word16 gain_preQ_fx,   /* i  : prequantizer excitation gain           */

    const Word16 code_preQ_fx[], /* i  : prequantizer excitation                */

    const Word16 Q_exc,          /* i  : Excitation,           bwe_exc Q-factor */

    Word16 T0,                   /* i  : integer pitch variables             Q0 */

    Word16 T0_frac,              /* i  : Fractional pitch variables           Q0*/

    const Word16 T0,             /* i  : integer pitch variables             Q0 */

    const Word16 T0_frac,        /* i  : Fractional pitch variables           Q0*/

    const Word16 coder_type,     /* i  : coding type                            */

    const Word32 core_brate,     /* i  : core bitrate                           */

    const Word16 element_mode,   /* i  : element mode                           */
@@ -7382,19 +7382,6 @@ void configureFdCngDec_fx( 
    const Word16 element_mode );















Word16 ApplyFdCng_fx(













<<<<<<< HEAD













    Word16 *timeDomainInput, /* i  : pointer to time domain i   */













    Word16 Q,













    Word32 **cldfbBufferReal, /* i/o: real part of the CLDFB buffer */













    Word32 **cldfbBufferImag, /* i/o: imaginary part of the CLDFB buffer */













    Word16 *cldfbBufferScale, /* o  : pointer to the scalefactor for real and imaginary part of the CLDFB buffer */













    Decoder_State *st,













    const Word16 concealWholeFrame, /* i  : binary flag indicating frame loss */













    Word16 is_music );













#endif













Word16 ApplyFdCng_ivas_fx(













=======













>>>>>>> 2afc0761 (accept REMOVE_EVS_DUPLICATES)















    Word16 *timeDomainInput, /* i  : pointer to time domain input */















    Word16 Q,















    Word32 *powerSpectrum,










@@ -9485,15 +9472,8 @@ 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,









@@ -9515,18 +9495,11 @@ 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 *q_win );













#else















    Word16 q_win );













#endif





























void v_mult16_fixed(















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

































lib_dec/acelp_core_dec_fx.c



+25
−25


























File changed.
Contains only whitespace changes.