Commit 5bd534aa authored by Manuel Jander's avatar Manuel Jander
Browse files

Normalize st->buf_wspeech_enc and correct normalization of... 

Normalize st->buf_wspeech_enc and correct normalization of st->buf_speech_enc_pe to whole buffer length.
parent d5bf5ca7

lib_enc/ivas_core_pre_proc_fx.c

+9 −2
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ ivas_error pre_proc_ivas_fx( 
        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 = s_min( tmp, norm_arr( st->buf_speech_enc_pe + st->L_frame + L_FRAME, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k - st->L_frame - 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 ) ) );
@@ -673,7 +674,10 @@ ivas_error pre_proc_ivas_fx( 
        {

            Copy( wsp_fx, st->wspeech_enc, L_FRAME + L_LOOK_12k8 );

#ifdef NONBE_FIX_ISSUE_2206

            st->exp_buf_wspeech_enc = e_old_wsp;

            Word16 tmp;

            tmp = norm_arr( st->buf_wspeech_enc, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320 );

            scale_sig( st->buf_wspeech_enc, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320, tmp );

            st->exp_buf_wspeech_enc = sub( e_old_wsp, tmp );

            move16();

#endif

        }
@@ -1430,7 +1434,10 @@ ivas_error ivas_compute_core_buffers_fx( 


        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;

        Word16 tmp;

        tmp = norm_arr( st->buf_wspeech_enc, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320 );

        scale_sig( st->buf_wspeech_enc, L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320, tmp );

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

        move16();

#endif

    }