Commit 913c2834 authored Mar 21, 2024 by emerit

add missing test modelROM

parent 52da583a

lib_com/options.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -157,7 +157,8 @@
		/#define SPLIT_REND_WITH_HEAD_ROT / /* Dlb,FhG: Split Rendering contributions 21 and 35 */

		#define FIX_1027_GSC_INT_OVERFLOW /* VA: issue 2207: overflow in GSC */
		#define FIX_1033_MEMORY_LEAK_OMASA /* Nokia / Orange: issue 1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */
		//#define FIX_1033_MEMORY_LEAK_OMASA /* Nokia / Orange: issue 1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */
		#define FIX_1033_MEMORY_LEAK_OMASA_BIS /* Nokia / Second solution Orange: issue 1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */

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

lib_dec/ivas_mct_dec.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -1210,9 +1210,16 @@ static ivas_error ivas_mc_dec_reconfig(

		if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) )
		{
		#ifdef FIX_1033_MEMORY_LEAK_OMASA_BIS
		if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )
		{
		#endif
		ivas_td_binaural_close( &st_ivas->hBinRendererTd );
		#ifndef FIX_1033_MEMORY_LEAK_OMASA
		st_ivas->hHrtfTD = NULL;
		#endif
		#ifdef FIX_1033_MEMORY_LEAK_OMASA_BIS
		}
		#endif
		}

lib_dec/ivas_omasa_dec.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -391,10 +391,17 @@ ivas_error ivas_omasa_dec_config(
		}
		else
		{
		#ifdef FIX_1033_MEMORY_LEAK_OMASA_BIS
		if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )
		{
		#endif
		/* TD renderer handle */
		ivas_td_binaural_close( &st_ivas->hBinRendererTd );
		#ifndef FIX_1033_MEMORY_LEAK_OMASA
		st_ivas->hHrtfTD = NULL;
		#endif
		#ifdef FIX_1033_MEMORY_LEAK_OMASA_BIS
		}
		#endif
		/* ISM renderer handle + ISM data handle */
		ivas_omasa_separate_object_renderer_close( st_ivas );