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

Merge branch '3gpp_issue_1210_fix' into 'main' 

Fix for 3GPP issue 1210: Assertion in gain_enc_mless_ivas_fx in BASOP encoder...

See merge request !1027
parents 406656f4 97aa01ee

lib_dec/gain_dec_fx.c

+27 −15
Original line number Diff line number Diff line
@@ -505,6 +505,18 @@ void gain_dec_mless_fx( 


        L_tmp = Dot_product12( code_fx, code_fx, L_SUBFR, &expg ); /*Q31 - expg*/

        expg = sub( expg, 18 + 6 );                                /* exp: -18 (code in Q9), -6 (/L_SUBFR) */



        // To avoid crash in case code value is 0

        IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( L_tmp, expg, 21474836, 0 ), -1 ) )

        {

            // setting values to avoid extra computation

            *gain_inov_fx = 32767; /*8(max value gain_inov can hold) in Q12*/

            Ei_fx = -9743;         /* -38 in Q8*/

            move16();

            move16();

        }

        ELSE

        {

            expg2 = expg;

            move16();

            L_tmp1 = L_tmp; /* sets to 'L_tmp' in 1 clock */
@@ -520,7 +532,7 @@ void gain_dec_mless_fx( 
            e_tmp = sub( expg2, add( 1, e_tmp ) );

            L_tmp1 = Mpy_32_16( e_tmp, f_tmp, 12330 ); /* Q13 */ /* 10*log10(2) in Q12*/

            Ei_fx = round_fx( L_shl( L_tmp1, 11 ) );             /* Q8 */



        }

        /*-----------------------------------------------------------------*

         * calculate the predicted gain code

         *-----------------------------------------------------------------*/

lib_enc/gain_enc_fx.c

+27 −24
Original line number Diff line number Diff line
@@ -603,15 +603,17 @@ void gain_enc_mless_ivas_fx( 
    L_tmp = Dot_product12( code, code, L_SUBFR, &exp_code );

    exp_inov = sub( exp_code, 18 + 6 );



    // To avoid crash in case code value is 0

    // To avoid crash in case code value is 0,

    IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( L_tmp, exp_inov, 21474836, 0 ), -1 ) )

    {

        L_tmp = 21474836;

        exp_inov = 0;

        move32();

        // setting values to avoid extra computation

        *gain_inov = 32767; /*8(max value gain_inov can hold) in Q12*/

        Ei = -9743;         /* -38 in Q8*/

        move16();

        move16();

    }



    ELSE

    {

        exp_code = sub( exp_code, 30 );



        /*Ei = 10 * log10((dot_product(code, code, L_SUBFR) + 0.01) / L_SUBFR) */
@@ -625,9 +627,6 @@ void gain_enc_mless_ivas_fx( 
        L_tmp1 = Mpy_32_16( tmp, frac, 12330 );             /* Q13 */

        Ei = round_fx( L_shl( L_tmp1, 11 ) );               /* Q8 */



    /* predicted codebook gain */

    gcode0 = sub( Es_pred, Ei ); /* Q8 */



        /*---------------------------------------------------------------*

         * Decode codebook gain and the adaptive excitation low-pass

         * filtering factor (Finalize computation )
@@ -636,6 +635,10 @@ void gain_enc_mless_ivas_fx( 
        L_tmp = Isqrt_lc( L_tmp, &exp_inov );

        *gain_inov = extract_h( L_shl( L_tmp, sub( exp_inov, 3 ) ) ); /* gain_inov in Q12 */

        move16();

    }



    /* predicted codebook gain */

    gcode0 = sub( Es_pred, Ei ); /* Q8 */



    /* gcode0 = pow(10, 0.05 * (Es_pred - Ei)) */

    /*----------------------------------------------------------------*