Commit 8e4cc347 authored by Manuel Jander's avatar Manuel Jander
Browse files

Correct undefined exp_buf_wspeech_enc and fix ivas_acelp_tcx20_switching_fx() scaling error.

parent e5c89888

lib_enc/ivas_core_pre_proc_front_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1628,7 +1628,7 @@ ivas_error pre_proc_front_ivas_fx( 
            ELSE

            {

#ifdef NONBE_FIX_ISSUE_2206

                smc_dec = ivas_acelp_tcx20_switching_fx( st, inp_12k8_fx, sub( *Q_new, 1 ), wsp_fx, *q_old_wsp, non_staX_fx, pitch_fr_fx, voicing_fr_fx, currFlatness_fx, lsp_mid_fx, stab_fac_fx, res_cod_SNR_M_fx, res_cod_SNR_M_fx_e, flag_16k_smc ); /* Q0 */

                smc_dec = ivas_acelp_tcx20_switching_fx( st, inp_12k8_fx, *Q_new, wsp_fx, *q_old_wsp, non_staX_fx, pitch_fr_fx, voicing_fr_fx, currFlatness_fx, lsp_mid_fx, stab_fac_fx, res_cod_SNR_M_fx, res_cod_SNR_M_fx_e, flag_16k_smc ); /* Q0 */

#else

                Scale_sig( old_wsp_fx, L_WSP, sub( *Q_new, *q_old_wsp ) );                                                                                                                                                                /* Q_new */

                *q_old_wsp = *Q_new;

lib_enc/ivas_core_pre_proc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1429,6 +1429,10 @@ ivas_error ivas_compute_core_buffers_fx( 
#endif



        ivas_find_wsp_fx( L_FRAME16k, L_SUBFR, NB_SUBFR16k, A_fx, Aw_fx, st->speech_enc_pe, PREEMPH_FAC_16k, st->wspeech_enc, &st->mem_wsp_enc, st->gamma, L_LOOK_16k );

#ifdef NONBE_FIX_ISSUE_2206

        st->exp_buf_wspeech_enc = st->exp_buf_speech_enc_pe;

        move16();

#endif

    }



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

lib_enc/ivas_tcx_core_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -921,7 +921,11 @@ Word16 ivas_acelp_tcx20_switching_fx( 
        move32();

        move32();

    }

#ifdef NONBE_FIX_ISSUE_2206

    e_x = add( e_x, Q15 - Q9 + 1 );

#else

    e_x = add( e_x, 6 );

#endif



    basop_weight_a( A_q_tcx_fx, Ap_fx, 30147 /*0.92 in Q15*/ );

    basop_lpc2mdct_fx( Ap_fx, M, gainlpc_fx, gainlpc_e, gainlpc_noinv, gainlpc_noinv_e );