Commit 90534827 authored Jun 25, 2024 by vaclav

Merge branch '1121-ivasmasaformatdescriptor-defined-at-three-different-files' into 'main'

Resolve "'ivasmasaFormatDescriptor' defined at three different files"

See merge request !1649

parents 8ecdb7f6 4b865a20

lib_com/ivas_rom_com.c

+7 −0

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

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

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

lib_com/ivas_rom_com.h

+4 −0

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

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

		#endif
		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_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,7 @@

		#define FIX_1101_CLEANING_JBM_CALL /* VA: issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open() */
		#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 */

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

lib_dec/ivas_masa_dec.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1835,7 +1835,9 @@ static void create_masa_ext_out_meta(
		IVAS_QMETADATA_HANDLE hQMetaData,
		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;
		MASA_DECRIPTIVE_META *descMeta;
		int16_t *bandMap;

lib_rend/ivas_mcmasa_ana.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1069,7 +1069,9 @@ void ivas_create_masa_out_meta(
		float surroundingCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] /* i : Estimated surround coherence */
		)
		{
		#ifndef FIX_1121_MASA_DESCRIPTOR
		const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */
		#endif
		int16_t i, sf, band;
		uint8_t numFrequencyBands;
		uint8_t numDirections;