Commit 3eb1039e authored by vaclav's avatar vaclav
Browse files

rename ivas_omasa_render_objects_from_mix_open() to ivas_omasa_objects_delay_open()

parent 18757493

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -5748,7 +5748,11 @@ void ivas_omasa_combine_separate_ism_with_masa( 
    const int16_t output_frame                                  /* i  : output frame length per channel        */

);



#ifdef FIX_1161_REDUCE_OMASA_HEAP

ivas_error ivas_omasa_objects_delay_open(

#else

ivas_error ivas_omasa_render_objects_from_mix_open(

#endif

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                 */

);

lib_dec/ivas_init_dec.c

+6 −2
Original line number Diff line number Diff line
@@ -1885,7 +1885,7 @@ ivas_error ivas_init_decoder( 


#ifdef FIX_1161_REDUCE_OMASA_HEAP

            /* Allocate memory for delay buffer within 'hMasaIsmData' */

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

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

            {

                return error;

            }
@@ -1902,7 +1902,7 @@ ivas_error ivas_init_decoder( 
        {

            /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */

#ifdef FIX_1161_REDUCE_OMASA_HEAP

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

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

            {

                return error;

            }
@@ -1916,7 +1916,11 @@ ivas_error ivas_init_decoder( 
        if ( st_ivas->renderer_type == RENDERER_OMASA_OBJECT_EXT )

        {

            /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */

#ifdef FIX_1161_REDUCE_OMASA_HEAP

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

#else

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

#endif

            {

                return error;

            }

lib_dec/ivas_omasa_dec.c

+16 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ ivas_error ivas_omasa_dec_config( 


#ifdef FIX_1161_REDUCE_OMASA_HEAP

                /* Allocate memory for delay buffer within 'hMasaIsmData' */

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

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

                {

                    return error;

                }
@@ -430,7 +430,7 @@ ivas_error ivas_omasa_dec_config( 
            {

                /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */

#ifdef FIX_1161_REDUCE_OMASA_HEAP

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

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

                {

                    return error;

                }
@@ -461,7 +461,11 @@ ivas_error ivas_omasa_dec_config( 
            DIRAC_CONFIG_FLAG common_rend_config_flag = st_ivas->hSpatParamRendCom == NULL ? DIRAC_OPEN : DIRAC_RECONFIGURE;



            /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */

#ifdef FIX_1161_REDUCE_OMASA_HEAP

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

#else

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

#endif

            {

                return error;

            }
@@ -1033,6 +1037,15 @@ void ivas_omasa_combine_separate_ism_with_masa( 
}





#ifdef FIX_1161_REDUCE_OMASA_HEAP

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

 * ivas_omasa_objects_delay_open()

 *

 * Open structures, reserve memory, and init values for dela buffers of objects.

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



ivas_error ivas_omasa_objects_delay_open(

#else

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

 * ivas_omasa_render_objects_from_mix_open()

 *
@@ -1040,6 +1053,7 @@ void ivas_omasa_combine_separate_ism_with_masa( 
 *-------------------------------------------------------------------------*/



ivas_error ivas_omasa_render_objects_from_mix_open(

#endif

    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */

)

{