Commit b0741710 authored by Manuel Jander's avatar Manuel Jander
Browse files

Merge branch... 

Merge branch '2206-assert-in-stereo_switching_enc_fx-for-omasa-rate-switching-input-new-stv' into 2206-assert-in-stereo_switching_enc_fx-for-omasa-rate-switching-input-new-stv_revVE
parents 5bf4d452 49f505cb

lib_enc/swb_tbe_enc_fx.c

+9 −4
Original line number Diff line number Diff line
@@ -1570,12 +1570,17 @@ void swb_tbe_enc_fx( 
    Q_shb2 = s_min( Q_shb, hBWE_TD->old_speech_shb_q );

    Copy_Scale_sig_nosat( hBWE_TD->old_speech_shb_fx, shb_old_speech_fx, delay, sub( Q_shb2, hBWE_TD->old_speech_shb_q ) );

    Copy_Scale_sig_nosat( shb_speech_fx, shb_new_speech_fx, L_FRAME16k, sub( Q_shb2, Q_shb ) );

    // Copy( shb_old_speech_fx + L_FRAME16k, hBWE_TD->old_speech_shb_fx, delay );

    Copy( shb_speech_fx + L_FRAME16k - ( shb_new_speech_fx - shb_old_speech_fx ), hBWE_TD->old_speech_shb_fx, delay );

    hBWE_TD->old_speech_shb_q = Q_shb;

    move16();

    Q_shb = Q_shb2;

    move16();

    Q_shb2 = 0;

    move16();

    IF( NE_16( st_fx->element_mode, EVS_MONO ) )

    {

        Q_shb2 = norm_arr( shb_old_speech_fx + L_FRAME16k, delay );

    }

    Copy_Scale_sig_nosat( shb_old_speech_fx + L_FRAME16k, hBWE_TD->old_speech_shb_fx, delay, Q_shb2 );

    hBWE_TD->old_speech_shb_q = add( Q_shb, Q_shb2 );

    move16();

#else

    Copy( hBWE_TD->old_speech_shb_fx, shb_old_speech_fx, delay );

    Copy( shb_speech_fx, shb_new_speech_fx, L_FRAME16k );