Commit 23bf59b5 authored by vaclav's avatar vaclav
Browse files

fix

parent fedb08ef

lib_enc/acelp_core_enc_fx.c

+11 −8
Original line number Diff line number Diff line
@@ -765,8 +765,6 @@ ivas_error acelp_core_enc_ivas_fx( 
    hLPDmem = st->hLPDmem;



#ifdef HARMONIZE_ACELP_ENC

    set16_fx( old_exc_fx, 0, L_EXC );



    IF( st->element_mode > EVS_MONO )

#endif

    {
@@ -822,7 +820,9 @@ ivas_error acelp_core_enc_ivas_fx( 


    exc_fx = old_exc_fx + L_EXC_MEM;                 /* pointer to excitation signal in the current frame */

    Copy( hLPDmem->old_exc, old_exc_fx, L_EXC_MEM ); /* Q_new */

#ifndef HARMONIZE_ACELP_ENC

#ifdef HARMONIZE_ACELP_ENC

    set16_fx( old_exc_fx + L_EXC_MEM, 0, L_EXC - L_EXC_MEM );

#else

    Scale_sig( old_exc_fx, L_EXC_MEM, sub( Q_new, hLPDmem->q_lpd_old_exc ) ); // Q_new

#endif

    IF( st->hBWE_TD != NULL )
@@ -1211,12 +1211,15 @@ ivas_error acelp_core_enc_ivas_fx( 


        /*Update MODE2 core switching memory*/

#ifdef HARMONIZE_ACELP_ENC

        tmpF_fx = hLPDmem->syn[M];

        move16();

        E_UTIL_deemph2( sub( Q_new, 1 ), syn1_fx, st->preemph_fac, st->L_frame, &tmpF_fx );

#else

        deemph_fx( syn1_fx, st->preemph_fac, st->L_frame, &( hLPDmem->syn[M] ) );

        IF( st->element_mode == EVS_MONO )

        {

            E_UTIL_deemph2( sub( Q_new, 1 ), syn1_fx, st->preemph_fac, st->L_frame, &hLPDmem->syn[M] );

        }

        ELSE

#endif

        {

            deemph_fx( syn1_fx, st->preemph_fac, st->L_frame, &( hLPDmem->syn[M] ) );

        }

        Copy( syn1_fx + add( st->L_frame, -M - 1 ), hLPDmem->syn, M + 1 ); /* st->Q_syn */

    }