Commit 0a7629f7 authored by Manuel Jander's avatar Manuel Jander
Browse files

Improve scaling of st->buf_speech_enc_pe and remove bogus assignment of st->exp_buf_speech_enc

parent e9f1ff67

lib_enc/ivas_core_pre_proc_front_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -596,7 +596,6 @@ ivas_error pre_proc_front_ivas_fx( 
    {

        Copy_Scale_sig( new_inp_12k8_fx, st->buf_speech_enc + L_FRAME32k, L_FRAME, sub( q_buf_speech_enc, st->q_inp ) ); /* q_buf_speech_enc */

    }

    st->exp_buf_speech_enc = sub( Q15, st->q_inp );

#else

    IF( NE_16( Q_inp_const, st->q_inp ) )

    {

lib_enc/ivas_core_pre_proc_fx.c

+10 −0
Original line number Diff line number Diff line
@@ -642,7 +642,17 @@ ivas_error pre_proc_ivas_fx( 
    IF( !( EQ_16( st->L_frame, L_FRAME16k ) && NE_16( element_mode, IVAS_CPE_MDCT ) ) )

    {

        /* update signal buffers */

#ifdef NONBE_FIX_ISSUE_2206

        Word16 tmp;

        tmp = norm_arr( new_inp_12k8_fx, L_FRAME );

        tmp = s_min( tmp, norm_arr( st->buf_speech_enc_pe, st->L_frame ) );

        tmp = add( s_min( sub( *Q_new, 1 ), sub( Q15, st->exp_buf_speech_enc_pe ) ), tmp );

        scale_sig( st->buf_speech_enc_pe, st->L_frame, sub( tmp, sub( Q15, st->exp_buf_speech_enc_pe ) ) );

        Copy_Scale_sig_nosat( new_inp_12k8_fx, st->buf_speech_enc_pe + st->L_frame, L_FRAME, sub( tmp, sub( *Q_new, 1 ) ) );

        st->exp_buf_speech_enc_pe = sub( Q15, tmp );

#else

        Copy_Scale_sig( new_inp_12k8_fx, st->buf_speech_enc_pe + st->L_frame, L_FRAME, sub( sub( Q15, st->exp_buf_speech_enc_pe ), sub( *Q_new, Q1 ) ) );

#endif

        Copy( st->buf_speech_enc + L_FRAME32k, st->buf_speech_enc + st->L_frame, L_FRAME );



        test();