Merge branch 'nokia/contribution-omasa-combined-format-refactor-merge' of... (fe755e17) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+1 −57

Original line number	Diff line number	Diff line
		@@ -156,12 +156,6 @@ typedef struct
		uint16_t frontendFetchSizeMs;
		#endif
		#endif
		#ifdef MASAISM_EDIT_OBJECTS
		bool editing_ism_enabled;
		int16_t index_of_edited_ism;
		int16_t azimuth_edited_ism;
		int16_t elevation_edited_ism;
		#endif

		} DecArguments;

		@@ -684,16 +678,6 @@ int main(
		}
		}

		#ifdef MASAISM_EDIT_OBJECTS
		/------------------------------------------------------------------------------------------
		* Set edited object positions
		------------------------------------------------------------------------------------------/

		if ( arg.editing_ism_enabled )
		{
		IVAS_DEC_SetEditedIsmPositions( hIvasDec, arg.index_of_edited_ism, arg.azimuth_edited_ism, arg.elevation_edited_ism );
		}
		#endif

		/-----------------------------------------------------------------
		* Decoding
		@@ -911,9 +895,7 @@ static bool parseCmdlIVAS_dec(
		{
		int16_t i;
		char argv_to_upper[FILENAME_MAX];
		#ifdef MASAISM_EDIT_OBJECTS
		int32_t tmp1;
		#endif

		#ifdef DEBUGGING
		float ftmp;

		@@ -983,12 +965,6 @@ static bool parseCmdlIVAS_dec(
		#endif
		#endif

		#ifdef MASAISM_EDIT_OBJECTS
		arg->editing_ism_enabled = false;
		arg->index_of_edited_ism = 0;
		arg->azimuth_edited_ism = 0;
		arg->elevation_edited_ism = 0;
		#endif

		/-----------------------------------------------------------------
		* Initialization
		@@ -1351,38 +1327,6 @@ static bool parseCmdlIVAS_dec(
		}
		}

		#ifdef MASAISM_EDIT_OBJECTS
		else if ( strcmp( argv_to_upper, "-EDIT_ISM" ) == 0 ) /* Edit ISM position: objectID, azimuth (deg), elevation (deg) */
		{
		arg->editing_ism_enabled = true;
		i++;

		if ( argc - i <= 6 \|\| argv[i][0] == '-' )
		{
		fprintf( stderr, "Error: Edited ISM position parameters not defined! \n\n" );
		usage_dec();
		return false;
		}

		if ( sscanf( argv[i], "%d", &tmp1 ) > 0 )
		{
		arg->index_of_edited_ism = (int16_t) tmp1;
		i++;
		}

		if ( sscanf( argv[i], "%d", &tmp1 ) > 0 )
		{
		arg->azimuth_edited_ism = (int16_t) tmp1;
		i++;
		}

		if ( sscanf( argv[i], "%d", &tmp1 ) > 0 )
		{
		arg->elevation_edited_ism = (int16_t) tmp1;
		i++;
		}
		}
		#endif

		/-----------------------------------------------------------------
		* Option not recognized

lib_com/bitstream.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -553,23 +553,23 @@ int16_t get_ivas_max_num_indices(
		}
		else if ( ivas_total_brate <= IVAS_160k )
		{
		return 850;
		return 1150;
		}
		else if ( ivas_total_brate <= IVAS_192k )
		{
		return 950;
		return 1250;
		}
		else if ( ivas_total_brate <= IVAS_256k )
		{
		return 1300;
		return 1400;
		}
		else if ( ivas_total_brate <= IVAS_384k )
		{
		return 1450;
		return 1650;
		}
		else
		{
		return 1650;
		return 1850;
		}
		}
		#endif

lib_com/options.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -207,9 +207,7 @@
		#define FIX_549_PARAM_ISM_BIN_GAIN /* FhG: Issue 549 : fix too quiet binaural output in ParamISM */

		#define MASA_AND_OBJECTS /* Nokia: Combination of MASA and objects */
		#ifdef MASA_AND_OBJECTS
		#define MASAISM_EDIT_OBJECTS /* Nokia: Temporary command line editing of object directions in the decoder */
		#endif



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

lib_dec/lib_dec.c

+0 −29

Original line number	Diff line number	Diff line
		@@ -1447,35 +1447,6 @@ ivas_error IVAS_DEC_GetHrtfCRendHandle(
		}


		#ifdef MASAISM_EDIT_OBJECTS
		/---------------------------------------------------------------------
		* IVAS_DEC_SetEditedIsmPositions( )
		*
		*
		---------------------------------------------------------------------/

		ivas_error IVAS_DEC_SetEditedIsmPositions(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		int16_t index_of_edited_ism, /* i : Index of edited ISM */
		int16_t azimuth_edited_ism, /* i : Azimuth */
		int16_t elevation_edited_ism /* i : Elevation */
		)
		{
		if ( hIvasDec == NULL \|\| hIvasDec->st_ivas == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		hIvasDec->st_ivas->editing_ism_enabled = 1;
		hIvasDec->st_ivas->index_of_edited_ism = index_of_edited_ism;
		hIvasDec->st_ivas->azimuth_edited = azimuth_edited_ism;
		hIvasDec->st_ivas->elevation_edited = elevation_edited_ism;

		return IVAS_ERR_OK;
		}
		#endif


		/---------------------------------------------------------------------
		* IVAS_DEC_GetHrtfFastConvHandle( )
		*

lib_dec/lib_dec.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -370,14 +370,6 @@ ivas_error IVAS_DEC_GetHrtfParamBinHandle(
		IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin / o : Parametric binauralizer HRTF handle */
		);

		#ifdef MASAISM_EDIT_OBJECTS
		ivas_error IVAS_DEC_SetEditedIsmPositions(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		int16_t index_of_edited_ism, /* i : Index of edited ISM */
		int16_t azimuth_edited_ism, /* i : Azimuth */
		int16_t elevation_edited_ism /* i : Elevation */
		);
		#endif

		/! r: error code/
		ivas_error IVAS_DEC_GetRenderConfig(