Commit 60ee3d8d authored Jul 04, 2024 by vaclav

accept FIX_1121_MASA_DESCRIPTOR and FIX_1053_AEID_FILE_TEST

parent 494a317a

lib_com/ivas_rom_com.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2471,13 +2471,11 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_
	* MASA ROM tables		* MASA ROM tables
	----------------------------------------------------------------------------------/		----------------------------------------------------------------------------------/

	#ifdef FIX_1121_MASA_DESCRIPTOR
	const uint8_t ivasmasaFormatDescriptor[8] =		const uint8_t ivasmasaFormatDescriptor[8] =
	{		{
	0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */		0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */
	};		};

	#endif
	const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =		const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =
	{		{
	0.00f,		0.00f,

lib_com/ivas_rom_com.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -264,10 +264,8 @@ extern const uint16_t ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PA
	* MASA ROM tables		* MASA ROM tables
	----------------------------------------------------------------------------------/		----------------------------------------------------------------------------------/

	#ifdef FIX_1121_MASA_DESCRIPTOR
	extern const uint8_t ivasmasaFormatDescriptor[8]; /* "IVASMASA" */		extern const uint8_t ivasmasaFormatDescriptor[8]; /* "IVASMASA" */

	#endif
	extern const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS];		extern const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS];
	extern const int16_t no_theta_masa[NO_SPHERICAL_GRIDS - 2];		extern const int16_t no_theta_masa[NO_SPHERICAL_GRIDS - 2];
	extern const int16_t no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];		extern const int16_t no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];

lib_com/options.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -162,8 +162,6 @@
	//#define FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT /* Orange issue 1031 : new fix point hrtf binary file format */		//#define FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT /* Orange issue 1031 : new fix point hrtf binary file format */
	//#define FIX_CREND_SIMPLIFY_CODE /* Ora : simplify line code in crend */		//#define FIX_CREND_SIMPLIFY_CODE /* Ora : simplify line code in crend */
	#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT /* allows reading floation or fix point hrtf binary file format */		#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT /* allows reading floation or fix point hrtf binary file format */
	#define FIX_1053_AEID_FILE_TEST /* Philips: Tests for the -aeid file and fix for memory error */
	#define FIX_1121_MASA_DESCRIPTOR /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */
	#define FIX_1113_CLDFB_REND_IN_ISAR /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */		#define FIX_1113_CLDFB_REND_IN_ISAR /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */
	#define ADJUST_MCT_CHANNELS_MAX /* FhG: set correct max mct channels constant*/		#define ADJUST_MCT_CHANNELS_MAX /* FhG: set correct max mct channels constant*/
	#define FIX_745_FIX_DATA_TYPE_CONVERSION /* VA: issue 745: implicit data type conversion when calling IVAS_DEC_Configure() */		#define FIX_745_FIX_DATA_TYPE_CONVERSION /* VA: issue 745: implicit data type conversion when calling IVAS_DEC_Configure() */

lib_dec/ivas_masa_dec.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1835,9 +1835,6 @@ static void create_masa_ext_out_meta(
	IVAS_QMETADATA_HANDLE hQMetaData,		IVAS_QMETADATA_HANDLE hQMetaData,
	const int16_t nchan_transport )		const int16_t nchan_transport )
	{		{
	#ifndef FIX_1121_MASA_DESCRIPTOR
	const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */
	#endif
	int16_t i, sf, b_old, b_new, dir;		int16_t i, sf, b_old, b_new, dir;
	MASA_DECRIPTIVE_META *descMeta;		MASA_DECRIPTIVE_META *descMeta;
	int16_t *bandMap;		int16_t *bandMap;

lib_dec/lib_dec.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2133,9 +2133,7 @@ static ivas_error copyRendererConfigStruct(
	mvr2r( hRCin->roomAcoustics.pAcoustic_rt60, hRCout->roomAcoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );		mvr2r( hRCin->roomAcoustics.pAcoustic_rt60, hRCout->roomAcoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );
	mvr2r( hRCin->roomAcoustics.pAcoustic_dsr, hRCout->roomAcoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );		mvr2r( hRCin->roomAcoustics.pAcoustic_dsr, hRCout->roomAcoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );
	mvr2r( hRCin->directivity, hRCout->directivity, 3 * MAX_NUM_OBJECTS );		mvr2r( hRCin->directivity, hRCout->directivity, 3 * MAX_NUM_OBJECTS );
	#ifdef FIX_1053_AEID_FILE_TEST
	mvr2r( hRCin->distAtt, hRCout->distAtt, 3 );		mvr2r( hRCin->distAtt, hRCout->distAtt, 3 );
	#endif

	hRCout->split_rend_config = hRCin->split_rend_config;		hRCout->split_rend_config = hRCin->split_rend_config;