Commit e743feb2 authored by vaclav's avatar vaclav
Browse files

fix MSAN error in OMASA

parent 25af05fb

lib_enc/ivas_enc.c

+3 −1
Original line number Diff line number Diff line
@@ -321,7 +321,9 @@ ivas_error ivas_enc( 
        /* Estimate TF-tile energy for the input MASA stream */

        ivas_masa_estimate_energy( st_ivas->hMasa, &( data_f[hEncoderConfig->nchan_ism] ), input_frame, st_ivas->nchan_transport );



#ifndef MEM_ALLOC_APP

#ifdef MEM_ALLOC_APP

        ivas_masa_enc_init( st_ivas );

#else

        if ( ( error = ivas_omasa_enc_config( st_ivas ) ) != IVAS_ERR_OK )

        {

            return error;

lib_enc/ivas_masa_enc.c

+1 −0
Original line number Diff line number Diff line
@@ -960,6 +960,7 @@ void ivas_masa_enc_init( 
    {

        masa_total_brate = calculate_cpe_brate_MASA_ISM( st_ivas->ism_mode, ivas_total_brate, st_ivas->hEncoderConfig->nchan_ism );

    }



    if ( masa_total_brate >= IVAS_384k && ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) )

    {

        int16_t continueLoop;

lib_enc/ivas_omasa_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -301,10 +301,6 @@ ivas_error ivas_omasa_enc_config( 
        return error;

    }



#ifdef MEM_ALLOC_APP

    ivas_masa_enc_init( st_ivas );

#endif



    if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC )

    {

        /* Configure oMASA analysis based on MASA config */