Commit 0250becb authored by vaclav's avatar vaclav
Browse files

fix MASA MSAN errors

parent 03059ea8

lib_dec/ivas_init_dec.c

+1 −8
Original line number Diff line number Diff line
@@ -2246,17 +2246,10 @@ ivas_error ivas_init_decoder( 


    if ( !st_ivas->hDecoderConfig->voip_active )

    {

        output_Fs_buffers = max( output_Fs, 32000 ); /* note: 32000 == max internal sampling rate in TCX core */

        if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MC_FORMAT )

        {

            /* ivas_mct_dec() is based on L_FRAME48k instead of output_frame */

            output_Fs_buffers = 48000;

        }



        for ( n = 0; n < ivas_get_nchan_buffers( st_ivas ); n++ )

        {

            /* note: these are intra-frame heap memories */

            if ( ( st_ivas->p_output_f[n] = (float *) malloc( ( output_Fs_buffers / FRAMES_PER_SEC ) * sizeof( float ) ) ) == NULL )

            if ( ( st_ivas->p_output_f[n] = (float *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( float ) ) ) == NULL )

            {

                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for floating-point output audio buffer!\n" ) );

            }

lib_dec/ivas_ism_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static ivas_error ivas_ism_bitrate_switching( 
            for ( ch = nchan_out_buff_old; ch < nchan_out_buff; ch++ )

            {

                /* note: these are intra-frame heap memories */

                if ( ( st_ivas->p_output_f[ch] = (float *) malloc( ( max( st_ivas->hDecoderConfig->output_Fs, 32000 ) / FRAMES_PER_SEC ) * sizeof( float ) ) ) == NULL ) /* note: 32000 == max internal sampling rate */

                if ( ( st_ivas->p_output_f[ch] = (float *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( float ) ) ) == NULL ) /* note: 32000 == max internal sampling rate */

                {

                    return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for floating-point output audio buffer!\n" ) );

                }

lib_dec/ivas_omasa_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ ivas_error ivas_omasa_dec_config( 
                for ( k = nchan_out_buff_old; k < nchan_out_buff; k++ )

                {

                    /* note: these are intra-frame heap memories */

                    if ( ( st_ivas->p_output_f[k] = (float *) malloc( ( max( st_ivas->hDecoderConfig->output_Fs, 32000 ) / FRAMES_PER_SEC ) * sizeof( float ) ) ) == NULL ) /* note: 32000 == max internal sampling rate */

                    if ( ( st_ivas->p_output_f[k] = (float *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( float ) ) ) == NULL ) /* note: 32000 == max internal sampling rate */

                    {

                        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for floating-point output audio buffer!\n" ) );

                    }

lib_dec/ivas_sba_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ ivas_error ivas_sba_dec_reconfigure( 
            for ( ch = nchan_out_buff_old; ch < nchan_out_buff; ch++ )

            {

                /* note: these are intra-frame heap memories */

                if ( ( st_ivas->p_output_f[ch] = (float *) malloc( ( max( st_ivas->hDecoderConfig->output_Fs, 32000 ) / FRAMES_PER_SEC ) * sizeof( float ) ) ) == NULL ) /* note: 32000 == max internal sampling rate */

                if ( ( st_ivas->p_output_f[ch] = (float *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( float ) ) ) == NULL ) /* note: 32000 == max internal sampling rate */

                {

                    return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for floating-point output audio buffer!\n" ) );

                }

lib_dec/ivas_stereo_mdct_core_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -366,13 +366,8 @@ void stereo_mdct_core_dec( 


    ivas_mdct_core_reconstruct( hCPE, x, signal_outFB_tmp, fUseTns, 0 );



#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

    mvr2r( signal_out_tmp[0], signal_out[0], (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ) );

    mvr2r( signal_out_tmp[1], signal_out[1], (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ) );

#else

    mvr2r( signal_out_tmp[0], signal_out[0], L_FRAME48k );

    mvr2r( signal_out_tmp[1], signal_out[1], L_FRAME48k );

#endif



    mvr2r( signal_outFB_tmp[0], signal_outFB[0], hCPE->hCoreCoder[0]->hTcxDec->L_frameTCX );

    mvr2r( signal_outFB_tmp[1], signal_outFB[1], hCPE->hCoreCoder[1]->hTcxDec->L_frameTCX );