Merge branch 'main' into 549-paramism-output-too-quiet (32e4f803) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+160 −157

Original line number	Diff line number	Diff line
		@@ -209,6 +209,9 @@ ivas_error pre_proc_front_ivas(
		const int16_t front_vad_flag, /* i : front-VAD flag to overwrite VAD decision */
		const int16_t force_front_vad, /* i : flag to force VAD decision */
		const int16_t front_vad_dtx_flag, /* i : front-VAD DTX flag to overwrite VAD decision*/
		#ifdef FIX_529_BWD_ISSUE
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		#endif
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

+6 −2

Original line number	Diff line number	Diff line
		@@ -143,7 +143,8 @@
		#define BITSTREAM_INDICES_MEMORY /* Don't count memory for bitstream Indice at the encoder - it is a temporary solution for development only */
		#endif

		#define DISABLE_ADAP_RES_COD_TMP /* temporary fix for IVAS-403, disables adaptive residual coding */
		/#define DISABLE_ADAP_RES_COD_TMP/ /* temporary fix for IVAS-403, disables adaptive residual coding */
		#define ADAP_OPT /* Issue 69: optimized the adap algorithm */
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */

		#ifdef IND_LIST_DYN
		@@ -151,9 +152,12 @@
		#endif

		#define FIX_383_CLEAN_UP /* Dlb : Clean up of unused functions */
		// #define FIX_532_ISM_MD_INACTIVE /* VA: issue 532: improve MD coding in ISM inactive frames */
		#define FIX_532_ISM_MD_INACTIVE /* VA: issue 532: improve MD coding in ISM inactive frames */
		#define FIX_547_NAN_IGF_DEC /* FhG: issue 547: fix possible nan in IGF decoder */
		#define FIX_529_BWD_ISSUE /* VA: issue 529: fix Bandwidth Detector not working reliably for Music and Generic Audio */
		#define FIX_557_CRASH_IN_ISM_DTX /* VA issue 557: fix crash in 1ISM 48 kbps DTX */

		#define IGF_TUNING_96 /* FhG: Issue 546: slight tuning of IGF config used in 96 kbps stereo, 128 kbps SBA and others */
		#define FIX_549_DMX_GAIN /* FhG: issue 549: ParamISM output too quiet */

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

+13 −10

Original line number	Diff line number	Diff line
		@@ -3891,6 +3891,9 @@ void bw_detect(
		const float signal_in[], /* i : input signal */
		float spectrum, / i : MDCT spectrum */
		const float enerBuffer, / i : energy buffer */
		#ifdef FIX_529_BWD_ISSUE
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		#endif
		const int16_t mct_on /* i : flag MCT mode */
		);

+8 −0

Original line number	Diff line number	Diff line
		@@ -21632,14 +21632,22 @@ const int16_t igf_tile_offset_table[IGF_BITRATE_UNKNOWN][2*IGF_MAX_TILES+1] = {
		{ 3, 1, 0, 2, 40, 3, 80 }, /* 48000 SWB (stereo TCX10) */
		{ 4, 2, 80, 4, 128, 6, 144, 7, 212 }, /* 64000 SWB (stereo) */
		{ 2, 2, 212, 4, 280 }, /* 80000 SWB (stereo) */
		#ifdef IGF_TUNING_96
		{ 1, 3, 200}, /* 96000 SWB (stereo) */
		#else
		{ 1, 3, 320}, /* 96000 SWB (stereo) */
		#endif
		{ 9, 1, 0, 2, 32, 3, 72, 4, 120, 5, 48, 6, 112, 7, 64, 8, 0, 9, 80 }, /* 24400 FB (stereo) */
		{10, 1, 0, 2, 28, 3, 64, 4, 104, 5, 32, 6, 80, 7, 136, 8, 64, 9, 0, 10, 80 }, /* 32000 FB (stereo) */
		{ 7, 1, 120, 2, 152, 3, 184, 4, 224, 5, 140, 6, 192, 8, 140}, /* 48000 FB (stereo) */
		{ 4, 1, 0, 2, 40, 3, 80, 4, 140 }, /* 48000 FB (stereo TCX10) */
		{ 5, 2, 80, 4, 128, 6, 144, 7, 212, 9, 160 }, /* 64000 FB (stereo) */
		{ 3, 2, 212, 4, 280, 6, 200 }, /* 80000 FB (stereo) */
		#ifdef IGF_TUNING_96
		{ 2, 3, 200, 5, 240}, /* 96000 FB (stereo) */
		#else
		{ 2, 3, 320, 5, 240}, /* 96000 FB (stereo) */
		#endif
		{ 1, 2, 416} /128000 FB (stereo) /
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -542,7 +542,7 @@ ivas_error ivas_ism_metadata_dec(
		if ( ism_mode == ISM_MODE_DISC )
		{
		#ifdef FIX_532_ISM_MD_INACTIVE
		if ( ism_imp[ch] == ISM_NO_META )
		if ( ism_imp[ch] == ISM_NO_META && total_brate[ch] < ACELP_8k00 )
		#else
		if ( hIsmMeta[ch]->ism_metadata_flag == 0 && localVAD[ch] == 0 && ism_metadata_flag_global )
		#endif