Commit 85ddbe3b authored by vaillancour's avatar vaillancour
Browse files

Tentative to fix crash, and EVS BE

parent 8d903edc

lib_enc/acelp_core_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1459,10 +1459,6 @@ ivas_error acelp_core_enc_ivas_fx( 
            {

                Copy( Aq + 3 * ( M + 1 ), st->hBWE_TD->cur_sub_Aq_fx, ( M + 1 ) ); // Q12

            }

#ifdef FIX_2261_REMOVE_LP_RESCALING

            // Scaling Aq to Q12

            Scale_sig( st->hBWE_TD->cur_sub_Aq_fx, M + 1, sub( norm_s( st->hBWE_TD->cur_sub_Aq_fx[0] ), 2 ) );

#endif

        }

lib_enc/ivas_core_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -224,13 +224,13 @@ ivas_error ivas_core_enc_fx( 


        Scale_sig( fft_buff_fx[n], ( 2 * L_FFT ), -1 ); // To create 1 headroom for addition of magnitude square spectrum

                                                        // fft_buff_fx_exp = add(fft_buff_fx_exp,1);

#ifndef FIX_2261_REMOVE_LP_RESCALING

        FOR( i = 0; i < st->nb_subfr; i++ )

        {

#ifndef FIX_2261_REMOVE_LP_RESCALING

            Scale_sig( &A_fx[n][i * ( M + 1 )], M + 1, sub( norm_s( A_fx[n][i * ( M + 1 )] ), 2 ) );   // scaling to Q12

#endif

            Scale_sig( &Aw_fx[n][i * ( M + 1 )], M + 1, sub( norm_s( Aw_fx[n][i * ( M + 1 )] ), 2 ) ); // scaling to Q12

        }

#endif

        IF( EQ_32( ivas_format, SBA_FORMAT ) )

        {

            IF( NE_32( ( error = pre_proc_ivas_fx( st, last_element_mode, element_brate, last_element_brate, input_frame, old_inp_12k8_fx[n] /* i: -1, o: Q_new - 1 */, old_inp_16k_fx[n] /* i: -1, o: Q_new - 1 */,

lib_enc/updt_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -141,10 +141,6 @@ void updt_enc_fx( 
    }

    /* core switching updates */

    Copy( &Aq[( st->L_frame / L_SUBFR - 1 ) * ( M + 1 )], st->old_Aq_12_8_fx, M + 1 );

#ifdef FIX_2261_REMOVE_LP_RESCALING

    // Scaling Aq to Q12

    Scale_sig( st->old_Aq_12_8_fx, M + 1, sub( norm_s( st->old_Aq_12_8_fx[0] ), 2 ) );

#endif



    st->old_Es_pred_fx = Es_pred;

    move16();