Merge branch '1899-ref-PortFlpMr1645' into 'ivas-float-update' (dd0cceed) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+47 −0

Original line number	Diff line number	Diff line
		@@ -130,7 +130,11 @@ typedef struct
		bool customLsOutputEnabled;
		char *customLsSetupFilename;
		int16_t orientation_tracking;
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		bool non_diegetic_pan_enabled;
		#else
		int16_t Opt_non_diegetic_pan;
		#endif
		float non_diegetic_pan_gain;
		bool renderConfigEnabled;
		char *renderConfigFilename;
		@@ -154,7 +158,11 @@ typedef struct
		#else
		uint16_t acousticEnvironmentId;
		#endif
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		bool dpidEnabled;
		#else
		int16_t Opt_dpid_on;
		#endif
		uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

		} DecArguments;
		@@ -418,8 +426,12 @@ int main(
		if ( arg.renderConfigEnabled )
		{
		/* sanity check */
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM && arg.non_diegetic_pan_enabled == false )
		#else
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM &&
		arg.Opt_non_diegetic_pan == 0 )
		#endif
		{
		fprintf( stderr, "\nError: Renderer configuration file cannot be used in this output configuration.\n\n" );
		goto cleanup;
		@@ -441,8 +453,13 @@ int main(

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		uint16_t aeID = arg.aeSequence.count > 0 ? arg.aeSequence.pID[0] : 65535;
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.non_diegetic_pan_enabled, arg.non_diegetic_pan_gain,
		arg.dpidEnabled, aeID, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain,
		arg.Opt_dpid_on, aeID, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
		#endif
		#else
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain,
		arg.Opt_dpid_on, arg.acousticEnvironmentId, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
		@@ -619,9 +636,13 @@ int main(
		IVAS_RENDER_CONFIG_DATA renderConfig;

		/* sanity check */
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM && arg.non_diegetic_pan_enabled == false )
		#else
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB &&
		arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM &&
		arg.Opt_non_diegetic_pan == 0 )
		#endif
		{
		fprintf( stderr, "\nExternal Renderer Config is supported only when binaural output configurations is used as output OR when Split rendering mode is enabled. Exiting. \n" );
		goto cleanup;
		@@ -1123,12 +1144,20 @@ static bool parseCmdlIVAS_dec(

		arg->renderConfigEnabled = false;
		arg->renderConfigFilename = NULL;
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		arg->dpidEnabled = false;
		#else
		arg->Opt_dpid_on = 0;
		#endif

		arg->outputMdFilename = NULL;

		arg->inputFormat = IVAS_DEC_INPUT_FORMAT_G192;
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		arg->non_diegetic_pan_enabled = false;
		#else
		arg->Opt_non_diegetic_pan = 0;
		#endif
		arg->non_diegetic_pan_gain = 0.f;
		arg->tsmEnabled = false;
		arg->renderFramesize = IVAS_RENDER_FRAMESIZE_20MS;
		@@ -1471,7 +1500,11 @@ static bool parseCmdlIVAS_dec(
		else if ( strcmp( argv_to_upper, "-NON_DIEGETIC_PAN" ) == 0 )
		{
		i++;
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		arg->non_diegetic_pan_enabled = true;
		#else
		arg->Opt_non_diegetic_pan = 1;
		#endif
		strncpy( argv_to_upper, argv[i], sizeof( argv_to_upper ) - 1 );
		argv_to_upper[sizeof( argv_to_upper ) - 1] = '\0';
		to_upper( argv_to_upper );
		@@ -1619,7 +1652,11 @@ static bool parseCmdlIVAS_dec(
		{
		int16_t id, tmp;

		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		arg->dpidEnabled = true;
		#else
		arg->Opt_dpid_on = 1;
		#endif
		++i;
		tmp = 0;
		while ( is_number( argv[i + tmp] ) && tmp < IVAS_MAX_NUM_OBJECTS )
		@@ -1699,7 +1736,12 @@ static bool parseCmdlIVAS_dec(
		arg->customLsSetupFilename = argv[i];
		}
		i++;

		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		if ( arg->non_diegetic_pan_enabled && arg->outputConfig != IVAS_AUDIO_CONFIG_STEREO )
		#else
		if ( ( arg->Opt_non_diegetic_pan ) && ( arg->outputConfig != IVAS_AUDIO_CONFIG_STEREO ) )
		#endif
		{
		fprintf( stderr, "Error: non-diegetic panning is supported in stereo only\n\n" );
		usage_dec();
		@@ -1716,7 +1758,12 @@ static bool parseCmdlIVAS_dec(
		{
		arg->outputConfig = IVAS_AUDIO_CONFIG_MONO;
		arg->decMode = IVAS_DEC_MODE_EVS;

		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		if ( arg->non_diegetic_pan_enabled )
		#else
		if ( ( arg->Opt_non_diegetic_pan ) )
		#endif
		{
		arg->outputConfig = IVAS_AUDIO_CONFIG_STEREO;
		}

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,7 @@
		#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER /* FhG: issue 1128: set output ambisonics order to input order for EXT output */
		#define FIX_1138_SBA_EXT_ERROR_PRINTOUT /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */
		#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */
		#define FIX_745_FIX_DATA_TYPE_CONVERSION /* VA: issue 745: implicit data type conversion when calling IVAS_DEC_Configure() */
		#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */
		#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */
		#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/

lib_dec/lib_dec.c

+59 −15

Original line number	Diff line number	Diff line
		@@ -400,10 +400,28 @@ static IVAS_DEC_BS_FORMAT mapIvasFormat(
		---------------------------------------------------------------------/

		ivas_error IVAS_DEC_Configure(
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		const uint32_t sampleRate, /* i : output sampling frequency */
		const AUDIO_CONFIG outputConfig, /* i : output configuration */
		const int16_t tsmEnabled, /* i : enable time scale modification */
		const IVAS_AUDIO_CONFIG outputConfig, /* i : output configuration */
		const bool tsmEnabled, /* i : enable time scale modification */
		const IVAS_RENDER_FRAMESIZE renderFramesize, /* i : rendering frame size */
		const bool customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */
		const bool hrtfReaderEnabled, /* i : enable HRTF binary file input */
		const bool enableHeadRotation, /* i : enable head rotation for binaural output */
		const bool enableExternalOrientation, /* i : enable external orientations */
		const IVAS_HEAD_ORIENT_TRK_T orientation_tracking, /* i : head orientation tracking type */
		const bool renderConfigEnabled, /* i : enable Renderer config. file for binaural output */
		const bool non_diegetic_pan_enabled, /* i : enabled diegetic panning */
		const float non_diegetic_pan_gain, /* i : non diegetic panning gain */
		const bool dpidEnabled, /* i : enable directivity pattern option */
		const uint16_t acousticEnvironmentId, /* i : Acoustic environment ID */
		const bool delayCompensationEnabled /* i : enable delay compensation */
		#else
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		const uint32_t sampleRate, /* i : output sampling frequency */
		const IVAS_AUDIO_CONFIG outputConfig, /* i : audio configuration */
		const int16_t tsmEnabled, /* i : enable TSM */
		const IVAS_RENDER_FRAMESIZE renderFramesize, /* i : rendering frame size */
		const int16_t customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */
		const int16_t hrtfReaderEnabled, /* i : enable HRTF binary file input */
		@@ -416,6 +434,7 @@ ivas_error IVAS_DEC_Configure(
		const int16_t Opt_dpid_on, /* i : enable directivity pattern option */
		const uint16_t acousticEnvironmentId, /* i : Acoustic environment ID */
		const int16_t delayCompensationEnabled /* i : enable delay compensation */
		#endif
		)
		{
		Decoder_Struct *st_ivas;
		@@ -432,8 +451,13 @@ ivas_error IVAS_DEC_Configure(
		return IVAS_ERR_WRONG_PARAMS;
		}

		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		if ( hIvasDec->mode == IVAS_DEC_MODE_EVS && !( ( outputConfig == IVAS_AUDIO_CONFIG_MONO && !non_diegetic_pan_enabled ) \|\|
		( outputConfig == IVAS_AUDIO_CONFIG_STEREO && non_diegetic_pan_enabled ) ) )
		#else
		if ( hIvasDec->mode == IVAS_DEC_MODE_EVS && !( ( outputConfig == IVAS_AUDIO_CONFIG_MONO && Opt_non_diegetic_pan == 0 ) \|\|
		( outputConfig == IVAS_AUDIO_CONFIG_STEREO && Opt_non_diegetic_pan == 1 ) ) )
		#endif
		{
		return IVAS_ERR_WRONG_MODE;
		}
		@@ -461,17 +485,37 @@ ivas_error IVAS_DEC_Configure(
		hDecoderConfig->nchan_out = audioCfg2channels( hDecoderConfig->output_config );
		}

		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		hDecoderConfig->Opt_tsm = (int16_t) tsmEnabled;
		hDecoderConfig->Opt_LsCustom = (int16_t) customLsOutputEnabled;
		hDecoderConfig->Opt_Headrotation = (int16_t) enableHeadRotation;
		#else
		hDecoderConfig->Opt_tsm = tsmEnabled;
		hDecoderConfig->Opt_LsCustom = customLsOutputEnabled;
		hDecoderConfig->Opt_Headrotation = enableHeadRotation;
		#endif
		hDecoderConfig->orientation_tracking = orientation_tracking;
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		hDecoderConfig->Opt_HRTF_binary = (int16_t) hrtfReaderEnabled;
		hDecoderConfig->Opt_RendConfigCustom = (int16_t) renderConfigEnabled;
		hDecoderConfig->Opt_non_diegetic_pan = (int16_t) non_diegetic_pan_enabled;
		#else
		hDecoderConfig->Opt_HRTF_binary = hrtfReaderEnabled;
		hDecoderConfig->Opt_RendConfigCustom = renderConfigEnabled;
		hDecoderConfig->Opt_non_diegetic_pan = Opt_non_diegetic_pan;
		#endif
		hDecoderConfig->non_diegetic_pan_gain = non_diegetic_pan_gain;
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		hDecoderConfig->Opt_delay_comp = (int16_t) delayCompensationEnabled;
		#else
		hDecoderConfig->Opt_delay_comp = delayCompensationEnabled;
		#endif
		hDecoderConfig->Opt_ExternalOrientation = enableExternalOrientation;
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		hDecoderConfig->Opt_dpid_on = (int16_t) dpidEnabled;
		#else
		hDecoderConfig->Opt_dpid_on = Opt_dpid_on;
		#endif
		hDecoderConfig->Opt_aeid_on = acousticEnvironmentId != 65535 ? TRUE : FALSE;

		if ( renderFramesize == IVAS_RENDER_FRAMESIZE_UNKNOWN )

lib_dec/lib_dec.h

+19 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,24 @@ ivas_error IVAS_DEC_Open(

		/! r: error code /
		ivas_error IVAS_DEC_Configure(
		#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		const uint32_t sampleRate, /* i : output sampling frequency */
		const IVAS_AUDIO_CONFIG outputConfig, /* i : output configuration */
		const bool tsmEnabled, /* i : enable time scale modification */
		const IVAS_RENDER_FRAMESIZE renderFramesize, /* i : rendering frame size */
		const bool customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */
		const bool hrtfReaderEnabled, /* i : enable HRTF binary file input */
		const bool enableHeadRotation, /* i : enable head rotation for binaural output */
		const bool enableExternalOrientation, /* i : enable external orientations */
		const IVAS_HEAD_ORIENT_TRK_T orientation_tracking, /* i : head orientation tracking type */
		const bool renderConfigEnabled, /* i : enable Renderer config. file for binaural output */
		const bool non_diegetic_pan_enabled, /* i : enabled diegetic panning */
		const float non_diegetic_pan_gain, /* i : non diegetic panning gain */
		const bool dpidEnabled, /* i : enable directivity pattern option */
		const uint16_t acousticEnvironmentId, /* i : Acoustic environment ID */
		const bool delayCompensationEnabled /* i : enable delay compensation */
		#else
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		const uint32_t sampleRate, /* i : output sampling frequency */
		const IVAS_AUDIO_CONFIG outputConfig, /* i : audio configuration */
		@@ -134,6 +152,7 @@ ivas_error IVAS_DEC_Configure(
		const int16_t Opt_dpid_on, /* i : enable directivity pattern option */
		const uint16_t acousticEnvironmentId, /* i : Acoustic environment ID */
		const int16_t delayCompensationEnabled /* i : enable delay compensation */
		#endif
		);

		void IVAS_DEC_Close(