add FIX_1419_MONO_STEREO_UMX; enable mono/stereo rendering to all output configurations (85913c3c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -150,6 +150,9 @@ typedef struct
		uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];
		bool objEditEnabled;
		char *objEditFileName;
		#ifdef FIX_1419_MONO_STEREO_UMX
		bool evsMode;
		#endif

		} DecArguments;

		@@ -961,6 +964,9 @@ static bool parseCmdlIVAS_dec(
		arg->output_Fs = IVAS_MAX_SAMPLING_RATE;
		arg->outputConfig = IVAS_AUDIO_CONFIG_MONO;
		arg->decMode = IVAS_DEC_MODE_IVAS;
		#ifdef FIX_1419_MONO_STEREO_UMX
		arg->evsMode = false;
		#endif
		arg->quietModeEnabled = false;
		arg->delayCompensationEnabled = true;
		arg->voipMode = false;
		@@ -1502,6 +1508,14 @@ static bool parseCmdlIVAS_dec(
		}
		i++;
		}
		#ifdef FIX_1419_MONO_STEREO_UMX
		else if ( strcmp( argv_to_upper, "-EVS" ) == 0 )
		{
		arg->evsMode = true;
		arg->decMode = IVAS_DEC_MODE_EVS;
		i++;
		}
		#endif

		/-----------------------------------------------------------------
		* Option not recognized
		@@ -1644,6 +1658,9 @@ static bool parseCmdlIVAS_dec(
		static void usage_dec( void )
		{
		fprintf( stdout, "Usage for EVS: IVAS_dec.exe [Options] Fs bitstream_file output_file\n" );
		#ifdef FIX_1419_MONO_STEREO_UMX
		fprintf( stdout, " OR usage for IVAS (below) with -evs option and OutputConf\n" );
		#endif
		fprintf( stdout, "Usage for IVAS: IVAS_dec.exe [Options] OutputConf Fs bitstream_file output_file\n\n" );

		fprintf( stdout, "Mandatory parameters:\n" );
		@@ -1660,6 +1677,9 @@ static void usage_dec( void )

		fprintf( stdout, "Options:\n" );
		fprintf( stdout, "--------\n" );
		#ifdef FIX_1419_MONO_STEREO_UMX
		fprintf( stdout, "-evs : Specify EVS mode for supplied bitstream\n" );
		#endif
		fprintf( stdout, "-VOIP : VoIP mode: RTP in G192\n" );
		fprintf( stdout, "-VOIP_hf_only=0 : VoIP mode: EVS RTP Payload Format hf_only=0 in rtpdump\n" );
		#ifdef IVAS_RTPDUMP

lib_com/common_api_types.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,18 @@ typedef enum _ivas_binaural_renderer_type
		IVAS_BIN_RENDERER_TYPE_DEFAULT,

		} IVAS_BIN_RENDERER_TYPE;
		#ifdef FIX_1419_MONO_STEREO_UMX

		typedef struct _IVAS_MS_UMX_CONF_DATA
		{
		int16_t spatialEnabled; /* internal flag for spatial rendering */
		int16_t stereoLR; /* internal flag to use ±90 for BRIRs */
		float radius;
		float azi[2];
		float ele[2];

		} IVAS_MS_UMX_CONF_DATA, *IVAS_MS_UMX_CONF_HANDLE;
		#endif

		/----------------------------------------------------------------------------------
		* Split rendering API constants, structures, and enums
		@@ -335,6 +347,9 @@ typedef struct _IVAS_RENDER_CONFIG
		#endif
		IVAS_ROOM_ACOUSTICS_CONFIG_DATA roomAcoustics;
		ISAR_SPLIT_REND_CONFIG_DATA split_rend_config;
		#ifdef FIX_1419_MONO_STEREO_UMX
		IVAS_MS_UMX_CONF_DATA mono_stereo_upmix_config;
		#endif
		float directivity[IVAS_MAX_NUM_OBJECTS * 3];
		float distAtt[3];

lib_com/ivas_cnst.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -1248,7 +1248,11 @@ typedef enum
		----------------------------------------------------------------------------------/

		#define MC_LS_SETUP_BITS 3 /* number of bits for writing the MC LS configuration */
		#ifdef FIX_1419_MONO_STEREO_UMX
		#define LS_SETUP_CONVERSION_NUM_MAPPINGS 41 /* number of mappings for LS setup conversion */
		#else
		#define LS_SETUP_CONVERSION_NUM_MAPPINGS 35 /* number of mappings for LS setup conversion */
		#endif

		typedef enum
		{

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,7 @@
		#define FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add split rendering support to decoder in VoIP mode */
		#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
		#define FIX_1413_IGF_INIT_PRINTOUT /* FhG: use correct variable for IGF initiliazation */
		#define FIX_1419_MONO_STEREO_UMX /* FhG: fix for issue 1418 : support upmix to all output formats for mono and stereo */


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

lib_dec/ivas_init_dec.c

+56 −2

Original line number	Diff line number	Diff line
		@@ -1279,7 +1279,15 @@ ivas_error ivas_init_decoder(

		if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		#ifdef FIX_1419_MONO_STEREO_UMX
		if ( st_ivas->ivas_format == MONO_FORMAT )
		{
		hDecoderConfig->nchan_out = 1;
		}
		else if ( st_ivas->ivas_format == STEREO_FORMAT )
		#else
		if ( st_ivas->ivas_format == STEREO_FORMAT )
		#endif
		{
		hDecoderConfig->nchan_out = CPE_CHANNELS;
		}
		@@ -1332,12 +1340,29 @@ ivas_error ivas_init_decoder(
		st_ivas->hOutSetup.output_config = st_ivas->intern_config;
		st_ivas->hOutSetup.nchan_out_woLFE = audioCfg2channels( st_ivas->intern_config );
		}
		#ifdef FIX_1419_MONO_STEREO_UMX

		if ( st_ivas->ivas_format == MONO_FORMAT \|\| st_ivas->ivas_format == STEREO_FORMAT )
		{
		st_ivas->transport_config = ( st_ivas->ivas_format == MONO_FORMAT ) ? IVAS_AUDIO_CONFIG_MONO : IVAS_AUDIO_CONFIG_STEREO;
		}
		#endif

		/* Only initialize transport setup if it is used */
		if ( st_ivas->transport_config != IVAS_AUDIO_CONFIG_INVALID )
		{
		ivas_output_init( &( st_ivas->hTransSetup ), st_ivas->transport_config );
		}
		#ifdef FIX_1419_MONO_STEREO_UMX

		/* Override transport config values from render config */
		if ( st_ivas->ivas_format == MONO_FORMAT \|\| st_ivas->ivas_format == STEREO_FORMAT )
		{
		// TODO check status of render config; is this a sanitizer issue if it is not always enabled?
		st_ivas->hTransSetup.ls_azimuth = st_ivas->hRenderConfig->mono_stereo_upmix_config.azi;
		st_ivas->hTransSetup.ls_elevation = st_ivas->hRenderConfig->mono_stereo_upmix_config.ele;
		}
		#endif

		if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA )
		{
		@@ -1414,7 +1439,9 @@ ivas_error ivas_init_decoder(
		else if ( st_ivas->ivas_format == STEREO_FORMAT )
		{
		st_ivas->nchan_transport = CPE_CHANNELS;
		#ifndef FIX_1419_MONO_STEREO_UMX /* already set now by renderer_select() */
		st_ivas->intern_config = IVAS_AUDIO_CONFIG_STEREO;
		#endif

		st_ivas->nSCE = 0;
		st_ivas->nCPE = 1; /* in stereo, there is always only one CPE */
		@@ -2148,7 +2175,13 @@ ivas_error ivas_init_decoder(
		}
		else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
		{
		#ifdef FIX_1419_MONO_STEREO_UMX
		if ( ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) &&
		( ( st_ivas->ivas_format == MONO_FORMAT \|\| st_ivas->ivas_format == STEREO_FORMAT ) \|\|
		( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->ivas_format == MC_FORMAT ) ) )
		#else
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->ivas_format == MC_FORMAT && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )
		#endif
		{
		if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth, st_ivas->hIntSetup.ls_elevation, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK )
		{
		@@ -2304,7 +2337,8 @@ ivas_error ivas_init_decoder(
		}

		/-----------------------------------------------------------------
		* LFE handles for rendering after rendering to adjust LFE delay to filter delay
		* LFE handles for rendering after rendering to adjust LFE delay to
		* filter delay
		-----------------------------------------------------------------/

		if ( st_ivas->mc_mode == MC_MODE_MCT \|\| st_ivas->mc_mode == MC_MODE_PARAMUPMIX )
		@@ -3136,10 +3170,19 @@ static ivas_error doSanityChecks_IVAS(
		return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Error: Non-diegetic panning not supported in this IVAS format" );
		}

		#ifndef FIX_1419_MONO_STEREO_UMX /* we now support basically everything for stereo */
		/* Verify stereo output configuration */
		if ( st_ivas->ivas_format == STEREO_FORMAT )
		{
		if ( output_config != IVAS_AUDIO_CONFIG_MONO && output_config != IVAS_AUDIO_CONFIG_STEREO && output_config != IVAS_AUDIO_CONFIG_5_1 && output_config != IVAS_AUDIO_CONFIG_7_1 && output_config != IVAS_AUDIO_CONFIG_5_1_2 && output_config != IVAS_AUDIO_CONFIG_5_1_4 && output_config != IVAS_AUDIO_CONFIG_7_1_4 && output_config != IVAS_AUDIO_CONFIG_LS_CUSTOM && output_config != IVAS_AUDIO_CONFIG_EXTERNAL )
		if ( output_config != IVAS_AUDIO_CONFIG_MONO &&
		output_config != IVAS_AUDIO_CONFIG_STEREO &&
		output_config != IVAS_AUDIO_CONFIG_5_1 &&
		output_config != IVAS_AUDIO_CONFIG_7_1 &&
		output_config != IVAS_AUDIO_CONFIG_5_1_2 &&
		output_config != IVAS_AUDIO_CONFIG_5_1_4 &&
		output_config != IVAS_AUDIO_CONFIG_7_1_4 &&
		output_config != IVAS_AUDIO_CONFIG_LS_CUSTOM &&
		output_config != IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Wrong output configuration specified for Stereo!" );
		}
		@@ -3148,10 +3191,21 @@ static ivas_error doSanityChecks_IVAS(
		else
		{
		if ( output_config == IVAS_AUDIO_CONFIG_INVALID )
		#else /* exclude invalid configs instead of matching valid ones */
		if ( output_config == IVAS_AUDIO_CONFIG_INVALID \|\|
		output_config == IVAS_AUDIO_CONFIG_ISM1 \|\|
		output_config == IVAS_AUDIO_CONFIG_ISM2 \|\|
		output_config == IVAS_AUDIO_CONFIG_ISM3 \|\|
		output_config == IVAS_AUDIO_CONFIG_ISM4 \|\|
		output_config == IVAS_AUDIO_CONFIG_MASA1 \|\|
		output_config == IVAS_AUDIO_CONFIG_MASA2 )
		#endif
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified!" );
		}
		#ifndef FIX_1419_MONO_STEREO_UMX
		}
		#endif

		if ( ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) && output_Fs != 48000 )
		{