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

asan, msan fixes, clean up changes

parent 6c27a4cf

lib_com/cng_exc_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -846,7 +846,8 @@ void cng_params_postupd_ivas_fx( 
#endif                                                                              /* BASOP_NOGLOB */

            L_tmp = Mult_32_16( L_tmp, 128 );                                       /* 2*Q_exc+1 */

            tmp = add( add( Q_exc, Q_exc ), 1 );

            sp[i] = L_shr( L_tmp, sub( tmp, 6 ) );

            // To do : Saturation to be re-validated.

            sp[i] = L_shr_sat( L_tmp, sub( tmp, 6 ) );

            move32(); /* Q6 */



            ptR++;

lib_com/gs_bitallocation_ivas_fx.c

+1 −3
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ void bands_and_bit_alloc_ivas_fx( 
    Word32 sum_bit /*Q0*/, bit_fracf /*Q18*/;

    Word16 etmp;

    Word16 tmp;

    Word16 Ener_per_bd_iQ_tmp[MBANDS_GN_BITALLOC16k]; // Q13

    Word16 pos, band;

    Word32 SWB_bit_budget;                        // Q0 -> Q18

    Word32 bits_per_bands[MBANDS_GN_BITALLOC16k]; // Q18
@@ -126,7 +125,6 @@ void bands_and_bit_alloc_ivas_fx( 
        nb_tot_bands = MBANDS_GN_BITALLOC16k;

        move16();

    }

    Copy( Ener_per_bd_iQ, Ener_per_bd_iQ_tmp, nb_tot_bands );



    set32_fx( bits_per_bands, 0, MBANDS_GN_BITALLOC16k );

    set16_fx( out_bits_per_bands, 0, MBANDS_GN_BITALLOC16k );
@@ -138,7 +136,7 @@ void bands_and_bit_alloc_ivas_fx( 
    ener_vec[0] = add( Ener_per_bd_iQ[0], Ener_per_bd_iQ[1] ); /*Q12 */

#endif

    move16();

    Copy( Ener_per_bd_iQ_tmp + 1, ener_vec, MBANDS_GN - 1 ); /*Q12 */

    Copy( Ener_per_bd_iQ + 1, ener_vec, MBANDS_GN - 1 ); /*Q12 */

    ener_vec[MBANDS_GN - 1] = ener_vec[MBANDS_GN - 2];

    move16();

    IF( EQ_16( L_frame, L_FRAME16k ) )

lib_com/ivas_tools.c

+4 −3
Original line number Diff line number Diff line
@@ -1735,7 +1735,8 @@ Word16 matrix_product_fx( 
                {

                    x_idx = add( i, imult1616( k, rowsX ) );                                 /*Q0*/

                    y_idx = add( k, imult1616( j, rowsY ) );                                 /*Q0*/

                    ( *Zp_fx ) = L_add( *Zp_fx, Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ) ); /*Qx + Qy - 31*/

                    ( *Zp_fx ) = L_add_sat( *Zp_fx, Mpy_32_32( X_fx[x_idx], Y_fx[y_idx] ) ); /*Qx + Qy - 31*/

                    // TODO: overflow of Z_fx to be checked

                    move32();

                }

                Zp_fx++;

lib_enc/acelp_core_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ ivas_error acelp_core_enc( 
        Copy( hLPDmem->mem_syn3, hLPDmem->mem_syn, M );



        /* update old synthesis buffer - needed for ACELP internal sampling rate switching */

        Copy( syn1_fx + add( st->L_frame, L_SYN_MEM ), hLPDmem->mem_syn_r, L_SYN_MEM );

        Copy( syn1_fx + sub( st->L_frame, L_SYN_MEM ), hLPDmem->mem_syn_r, L_SYN_MEM );



        /* save and delay synthesis to be used by SWB BWE */

        IF( st->hBWE_FD != NULL )

lib_enc/core_enc_init.c

+52 −184

File changed.

Preview size limit exceeded, changes collapsed.