Commit 9e42cb12 authored by Manuel Jander's avatar Manuel Jander
Browse files

Fix EVS BE regression.

parent 0fb46a95

lib_enc/acelp_core_enc_fx.c

+3 −2
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ 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 */

#if defined( NONBE_FIX_ISSUE_2206 ) && defined( HARMONIZE_ACELP_ENC )

#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 );
@@ -794,7 +794,8 @@ 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( 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 )

                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 )

#if defined( NONBE_FIX_ISSUE_2206 ) && defined( HARMONIZE_ACELP_ENC )



#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 );

lib_enc/swb_bwe_enc_fx.c

+8 −3
Original line number Diff line number Diff line
@@ -281,6 +281,14 @@ void wb_bwe_enc_ivas_fx( 
#ifdef NONBE_FIX_ISSUE_2206

        new_input_fx_exp = new_wb_speech_q;

        move16();

#ifdef HARM_FD_BWE

        if ( st_fx->element_mode == EVS_MONO )

        {

            /* This is not consistent with float */

            new_input_fx_exp = 0;

            move16();

        }

#endif

#else

        new_input_fx_exp = -Q1;

        move16();
@@ -2693,9 +2701,6 @@ static Word16 WB_BWE_encoding_ivas_fx( 


    IF( st_fx->element_mode == EVS_MONO )

    {

#ifdef NONBE_FIX_ISSUE_2206

        Q_synth = add( Q_synth, 1 );

#endif

        Word16 new_input_fx_exp = Q_synth;



        /* Convert to 16 Bits (Calc Shift Required to Stay within MAX_Q_NEW_INPUT) */