Merge remote-tracking branch 'remotes/origin/main' into OBJ_EDITING_formal_impr (59d88fd5) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+2 −2

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
		@@ -2223,7 +2223,7 @@ coverage-test-on-main-scheduled:
		- .test-job-linux-needs-testv-dir
		- .rules-main-scheduled
		tags:
		- ivas-linux
		- ivas-linux-fast
		stage: test
		rules:
		# only run in scheduled pipeline that passes this env vars

+10 −0

Original line number	Diff line number	Diff line
		@@ -403,6 +403,7 @@ int main(
		}
		}

		#ifndef FIX_1158_FASTCONV_REVERB_HRTF
		/------------------------------------------------------------------------------------------
		* Open renderer configuration reader file
		------------------------------------------------------------------------------------------/
		@@ -422,6 +423,7 @@ int main(
		goto cleanup;
		}
		}
		#endif

		/------------------------------------------------------------------------------------------
		* Configure the decoder
		@@ -609,6 +611,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 );

+4 −0

Original line number	Diff line number	Diff line
		@@ -5798,7 +5798,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 */
		);

+3 −0

Original line number	Diff line number	Diff line
		@@ -172,14 +172,17 @@

		#define FIX_POINT_HRTF_FILE_FORMAT /* All: fix point hrtf binary file format */
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#define FIX_POINT_ROM_CONST /* Ora: issue #1150 HRTF ROM tables should be defined as 'const'*/
		#define FIX_1123_CREND_16BIT_FMT /* Ora: update CREND binary file format to 16 bit */
		#define FIX_1123_CREND_FLTFX_BE /* Ora: make CREND FLT ROM tables BE to FX file */
		#define FIX_1123_FASTCONV_16BIT_FMT /* FhG: issue 1123: update FastConv binary file format and scripts to 16 bit */
		#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 ################################## */

+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;
		}