Commit e20519e6 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into 1019-socket-interface-for-pose-and-audio

parents 62e4d91e 9b6716ea

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -1206,7 +1206,7 @@ check-bitexactness-ext-and-transport-format: 
# check bitexactness to EVS windows binaries

be-2-evs-windows:

  extends:

    - .rules-main-push

    - .rules-merge-request

  tags:

    - ivas-windows

  stage: test

apps/decoder.c

+10 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ int main( 
        }

    }



#ifndef FIX_1158_FASTCONV_REVERB_HRTF

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

     * Open renderer configuration reader file

     *------------------------------------------------------------------------------------------*/
@@ -472,6 +473,7 @@ int main( 
            goto cleanup;

        }

    }

#endif



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

     * Configure the decoder
@@ -659,6 +661,14 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_1158_FASTCONV_REVERB_HRTF

        if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );

            goto cleanup;

        }

#endif



        if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -5784,7 +5784,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_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -182,8 +182,10 @@ 
#define FIX_RETURN                                      /* VA: fix location of function returns */

#endif

#define FIX_1135_EXT_RENDERER_HANDLES                   /* VA: issue 1135: Memory usage reduction in external renderer: Allocate only handles that are really needed. */

#define FIX_1158_FASTCONV_REVERB_HRTF                   /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */

#define FIX_1166_TDREND_DIV0                            /* FhG,Eri: issue 1166: potential divide by zero in TD Renderer */

#define FIX_835_PARAMMC_BUFFER_VALUES                   /* FhG: BASOP issue 835: wide range of buffer values for cx in ParamMC */

#define FIX_1161_REDUCE_OMASA_HEAP                      /* VA: reduction of OMASA heap memory */



/* #################### End BE switches ################################## */

lib_dec/ivas_init_dec.c

+18 −0
Original line number Diff line number Diff line
@@ -1898,17 +1898,31 @@ ivas_error ivas_init_decoder( 
                }

            }



#ifdef FIX_1161_REDUCE_OMASA_HEAP

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

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

            {

                return error;

            }

#else

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

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

            {

                return error;

            }

#endif

        }



        if ( ( st_ivas->renderer_type == RENDERER_DIRAC ) &&

             ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_DISC ) )

        {

            /* 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 )

            {

                return error;

            }

#endif

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

            {

                return error;
@@ -1918,7 +1932,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;

            }