merge FIX_OMASA_DELAY_COMP into MASA_AND_OBJECTS (3b9c6d09) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/delay_comp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ int32_t get_delay(
		{
		delay = IVAS_ENC_DELAY_NS;

		#ifdef FIX_OMASA_DELAY_COMP
		#ifdef MASA_AND_OBJECTS
		if ( ivas_format == MASA_FORMAT \|\| ivas_format == MASA_ISM_FORMAT )
		#else
		if ( ivas_format == MASA_FORMAT )
		@@ -109,7 +109,7 @@ int32_t get_delay(
		}


		#ifdef FIX_OMASA_DELAY_COMP
		#ifdef MASA_AND_OBJECTS
		if ( ivas_format == MASA_FORMAT \|\| ivas_format == MASA_ISM_FORMAT )
		#else
		if ( ivas_format == MASA_FORMAT )

lib_com/ivas_prot.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -5127,15 +5127,9 @@ ivas_error ivas_omasa_enc_open(
		);

		void ivas_omasa_enc_close(
		#ifdef FIX_OMASA_DELAY_COMP
		OMASA_ENC_HANDLE hOMasa /* i/o: encoder OMASA handle */
		#else
		OMASA_ENC_HANDLE hOMasa, /* i/o: encoder OMASA handle */
		const int16_t nchan_ism /* i : number of objects */
		#endif
		);

		#ifdef MASA_AND_OBJECTS
		ivas_error ivas_omasa_enc_config(
		Encoder_Struct st_ivas / i/o: IVAS encoder structure */
		);
		@@ -5143,7 +5137,6 @@ ivas_error ivas_omasa_enc_config(
		ivas_error ivas_omasa_dec_config(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);
		#endif

		void ivas_omasa_set_config(
		OMASA_ENC_HANDLE hOMasa, /* i/o: OMASA encoder handle */

lib_com/options.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -169,9 +169,7 @@
		#ifdef MASA_AND_OBJECTS
		#define MASAISM_EDIT_OBJECTS /* Nokia: Temporary command line editing of object directions in the decoder */
		#define OMASA_UPDATES /* Nokia: Updates to the OMASA processing */
		#define FIX_OMASA_DELAY_COMP /* Nokia: OMASA audio/meta delay compensation */

		#endif /* MASA_AND_OBJECTS */
		#endif


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

lib_dec/ivas_dec.c

+2 −22

Original line number	Diff line number	Diff line
		@@ -404,9 +404,7 @@ ivas_error ivas_dec(
		#ifdef MASA_AND_OBJECTS
		else if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
		{
		#ifdef FIX_OMASA_DELAY_COMP
		int16_t dirac_bs_md_write_idx = 0;
		#endif

		st = st_ivas->hCPE[0]->hCoreCoder[0];
		nb_bits_metadata[0] = 0;
		@@ -428,9 +426,7 @@ ivas_error ivas_dec(
		st_ivas->hDirAC->numIsmDirections = 0;
		}

		#ifdef FIX_OMASA_DELAY_COMP
		dirac_bs_md_write_idx = st_ivas->hDirAC->dirac_bs_md_write_idx; /* Store the write-index for this frame */
		#endif
		}

		/* MASA metadata decoding */
		@@ -481,12 +477,10 @@ ivas_error ivas_dec(
		if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC \|\| st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
		#endif
		{
		#ifdef FIX_OMASA_DELAY_COMP
		int16_t azimuth_ism;
		int16_t elevation_ism;
		int16_t block;
		int16_t meta_write_index;
		#endif

		/* decode ISM metadata */
		if ( ( error = ivas_ism_metadata_dec( ism_total_brate,
		@@ -506,7 +500,6 @@ ivas_error ivas_dec(
		{
		for ( n = 0; n < st_ivas->nchan_ism; n++ )
		{
		#ifdef FIX_OMASA_DELAY_COMP
		azimuth_ism = (int16_t) ( st_ivas->hIsmMetaData[n]->azimuth + 0.5f );
		elevation_ism = (int16_t) ( st_ivas->hIsmMetaData[n]->elevation + 0.5f );

		@@ -516,15 +509,10 @@ ivas_error ivas_dec(
		st_ivas->hMasaIsmData->azimuth_ism[n][meta_write_index] = azimuth_ism;
		st_ivas->hMasaIsmData->elevation_ism[n][meta_write_index] = elevation_ism;
		}
		#else
		st_ivas->hMasaIsmData->azimuth_ism[n] = (int16_t) ( st_ivas->hIsmMetaData[n]->azimuth + 0.5f );
		st_ivas->hMasaIsmData->elevation_ism[n] = (int16_t) ( st_ivas->hIsmMetaData[n]->elevation + 0.5f );
		#endif
		}
		}
		else /* ISM_MASA_MODE_MASA_ONE_OBJ */
		{
		#ifdef FIX_OMASA_DELAY_COMP
		azimuth_ism = (int16_t) ( st_ivas->hIsmMetaData[0]->azimuth + 0.5f );
		elevation_ism = (int16_t) ( st_ivas->hIsmMetaData[0]->elevation + 0.5f );

		@@ -534,10 +522,6 @@ ivas_error ivas_dec(
		st_ivas->hMasaIsmData->azimuth_separated_ism[meta_write_index] = azimuth_ism;
		st_ivas->hMasaIsmData->elevation_separated_ism[meta_write_index] = elevation_ism;
		}
		#else
		st_ivas->hMasaIsmData->azimuth_separated_ism = (int16_t) ( st_ivas->hIsmMetaData[0]->azimuth + 0.5f );
		st_ivas->hMasaIsmData->elevation_separated_ism = (int16_t) ( st_ivas->hIsmMetaData[0]->elevation + 0.5f );
		#endif
		}
		#else
		for ( n = 0; n < st_ivas->nchan_ism; n++ )
		@@ -647,9 +631,7 @@ ivas_error ivas_dec(
		#endif
		{
		float data_separated_objects[MAX_NUM_OBJECTS][L_FRAME48k];
		#ifdef FIX_OMASA_DELAY_COMP
		int16_t dirac_read_idx;
		#endif

		#ifdef OMASA_UPDATES
		if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ \|\| st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
		@@ -667,14 +649,12 @@ ivas_error ivas_dec(
		}
		}

		#ifdef FIX_OMASA_DELAY_COMP
		dirac_read_idx = st_ivas->hDirAC->dirac_read_idx;
		#endif

		ivas_dirac_dec( st_ivas, output, st_ivas->nchan_transport, NULL, NULL, -1 );

		#ifdef FIX_OMASA_DELAY_COMP
		st_ivas->hDirAC->dirac_read_idx = dirac_read_idx; /* Original read index is needed for the next function which will update it again */
		#endif

		ivas_masa_ism_separate_object_render( st_ivas, data_separated_objects, output, output_frame );
		}
		else

lib_dec/ivas_dirac_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -843,7 +843,7 @@ ivas_error ivas_dirac_dec_config(
		{
		hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES;
		}
		#ifdef FIX_OMASA_DELAY_COMP
		#ifdef MASA_AND_OBJECTS
		else if ( st_ivas->ivas_format == MASA_FORMAT \|\| st_ivas->ivas_format == MASA_ISM_FORMAT )
		#else
		else if ( st_ivas->ivas_format == MASA_FORMAT )