Commit f15ff12f authored by vaclav's avatar vaclav
Browse files

address comments in the issue

parent f67e0db8

lib_dec/ivas_init_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1918,7 +1918,7 @@ ivas_error ivas_init_decoder( 
    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_FRAME_48k instead of output_frame */

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

        output_Fs_buffers = 48000;

    }
@@ -1927,7 +1927,7 @@ ivas_error ivas_init_decoder( 
        /* 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 )

        {

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

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

        }

    }

    for ( ; n < MAX_OUTPUT_CHANNELS; n++ )

lib_dec/ivas_mct_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -296,11 +296,12 @@ ivas_error ivas_mct_dec( 
            mvr2r( output[n - 1], output[n + 1], output_frame );

        }

        mvr2r( tmp, output[LFE_CHANNEL - 1], output_frame );

        set_zero( output[LFE_CHANNEL], output_frame );



#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP



        /* save LFE channel */

        mvr2r( output_lfe_ch, output[LFE_CHANNEL], output_frame );

#else

        set_zero( output[LFE_CHANNEL], output_frame );

#endif

    }

lib_dec/ivas_omasa_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ ivas_error ivas_omasa_dec_config( 
                /* 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 */

                {

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

                    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
@@ -419,7 +419,7 @@ ivas_error ivas_sba_dec_reconfigure( 
            /* 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 */

            {

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

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

            }

        }

    }