accept NONBE_FIX_869_MASA_PREREND_MERGE (97846176) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,6 @@
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/
		#define NONBE_FIX_869_MASA_PREREND_MERGE /* Nokia: issue: #869: MASA pre-rend not updating energy */
		#define NONBE_FIX_931_IGF_STEREO_DEC_NOISE /* FhG: issue #931: fix noise substitution in the stereo IGF decoder */
		#define NONBE_FIX_943_RECONFIG_IGF_AFTER_SETTING_BW /* FhG: issue 943: fix crash in BW switchin from WB in MDCT-Stereo core encoder */

lib_rend/ivas_masa_merge.c

+0 −22

Original line number	Diff line number	Diff line
		@@ -124,19 +124,11 @@ void copy_masa_descriptive_meta(
		---------------------------------------------------------------------/

		void diffuse_meta_merge_1x1(
		#ifdef NONBE_FIX_869_MASA_PREREND_MERGE
		MASA_DECODER_EXT_OUT_META_HANDLE outMeta, /* o : Merged metadata output */
		MASA_DECODER_EXT_OUT_META_HANDLE inMeta, /* i : Input metadata 1 */
		float inEne[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS], /* i/o: TF-energy of input 1. energy after merge */
		MASA_DECODER_EXT_OUT_META_HANDLE inMetaISM, /* i : Input metadata 2 */
		float inEneISM[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] /* i : TF-energy of input 2 */
		#else
		MASA_DECODER_EXT_OUT_META_HANDLE outMeta, /* o : Merged metadata output */
		MASA_DECODER_EXT_OUT_META_HANDLE inMeta, /* i : Input metadata 1 */
		float inEne[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS], /* i : TF-energy of input 1 */
		MASA_DECODER_EXT_OUT_META_HANDLE inMetaISM, /* i : Input metadata 2 */
		float inEneISM[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] /* i : TF-energy of input 2 */
		#endif
		)
		{
		int8_t sf, band;
		@@ -284,7 +276,6 @@ void full_stream_merge(
		---------------------------------------------------------------------/

		void ivas_prerend_merge_masa_metadata(
		#ifdef NONBE_FIX_869_MASA_PREREND_MERGE
		MASA_DECODER_EXT_OUT_META_HANDLE outMeta, /* o : Merged metadata output */
		MASA_DECODER_EXT_OUT_META_HANDLE inMeta1, /* i : Input metadata 1 */
		IVAS_REND_AudioConfigType inType1, /* i : Type of input 1 */
		@@ -292,22 +283,12 @@ void ivas_prerend_merge_masa_metadata(
		MASA_DECODER_EXT_OUT_META_HANDLE inMeta2, /* i : Input metadata 2 */
		IVAS_REND_AudioConfigType inType2, /* i : Type of input 2 */
		float inEne2[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] /* i : TF-energy of input 2. may be altered */
		#else
		MASA_DECODER_EXT_OUT_META_HANDLE outMeta, /* o : Merged metadata output */
		MASA_DECODER_EXT_OUT_META_HANDLE inMeta1, /* i : Input metadata 1 */
		IVAS_REND_AudioConfigType inType1, /* i : Type of input 1 */
		float inEne1[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS], /* i/o: TF-energy of input 1. after merge, contains the energy of the merged signal */
		MASA_DECODER_EXT_OUT_META_HANDLE inMeta2, /* i : Input metadata 2 */
		IVAS_REND_AudioConfigType inType2, /* i : Type of input 2 */
		float inEne2[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] /* i : TF-energy of input 2 */
		#endif
		)
		{
		/* mixing ISMs with non-ISM use different merge */
		if ( inType1 == IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED && inType2 != IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED && ( inMeta1->descriptiveMeta.numberOfDirections == 0u && inMeta2->descriptiveMeta.numberOfDirections == 0u ) )
		{
		/* meta_1 is ISM and both are 1dir */
		#ifdef NONBE_FIX_869_MASA_PREREND_MERGE
		int8_t sf;

		diffuse_meta_merge_1x1( outMeta, inMeta2, inEne2, inMeta1, inEne1 ); /* post-merge energy is now in inEne2 and needs to be copied to inEne1 */
		@@ -316,9 +297,6 @@ void ivas_prerend_merge_masa_metadata(
		{
		mvr2r( inEne2[sf], inEne1[sf], MASA_FREQUENCY_BANDS );
		}
		#else
		diffuse_meta_merge_1x1( outMeta, inMeta2, inEne2, inMeta1, inEne1 );
		#endif
		}
		else if ( inType2 == IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED && inType1 != IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED && ( inMeta1->descriptiveMeta.numberOfDirections == 0u && inMeta2->descriptiveMeta.numberOfDirections == 0u ) )
		{