Merge remote-tracking branch 'origin/main' into ci/remove_separate_masa_test (0392f06f) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_cnst.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -1292,10 +1292,14 @@ typedef enum
		#define LFE_CHANNEL 3

		#define MIN_LFE_NRG 0.5f
		#define MCT_MAX_CHANNELS MAX_TRANSPORT_CHANNELS
		#ifdef ADJUST_MCT_CHANNELS_MAX
		#define MCT_MAX_CHANNELS 11 /* == 7.1.4 LS channels without the LFE channel */
		#define MCT_MAX_BLOCKS ( ( MCT_MAX_CHANNELS + 1 ) / CPE_CHANNELS ) /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/
		#else
		#define MCT_MAX_CHANNELS 12
		#define MCT_MAX_BLOCKS ( MCT_MAX_CHANNELS / CPE_CHANNELS ) /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/

		#define MAX_NUM_DATA max( MCT_MAX_CHANNELS, 4 )
		#endif

		#define NBBITS_MCT_RATIO 4
		#define BITRATE_MCT_RATIO_RANGE ( 1 << NBBITS_MCT_RATIO ) /* Range of the coded bitrate distribution ratio */

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

+10 −3

Original line number	Diff line number	Diff line
		@@ -76,7 +76,11 @@
		#endif

		#ifdef DEBUG_MODE_MDCT
		#define DEBUG_PLOT_BITS
		/#define DEBUG_PLOT_BITS/
		#endif

		#ifdef DEBUG_MODE_DFT
		/#define DEBUG_MODE_DFT_BITS /
		#endif

		#define ENABLE_BITRATE_VERIFICATION /* Enable bitrate verification - use when playing with bit budget */
		@@ -158,10 +162,11 @@
		//#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 FLOAT_FIX_POINT_HRTF_FILE_FORMAT /* allows reading floation or fix point hrtf binary file format */


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

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

		@@ -172,6 +177,8 @@
		#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */
		#define NONBE_1131_ACELP_OOB /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */

		#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER /* FhG: issue 1128: set output ambisonics order to input order for EXT output */

		/* ##################### End NON-BE switches ########################### */

		/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_binRenderer_internal.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1014,7 +1014,11 @@ ivas_error ivas_rend_openCldfbRend(
		return error;
		}

		#ifdef FIX_1113_CLDFB_REND_IN_ISAR
		pCldfbRend->binaural_latency_ns = (int32_t) ( pCldfbRend->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f );
		#else
		pCldfbRend->binaural_latency_ns = (int32_t) ( FASTCONV_HOA3_latency_s * 1000000000.f );
		#endif
		hBinRenderer->hReverb = NULL;
		hBinRenderer->hEFAPdata = NULL;