Add missing define switch (31be2c8c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@
		#define NONBE_FIX_588_UPDATE_FASTCONV_SD /* FhG: issue 588: update FastConv SD HRTFs in CLDFB domain with new conversion method */
		#define NONBE_FIX_778_TNS_UNFIED_STEREO_MSAN /* FhG: Issue 778: MSAN error due to uninitialized TNS configuration */
		#define NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ /* VA: issue 797: fix of crash when the separated object is inactive and the MASA metadata is using very few bits */

		#define NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX /* Nokia: issue 806: fix one separated object mode transport mix of the separated object */

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -578,9 +578,11 @@ void ivas_omasa_enc(
		ivas_omasa_energy_and_ratio_est( hOMasa, hMasa->data.hOmasaData, data_in_f, input_frame, nchan_ism );
		}

		#ifdef NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX
		/* Downmix */
		ivas_omasa_dmx( data_in_f, data_out_f, input_frame, nchan_transport, nchan_ism, hIsmMeta, hOMasa->prev_object_dm_gains, hOMasa->interpolator );

		#endif
		/* Move the ISM metadata to the first entry for encoding in the MASA_ONE_OBJ mode */
		if ( ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
		{
		@@ -588,6 +590,11 @@ void ivas_omasa_enc(
		hIsmMeta[0]->elevation = hIsmMeta[*idx_separated_object]->elevation;
		}

		#ifndef NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX
		/* Downmix */
		ivas_omasa_dmx( data_in_f, data_out_f, input_frame, nchan_transport, nchan_ism, hIsmMeta, hOMasa->prev_object_dm_gains, hOMasa->interpolator );

		#endif
		/* Merge transport signals */
		ivas_merge_masa_transports( data_out_f, &( data_in_f[nchan_ism] ), data_in_f, input_frame, nchan_transport );