merge all sub-switches into SBA_AND_OBJECTS (79ad44ea) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ static
		#define MAX_FRAME_SIZE ( 48000 / 50 )
		#endif
		#define MAX_NUM_OUTPUT_CHANNELS 16
		#ifdef OSBA_EXT_OUT
		#ifdef SBA_AND_OBJECTS
		#define MAX_OUTPUT_PCM_BUFFER_SIZE ( ( MAX_NUM_OUTPUT_CHANNELS + IVAS_MAX_NUM_OBJECTS ) * MAX_FRAME_SIZE )
		#else
		#define MAX_OUTPUT_PCM_BUFFER_SIZE ( MAX_NUM_OUTPUT_CHANNELS * MAX_FRAME_SIZE )
		@@ -1691,7 +1691,7 @@ static ivas_error initOnFirstGoodFrame(
		/* If outputting ISM, get number of objects, open output files and write zero metadata for initial bad frames */
		#ifdef MASA_AND_OBJECTS
		if ( pBsFormat == IVAS_DEC_BS_OBJ \|\| pBsFormat == IVAS_DEC_BS_MASA_ISM
		#ifdef OSBA_EXT_OUT
		#ifdef SBA_AND_OBJECTS

		\|\| *pBsFormat == IVAS_DEC_BS_SBA_ISM
		#endif
		@@ -2108,7 +2108,7 @@ static ivas_error decodeG192(
		{
		#ifdef MASA_AND_OBJECTS
		if ( bsFormat == IVAS_DEC_BS_OBJ \|\| bsFormat == IVAS_DEC_BS_MASA_ISM
		#ifdef OSBA_EXT_OUT
		#ifdef SBA_AND_OBJECTS
		\|\| bsFormat == IVAS_DEC_BS_SBA_ISM
		#endif
		)

lib_com/bitstream.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2994,7 +2994,7 @@ ivas_error preview_indices(

		ivas_sba_config( total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ) );
		}
		#ifdef OSBA_DISC_OBJ_MCT
		#ifdef SBA_AND_OBJECTS
		else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )
		{
		/* read number of objects from the bitstream */

lib_com/ivas_cnst.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -165,13 +165,13 @@ typedef enum
		RENDERER_BINAURAL_MIXER_CONV,
		RENDERER_BINAURAL_MIXER_CONV_ROOM,
		RENDERER_NON_DIEGETIC_DOWNMIX
		#ifdef OSBA_MONO_STEREO_OUTPUT
		#ifdef SBA_AND_OBJECTS
		, RENDERER_OSBA_STEREO
		#endif
		#ifdef OSBA_AMBISONICS_OUT
		#ifdef SBA_AND_OBJECTS
		, RENDERER_OSBA_AMBI
		#endif
		#ifdef OSBA_LS_OUT
		#ifdef SBA_AND_OBJECTS
		, RENDERER_OSBA_LS
		#endif
		} RENDERER_TYPE;
		@@ -429,7 +429,7 @@ typedef enum
		ISM_MASA_MODE_PARAM_ONE_OBJ, /* MASA ISM mode when one object is encoded separately and remainder using parametric object model */
		ISM_MASA_MODE_DISC /* MASA ISM mode when all objects are encoded separarately */
		#endif
		#ifdef OSBA_DISC_OBJ_MCT
		#ifdef SBA_AND_OBJECTS
		,
		ISM_SBA_MODE_DISC /* MASA ISM mode when all objects are encoded separarately */
		#endif
		@@ -1304,7 +1304,7 @@ typedef enum
		MASA_FRAME_4SF
		} MASA_FRAME_MODE;

		#ifdef OSBA_DISC_OBJ_MCT
		#ifdef SBA_AND_OBJECTS
		#define NO_BITS_MASA_ISM_NO_OBJ 2
		#endif
		/----------------------------------------------------------------------------------

lib_com/ivas_prot.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -1001,7 +1001,7 @@ ivas_error ivas_ism_metadata_enc(
		const int16_t flag_omasa_ener_brate, /* i : less bitrate for objects in OMASA flag */
		int16_t *omasa_stereo_sw_cnt
		#endif
		#ifdef OSBA_DISC_OBJ_MCT
		#ifdef SBA_AND_OBJECTS
		,
		const int16_t ini_frame
		#endif
		@@ -1020,7 +1020,7 @@ ivas_error ivas_ism_metadata_dec(
		const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
		int16_t ism_extended_metadata_flag, / i/o: Extended metadata active in renderer */
		int16_t ism_extmeta_cnt / i/o: Number of change frames observed */
		#ifdef OSBA_DISC_OBJ_MCT
		#ifdef SBA_AND_OBJECTS
		, DEC_CORE_HANDLE st0
		#endif
		);
		@@ -3656,7 +3656,7 @@ void ivas_dirac_dec_read_BS(
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i/o: common spatial rendering data handle */
		IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q metadata */
		int16_t nb_bits, / o : number of bits read */
		#ifdef OSBA_DISC_OBJ_MCT
		#ifdef SBA_AND_OBJECTS
		const int16_t last_bit_pos, /* i : last read bitstream position*/
		#endif
		const int16_t hodirac_flag, /* i : flag to indicate HO-DirAC mode */
		@@ -5674,15 +5674,15 @@ void ivas_osba_enc(
		const int16_t nchan_ism, /* i : Number of objects for parameter analysis */
		const ISM_MODE ism_mode, /* i : ISM mode */
		const int16_t sba_analysis_order /* i : SBA order evaluated in DirAC/SPAR encoder */
		#ifdef OSBA_BR_SWITCHING
		#ifdef SBA_AND_OBJECTS
		, const int32_t input_Fs /* i : input sampling rate*/
		#endif
		);
		#ifdef OSBA_DISC_OBJ_MCT
		#ifdef SBA_AND_OBJECTS
		ivas_error ivas_masa_ism_data_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder handle */
		);
		ivas_error ivas_masa_ism_separate_object_renderer_open(
		ivas_error ivas_sba_ism_separate_object_renderer_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

lib_com/options.h

+1 −10

Original line number	Diff line number	Diff line
		@@ -218,16 +218,7 @@

		#define MASA_AND_OBJECTS /* Nokia: Combination of MASA and objects */

		#define SBA_AND_OBJECTS
		#ifdef SBA_AND_OBJECTS
		#define OSBA_DISC_OBJ_MCT
		#define ENABLE_ISM_MD_CODING
		#define OSBA_EXT_OUT
		#define OSBA_MONO_STEREO_OUTPUT
		#define OSBA_AMBISONICS_OUT
		#define OSBA_LS_OUT
		#define OSBA_BR_SWITCHING
		#endif
		#define SBA_AND_OBJECTS /* FhG: Combined coding of SBA and objects*/

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