Commit 17908a75 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1284_fix' into 'main'

Fix for 3GPP issue 1284: Assert in ic_bwe_enc_specMapping_ivas_fx of BASOP encoder with OMASA LTV input coded at 24.4 kbps

See merge request !1116
parents c84243d1 7ece91aa
Loading
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -219,8 +219,11 @@ static Word16 ic_bwe_enc_specMapping_ivas_fx(

    u_fx = extract_l( *specMapping_fx );

    tmp = mult( b_fx, b_fx );  // b_e  + b_e;
    tmp1 = mult( a_fx, c_fx ); // a_e + c_e + 2

    /* while performing (-32768)*(-32768), overflow occurs because the result comes out as 32768 after mult. This is the only case for mult where overflow happens. In order to avoid this scenario mult_sat is used */

    tmp = mult_sat( b_fx, b_fx );  // b_e  + b_e;
    tmp1 = mult_sat( a_fx, c_fx ); // a_e + c_e + 2

    exp = BASOP_Util_Add_MantExp( tmp, add( b_e, b_e ), tmp1, add( a_e, add( c_e, 2 ) ), &temp_fx ); /* Q15-exp */
    test();