Commit 08f33823 authored by Manuel Jander's avatar Manuel Jander
Browse files

Undo change that has no effect.

parent 72a8797d

lib_enc/acelp_core_enc_fx.c

+0 −12
Original line number Diff line number Diff line
@@ -492,9 +492,6 @@ ivas_error acelp_core_enc_fx( 
        {

            IF( st->element_mode == EVS_MONO )

            {

#ifdef NONBE_FIX_ISSUE_2206

                Scale_sig( old_syn_12k8_16k, st->L_frame, sub( st->Q_syn, sub( Q_new, 1 ) ) );

#endif

                save_old_syn_fx( st->L_frame, syn1_fx, old_syn_12k8_16k, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );

            }

            ELSE
@@ -502,9 +499,6 @@ ivas_error acelp_core_enc_fx( 
                st->hBWE_FD->mem_deemph_old_syn_fx = shl_sat( st->hBWE_FD->mem_deemph_old_syn_fx, sub( st->Q_syn, st->hBWE_FD->q_mem_deemph_old_syn ) ); /* st->Q_syn */

                move16();

                Scale_sig( st->hBWE_FD->old_syn_12k8_16k_fx, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ), sub( st->Q_syn, st->hBWE_FD->q_mem_deemph_old_syn ) ); /* st->Q_syn */

#ifdef NONBE_FIX_ISSUE_2206

                Scale_sig( old_syn_12k8_16k, st->L_frame, sub( st->Q_syn, sub( Q_new, 1 ) ) );

#endif

                save_old_syn_fx( st->L_frame, syn1_fx, old_syn_12k8_16k, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );

                Scale_sig( old_syn_12k8_16k, st->L_frame, sub( sub( Q_new, 1 ), st->Q_syn ) ); // Q_syn

                st->hBWE_FD->q_mem_deemph_old_syn = st->Q_syn;
@@ -784,9 +778,6 @@ ivas_error acelp_core_enc_fx( 
        {

            IF( st->element_mode == EVS_MONO )

            {

#ifdef NONBE_FIX_ISSUE_2206_NO

                Scale_sig( old_syn_12k8_16k, st->L_frame, sub( st->Q_syn, sub( Q_new, 1 ) ) );

#endif

                save_old_syn_fx( st->L_frame, syn_fx, old_syn_12k8_16k, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );

            }

            ELSE
@@ -795,9 +786,6 @@ ivas_error acelp_core_enc_fx( 
                move16();

                Scale_sig( st->hBWE_FD->old_syn_12k8_16k_fx, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ), sub( s_min( st->Q_syn, st->hBWE_FD->q_mem_deemph_old_syn ), st->hBWE_FD->q_mem_deemph_old_syn ) ); // s_min( st->Q_syn, st->hBWE_FD->q_mem_deemph_old_syn )



#ifdef NONBE_FIX_ISSUE_2206

                Scale_sig( old_syn_12k8_16k, st->L_frame, sub( st->Q_syn, sub( Q_new, 1 ) ) );

#endif

                save_old_syn_fx( st->L_frame, syn_fx, old_syn_12k8_16k, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );

                Scale_sig( old_syn_12k8_16k, st->L_frame, sub( sub( Q_new, 1 ), st->Q_syn ) ); // Q_syn

                st->hBWE_FD->q_mem_deemph_old_syn = s_min( st->Q_syn, st->hBWE_FD->q_mem_deemph_old_syn );