Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec (aed4163e) · 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 */

+0 −4

Original line number	Diff line number	Diff line
		@@ -3039,11 +3039,7 @@ void mctStereoIGF_enc(
		MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
		Encoder_State *sts, / i/o: encoder state structure */
		float orig_spectrum[MCT_MAX_CHANNELS][NB_DIV], / i : MDCT spectrum for ITF */
		#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC
		float powerSpec[MCT_MAX_CHANNELS], / i/o: MDCT^2 + MDST^2 spectrum,or estimate */
		#else
		float powerSpec[MCT_MAX_CHANNELS][L_FRAME48k], /* i/o: MDCT^2 + MDST^2 spectrum,or estimate */
		#endif
		float powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV], / i : same as above but for inverse spect. */
		float inv_spectrum[MCT_MAX_CHANNELS][NB_DIV], / i : inverse spectrum */
		const int16_t sp_aud_decision0[MCT_MAX_CHANNELS] /* i : speech audio decision */

+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,

+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];

+0 −14

Original line number	Diff line number	Diff line
		@@ -457,18 +457,13 @@ void td_stereo_param_updt(
		{
		mvr2r( IAWB_Ave, tdm_lsfQ_PCh, M );

		#ifdef FIX_1111_TDM_LSP_BUFFER
		if ( tdm_lspQ_PCh != NULL )
		{
		lsf2lsp( tdm_lsfQ_PCh, tdm_lspQ_PCh, M, INT_FS_12k8 );
		}
		#else
		lsf2lsp( tdm_lsfQ_PCh, tdm_lspQ_PCh, M, INT_FS_12k8 );
		#endif
		}
		else if ( flag_ACELP16k == 1 )
		{
		#ifdef FIX_1111_TDM_LSP_BUFFER
		if ( tdm_lspQ_PCh != NULL )
		{
		mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );
		@@ -482,22 +477,13 @@ void td_stereo_param_updt(
		lsp_convert_poly( lsp_temp, L_FRAME, 0 );
		lsp2lsf( lsp_temp, tdm_lsfQ_PCh, M, INT_FS_12k8 );
		}
		#else
		mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );
		lsp_convert_poly( tdm_lspQ_PCh, L_FRAME, 0 );
		lsp2lsf( tdm_lspQ_PCh, tdm_lsfQ_PCh, M, INT_FS_12k8 );
		#endif
		}
		else
		{
		#ifdef FIX_1111_TDM_LSP_BUFFER
		if ( tdm_lspQ_PCh != NULL )
		{
		mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );
		}
		#else
		mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );
		#endif
		mvr2r( lsf_old_PCh, tdm_lsfQ_PCh, M );
		}