Commit 8988bd86 authored by Manuel Jander's avatar Manuel Jander
Browse files

Fix scale errors.

parent fd094ee7

lib_enc/ivas_core_pre_proc_fx.c

+3 −1
Original line number Diff line number Diff line
@@ -618,8 +618,10 @@ void pre_proc_ivas_fx( 
        IF( ( EQ_32( sr_core_tmp, INT_FS_16k ) && NE_16( element_mode, IVAS_CPE_MDCT ) ) || ( GT_32( sr_core_tmp, INT_FS_16k ) ) )

        {

            shift = norm_arr( new_inp_resamp16k_fx, L_FRAME16k );

            // Q15 < Q_old_inp_16k + shift

            shift = s_min( sub( Q15, Q_old_inp_16k), shift );

            Scale_sig( new_inp_resamp16k_fx, L_FRAME16k, shift );

            *q_new_inp_resamp16k_fx = s_min( Q15, add( Q_old_inp_16k, shift ) );

            *q_new_inp_resamp16k_fx = add( Q_old_inp_16k, shift );

            move16();

        }

lib_enc/ivas_tcx_core_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ void stereo_tcx_core_enc( 
    IF( st->tcxonly == 0 )

    {

#ifdef NONBE_FIX_ISSUE_2206

        s = s_min( s, add( norm_s( st->buf_wspeech_enc[st->L_frame - 1] ), sub( sub( Q15, st->exp_buf_wspeech_enc ), Q_new ) ) );

        s = s_min( s, add( norm_s( st->wspeech_enc[st->L_frame - 1] ), sub( sub( Q15, st->exp_buf_wspeech_enc ), Q_new ) ) );

        st->wspeech_enc[st->L_frame - 1] = shl( st->wspeech_enc[st->L_frame - 1], sub( add( Q_new, s ), sub( Q15, st->exp_buf_wspeech_enc ) ) );

#else

        s = s_min( s, norm_s( st->wspeech_enc[st->L_frame - 1] ) );