Merge remote-tracking branch 'origin/main' into 382-potential-masa-metadata-framing-asynchrony (a55d927d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_enc/ivas_mct_core_enc.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -194,9 +194,7 @@ void ivas_mct_core_enc(
		CPE_ENC_HANDLE hCPE[MCT_MAX_BLOCKS], /* i/o: CPE encoder structures */
		const int16_t nChannels, /* i : number of channels to be coded */
		const int32_t ivas_total_brate, /* i : IVAS total bitrate */
		#ifndef DISABLE_BWD_MCT
		const int16_t switch_bw, /* i : flag bandwidth switch occurance */
		#endif
		const int16_t lfe_bits, /* i : bits spent for LFE */
		const int16_t sba_order /* i : Ambisonic (SBA) order */
		)
		@@ -280,13 +278,12 @@ void ivas_mct_core_enc(
		{
		ch_core = ch * CPE_CHANNELS;

		#ifndef DISABLE_BWD_MCT
		if ( switch_bw )
		{
		initMdctStereoEncData( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth,
		sts[ch_core]->igf, sts[ch_core]->hIGFEnc->igfData.igfInfo.grid, 0 );
		}
		#endif

		if ( sts[ch_core]->igf )
		{
		/* calculate the igf start band from the igf start line */

+3 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@
		#include "ivas_cnst.h"
		#include "wmc_auto.h"

		#define WMC_TOOL_SKIP

		/*-------------------------------------------------------------------------
		* TD Binaural rendering related ROM tables
		@@ -12456,4 +12457,6 @@ const uint32_t orange53_rom_ITD_elevBsShape[28] = {
		0x3ebda12f,0x3f12f685,0x3f2aaaab,
		};

		#undef WMC_TOOL_SKIP

		/* clang-format on */

+4 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,8 @@

		/* clang-format off */

		#define WMC_TOOL_SKIP

		/*-------------------------------------------------------------------------
		* Binaural rendering related ROM tables
		------------------------------------------------------------------------/
		@@ -44077,4 +44079,6 @@ const float parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX] =
		0.016350f, 0.042709f, 0.077337f, 0.066238f, 0.042046f, 0.020017f, 0.007896f, 0.002947f, 0.000932f, 0.000152f
		};

		#undef WMC_TOOL_SKIP

		/* clang-format on */

+2 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@
		#include "cnst.h"
		#include "ivas_cnst.h"

		#define WMC_TOOL_SKIP

		/******************** CRendBin_Combined_HRIR ********************/
		#ifdef FIX_BINAURAL_DELAY_PRECISION
		@@ -6923,3 +6924,4 @@ const float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][252
		0.050578f, 0.012222f, 0.020049f, -0.020057f, -0.032135f, -0.002553f, -0.037541f, -0.023567f, -0.008392f, -0.012215f, 0.001644f, -0.001142f, 0.000540f, 0.001404f, -0.027979f, -0.022362f, -0.012091f, -0.022963f, 0.009075f, 0.010977f, -0.007069f, -0.000183f, -0.022228f, -0.001348f, 0.006548f, -0.003034f}
		};

		#undef WMC_TOOL_SKIP