Commit 60f50588 authored by vaclav's avatar vaclav
Browse files

simplification

parent bfa5613d

lib_enc/acelp_core_enc_fx.c

+11 −18
Original line number Diff line number Diff line
@@ -1205,27 +1205,20 @@ ivas_error acelp_core_enc_ivas_fx( 
            }

        }



#ifdef HARMONIZE_ACELP_ENC

        IF( st->element_mode == EVS_MONO )

        {

            /* Update MODE2 core switching memory */

            tmpF_fx = hLPDmem->syn[M];

            move16();

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

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

        }

        ELSE

#endif

        {

        Scale_sig( hLPDmem->syn, M + 1, sub( st->Q_syn, hLPDmem->q_lpd_syn ) ); /* st->Q_syn */

        hLPDmem->q_lpd_syn = st->Q_syn;

        move16();



        /*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] ) );

#endif

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

    }

    }



    /*----------------------------------------------------------------*

     * Encoding of all other frames