Commit fb81980b authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1390_fix' into 'main' 

[allow regression] Fix for 3GPP issue 1390: Stereo Encoder 13.2 kbps: Wrong Classification for Noisy Content on LTV

See merge request !1315
parents d74de338 12e48fda

lib_enc/analy_sp_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -399,6 +399,10 @@ static void find_enr_dft_ivas_fx( 
    BinE_fx[STEREO_DFT_N_12k8_ENC / 2 - 1] = BinE_fx[STEREO_DFT_N_12k8_ENC / 2 - 2]; // // *q_Bin_E

    move32();



    Word16 norm = getScaleFactor32( BinE_fx, L_FFT );

    scale_sig32( BinE_fx, L_FFT, norm );

    *q_Bin_E = add( *q_Bin_E, norm );

    move16();

    L_lerp_fx( BinE_fx, Bin_E_fx, L_FFT / 2, STEREO_DFT_N_12k8_ENC / 2, q_Bin_E );



    MVR2R_WORD32( Bin_E_fx, ptE_fx, VOIC_BINS ); // *q_Bin_E

lib_enc/ivas_cpe_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ ivas_error ivas_cpe_enc_fx( 
        sts[1]->q_old_inp = add( sts[1]->q_old_inp, shift );

        move16();

        shift = getScaleFactor16( sts[1]->input_fx, input_frame );

        Scale_sig( sts[1]->input_fx, input_frame, shift ); /* sts[1]->q_inp + shift */

        Copy_Scale_sig_32_16( sts[1]->input32_fx, sts[1]->input_fx, input_frame, sub( add( sts[1]->q_inp, shift ), sts[1]->q_inp32 ) ); /* sts[1]->q_inp + shift */

        sts[1]->q_inp = add( sts[1]->q_inp, shift );

        move16();

        Scale_sig( sts[1]->input_fx, input_frame, sub( s_min( sts[1]->q_inp, sts[1]->q_old_inp ), sts[1]->q_inp ) );                /* min( sts[1]->q_inp, sts[1]->q_old_inp) */
@@ -688,7 +688,7 @@ ivas_error ivas_cpe_enc_fx( 
        sts[0]->q_old_inp = add( sts[0]->q_old_inp, shift );

        move16();

        shift = getScaleFactor16( sts[0]->input_fx, input_frame );

        Scale_sig( sts[0]->input_fx, input_frame, shift ); /* sts[0]->q_inp + shift */

        Copy_Scale_sig_32_16( sts[0]->input32_fx, sts[0]->input_fx, input_frame, sub( add( sts[0]->q_inp, shift ), sts[0]->q_inp32 ) ); /* sts[0]->q_inp + shift */

        sts[0]->q_inp = add( sts[0]->q_inp, shift );

        move16();

        Scale_sig( sts[0]->input_fx, input_frame, sub( s_min( sts[0]->q_inp, sts[0]->q_old_inp ), sts[0]->q_inp ) );                /* min( sts[1]->q_inp, sts[1]->q_old_inp) */