fix compilation when OMASA_BRATE is disabled (5d295d69) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_omasa_com.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@
		#include "debug.h"
		#endif


		#ifdef MASA_AND_OBJECTS
		#ifdef OMASA_BRATE
		/*---------------------------------------------------------------
		* Local constants
		@@ -53,9 +53,8 @@
		#define GAMMA_ISM_LOW_IMP2 0.9f
		#define GAMMA_ISM_MEDIUM_IMP2 1.2f
		#define GAMMA_ISM_HIGH_IMP2 1.35f
		#endif


		#ifdef MASA_AND_OBJECTS
		/*---------------------------------------------------------------
		* ivas_omasa_ism_mode_select()
		*
		@@ -141,9 +140,9 @@ ISM_MODE ivas_omasa_ism_mode_select(

		return ism_mode;
		}
		#endif


		#ifdef OMASA_BRATE
		/*---------------------------------------------------------------
		* ivas_interformat_brate()
		*
		@@ -267,5 +266,5 @@ void ivas_combined_format_brate_sanity(

		return;
		}

		#endif
		#endif

lib_com/options.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@

		#define MASA_AND_OBJECTS /* Nokia: Combination of MASA and objects */
		#ifdef MASA_AND_OBJECTS
		#define OMASA_BRATE /* VA: combined format bit-budget distribution */
		//#define OMASA_BRATE /* VA: combined format bit-budget distribution */
		#define MASAISM_EDIT_OBJECTS /* Nokia: Temporary command line editing of object directions in the decoder */
		#endif

lib_enc/ivas_cpe_enc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -626,7 +626,7 @@ ivas_error ivas_cpe_enc(

		if ( ivas_format == MASA_ISM_FORMAT )
		{
		cpe_brate = calculate_cpe_brate_MASA_ISM( st_ivas->ism_mode, ivas_total_brate, st_ivas->nchan_ism );
		cpe_brate = calculate_cpe_brate_MASA_ISM( st_ivas->ism_mode, ivas_total_brate, hEncoderConfig->nchan_ism );
		}
		#endif

lib_enc/ivas_enc.c

+5 −13

Original line number	Diff line number	Diff line
		@@ -310,9 +310,6 @@ ivas_error ivas_enc(
		#ifdef MASA_AND_OBJECTS
		else if ( ivas_format == MASA_ISM_FORMAT )
		{
		#ifndef OMASA_BRATE
		float data_transport_f[MASA_MAX_TRANSPORT_CHANNELS][L_FRAME48k];
		#endif
		float data_separated_object[L_FRAME48k];
		int16_t idx_separated_object;

		@@ -396,27 +393,22 @@ ivas_error ivas_enc(
		}
		else
		{
		st_ivas->nSCE = st_ivas->nchan_ism;
		st_ivas->nSCE = hEncoderConfig->nchan_ism;
		}
		/* Estimate TF-tile energy for the input MASA stream */
		ivas_masa_estimate_energy( st_ivas->hMasa, &( data_f[st_ivas->nchan_ism] ), input_frame, st_ivas->nchan_transport );
		ivas_masa_estimate_energy( st_ivas->hMasa, &( data_f[hEncoderConfig->nchan_ism] ), input_frame, st_ivas->nchan_transport );

		/* put audio object data in SCE's */
		if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC )
		{
		/* Estimate MASA parameters for the objects */
		ivas_omasa_enc( st_ivas->hOMasa, st_ivas->hQMetaData, st_ivas->hMasa, st_ivas->hIsmMetaData, data_f, data_transport_f, input_frame, st_ivas->nchan_transport, st_ivas->nchan_ism, st_ivas->ism_mode,
		ivas_omasa_enc( st_ivas->hOMasa, st_ivas->hQMetaData, st_ivas->hMasa, st_ivas->hIsmMetaData, data_f, input_frame, st_ivas->nchan_transport, hEncoderConfig->nchan_ism, st_ivas->ism_mode,
		data_separated_object, &idx_separated_object );
		}

		/* Encode MASA parameters and write MASA metadata bitstream */
		ivas_masa_encode( st_ivas->hMasa, st_ivas->hQMetaData, hMetaData, nb_bits_metadata, st_ivas->nchan_transport, ivas_format, ivas_total_brate, st_ivas->hEncoderConfig->Opt_DTX_ON, st_ivas->nchan_transport == 2 ? st_ivas->hCPE[0]->element_mode : -1,
		st_ivas->ism_mode, st_ivas->nchan_ism, st_ivas->hIsmMetaData, idx_separated_object, st_ivas->hOMasa );
		if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC )
		{
		/* Merge transport signals */
		ivas_merge_masa_transports( data_transport_f, &( data_f[st_ivas->nchan_ism] ), data_f, input_frame, st_ivas->nchan_transport );
		}
		st_ivas->ism_mode, hEncoderConfig->nchan_ism, st_ivas->hIsmMetaData, idx_separated_object, st_ivas->hOMasa );
		}

		/* Encode transport signals */
		@@ -432,7 +424,7 @@ ivas_error ivas_enc(
		{
		return error;
		}
		n = st_ivas->nchan_ism;
		n = hEncoderConfig->nchan_ism;
		}
		#endif /* OMASA_BRATE */