Commit 47860291 authored by vaillancour's avatar vaillancour
Browse files

fix GCC

parent 726fb15a

lib_com/prot_fx.h

+6 −2
Original line number Diff line number Diff line
@@ -2386,8 +2386,12 @@ void ivas_synth_mem_updt2_fx( 
    Word16 mem_syn_r[],        /* i/o: synthesis filter memory                 */

    Word16 mem_syn2[],         /* o  : synthesis filter memory for find_target */

    Word16 mem_syn[],          /* o  : synthesis filter memory for find_target */

    const Word16 dec,          /* i  : flag for decoder indication             */

    Word16 Q );

    const Word16 dec

#ifndef FIX_907_MEM_UPDATE_ISSUE

    , /* i  : flag for decoder indication             */

    Word16 Q

#endif

    );  

#endif















































lib_com/syn_filt_fx.c



+10
−2




























Original line number
Diff line number
Diff line








@@ -425,12 +425,20 @@ void ivas_synth_mem_updt2_fx(













    Word16 mem_syn_r[],        /* i/o: synthesis filter memory                 */















    Word16 mem_syn2[],         /* o  : synthesis filter memory for find_target */















    Word16 mem_syn[],          /* o  : synthesis filter memory for find_target */













    const Word16 dec,          /* i  : flag for decoder indication             */













    Word16 Q )













    const Word16 dec













#ifndef FIX_907_MEM_UPDATE_ISSUE













    ,          /* i  : flag for decoder indication             */













    Word16 Q 













#endif













)















{















    Word16 mem_syn_r_size_old, mem_syn_r_size_new;















    Word32 en1, en2;













#ifndef FIX_907_MEM_UPDATE_ISSUE















    Word16 en1_e, en2_e, loc_rat, loc_rat_e, tmp, tmp_e, i;













#else













    Word16 en1_e, en2_e, loc_rat, tmp, i;













#endif















    Word32 tmp1, tmp2;































    /* Residual and update old_exc */

































lib_dec/acelp_core_dec_ivas_fx.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -463,7 +463,7 @@ ivas_error acelp_core_dec_ivas_fx(













#ifndef FIX_907_MEM_UPDATE_ISSUE















        synth_mem_updt2( st->L_frame, st->last_L_frame, st->old_exc_fx, st->mem_syn_r, st->mem_syn2_fx, NULL, dec );















#else













        ivas_synth_mem_updt2_fx( st->L_frame, st->last_L_frame, st->old_exc_fx, st->mem_syn_r, st->mem_syn2_fx, NULL, dec, st->Q_syn );













        ivas_synth_mem_updt2_fx( st->L_frame, st->last_L_frame, st->old_exc_fx, st->mem_syn_r, st->mem_syn2_fx, NULL, dec );















#endif















        Copy( st->old_exc_fx, old_exc_fx, L_EXC_MEM_DEC );















        Copy_Scale_sig( st->mem_syn2_fx, st->mem_syn1_fx, M, sub( -1, st->Q_syn ) ); /*Q-1*/

































lib_dec/core_dec_init_fx.c



+4
−0




























Original line number
Diff line number
Diff line








@@ -1673,7 +1673,11 @@ void open_decoder_LPD_ivas_fx(













            move16();















            IF( !st->last_con_tcx )















            {













#ifndef FIX_907_MEM_UPDATE_ISSUE















                ivas_synth_mem_updt2_fx( st->L_frame, st->last_L_frame, st->old_exc_fx, st->mem_syn_r, st->mem_syn2_fx, NULL, DEC, st->Q_syn );













#else













                ivas_synth_mem_updt2_fx( st->L_frame, st->last_L_frame, st->old_exc_fx, st->mem_syn_r, st->mem_syn2_fx, NULL, DEC );













#endif















            }































            /*mem of deemphasis stayed unchanged.*/