Merge branch 'main' of ssh://forge.3gpp.org:29419/ivas-codec-pc/ivas-codec into fix-rtp-tmp (78b1f30f) · Commits · IVAS Codec Public Collaboration / IVAS Codec

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,7 @@ DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS

		.PHONY: all clean

		all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND)
		all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND) $(CLI_AMBICONVERT)

		$(OBJDIR):
		$(QUIET)mkdir -p $(OBJDIR)

apps/ambi_converter.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -78,8 +78,8 @@ int main( int argc, char *argv[] )
		if ( argc != 5 )
		{
		printf( "----------------------------------------------------------------------------------\n" );
		printf( "Usage:\n" );
		printf( "./ambi_converter input_file output_file input_convention output_convention\n" );
		printf( "\n" );
		printf( "Usage: ambi_converter input_file output_file input_convention output_convention\n" );
		printf( "\n" );
		printf( "input_convention and output convention must be an integer number in [0,5]\n" );
		printf( "the following conventions are supported:\n" );

apps/decoder.c

+138 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,10 @@
		#ifdef IVAS_RTPDUMP
		#include "ivas_rtp_file.h"
		#endif
		#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT
		#include "ivas_cnst.h"
		#endif

		#include "jbm_file_writer.h"
		#include "hrtf_file_reader.h"
		#include "ls_custom_file_reader.h"
		@@ -155,6 +159,9 @@ typedef struct
		uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];
		bool objEditEnabled;
		char *objEditFileName;
		#ifdef FIX_1419_MONO_STEREO_UMX
		bool evsMode;
		#endif

		} DecArguments;

		@@ -226,6 +233,10 @@ int main(
		IVAS_RENDER_FRAMESIZE asked_frame_size;
		IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;
		ObjectEditFileReader *objectEditFileReader = NULL;
		#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT
		IVAS_ROOM_ACOUSTICS_CONFIG_DATA **pAE = NULL;
		uint32_t aeCount = 0;
		#endif
		#ifdef DEBUGGING
		int32_t noClipping;
		int32_t cnt_frames_limited;
		@@ -450,7 +461,11 @@ int main(
		------------------------------------------------------------------------------------------/

		asked_frame_size = arg.renderFramesize;
		#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT
		uint16_t aeID = arg.aeSequence.count > 0 ? arg.aeSequence.pID[0] : IVAS_DEFAULT_AEID;
		#else
		uint16_t aeID = arg.aeSequence.count > 0 ? arg.aeSequence.pID[0] : 65535;
		#endif

		#ifdef IVAS_RTPDUMP
		arg.enableHeadRotation = arg.enableHeadRotation \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM;
		@@ -631,6 +646,47 @@ int main(
		fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );
		goto cleanup;
		}
		#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT
		aeCount = RenderConfigReader_getAcousticEnvironmentCount( renderConfigReader );
		if ( aeCount > 0 )
		{
		uint32_t n;

		pAE = malloc( aeCount * sizeof( IVAS_ROOM_ACOUSTICS_CONFIG_DATA * ) );

		if ( pAE == NULL )
		{
		fprintf( stderr, "\nError: cannot allocate memory for acoustic environment array\n\n" );
		goto cleanup;
		}

		for ( n = 0; n < aeCount; n++ )
		{
		pAE[n] = NULL;

		if ( NULL == ( pAE[n] = malloc( sizeof( IVAS_ROOM_ACOUSTICS_CONFIG_DATA ) ) ) )
		{
		fprintf( stderr, "\nError: cannot allocate memory for acoustic environment\n\n" );
		goto cleanup;
		}
		}

		if ( ( error = RenderConfigReader_getAcousticEnvironments( renderConfigReader, pAE ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error while getting acoustic environments\n\n" );
		goto cleanup;
		}

		for ( n = 0; n < aeCount; n++ )
		{
		if ( ( error = IVAS_DEC_AddAcousticEnvironment( hIvasDec, *pAE[n] ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to add acoustic environments\n\n" );
		goto cleanup;
		}
		}
		}
		#endif

		if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, arg.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK )
		{
		@@ -669,7 +725,11 @@ int main(

		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT
		if ( ( error = IVAS_DEC_GetAcousticEnvironment( hIvasDec, aeID, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		#else
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, aeID, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		#endif
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		@@ -804,6 +864,19 @@ cleanup:

		free( pcmBuf );

		#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT
		if ( pAE != NULL )
		{
		uint16_t n;

		for ( n = 0; n < aeCount; n++ )
		{
		free( pAE[n] );
		}

		free( pAE );
		}
		#endif
		if ( arg.aeSequence.count > 0 )
		{
		free( arg.aeSequence.pID );
		@@ -971,6 +1044,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;
		@@ -1524,6 +1600,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
		@@ -1574,6 +1658,14 @@ static bool parseCmdlIVAS_dec(
		usage_dec();
		return false;
		}
		#ifdef FIX_1419_MONO_STEREO_UMX
		else if ( arg->non_diegetic_pan_enabled && arg->outputConfig == IVAS_AUDIO_CONFIG_STEREO && arg->evsMode )
		{
		fprintf( stderr, "Error: Both non-diegetic panning and stereo output specified!\n\n" );
		usage_dec();
		return false;
		}
		#endif

		if ( arg->outputMdFilename != NULL && arg->outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		@@ -1666,6 +1758,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" );
		@@ -1682,6 +1777,9 @@ static void usage_dec( void )

		fprintf( stdout, "Options:\n" );
		fprintf( stdout, "--------\n" );
		#ifdef FIX_1419_MONO_STEREO_UMX
		fprintf( stdout, "-evs : Specify that the supplied bitstream is an EVS 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
		@@ -4154,6 +4252,46 @@ static void do_object_editing(
		editableParameters->ism_metadata[obj_idx].elevation = readInfo->obj_ele[obj_idx];
		}
		}
		#ifdef FIX_1427_OBJ_EDITING_EXT_METADATA
		/* object direction editing only for diegetic objects */
		if ( readInfo->obj_yaw_edited[obj_idx] )
		{
		if ( readInfo->obj_yaw_relative[obj_idx] )
		{
		/* yaw: apply relative edit + wrap */
		editableParameters->ism_metadata[obj_idx].yaw = fmodf( editableParameters->ism_metadata[obj_idx].yaw + readInfo->obj_yaw[obj_idx] + 540.f, 360.f ) - 180.f;
		}
		else
		{
		editableParameters->ism_metadata[obj_idx].yaw = readInfo->obj_yaw[obj_idx];
		}
		}
		if ( readInfo->obj_pitch_edited[obj_idx] )
		{
		if ( readInfo->obj_pitch_relative[obj_idx] )
		{
		/* pitch: apply relative edit + saturation */
		editableParameters->ism_metadata[obj_idx].pitch = fmaxf( fminf( editableParameters->ism_metadata[obj_idx].pitch + readInfo->obj_pitch[obj_idx], 90.f ), -90.f );
		}
		else
		{
		editableParameters->ism_metadata[obj_idx].pitch = readInfo->obj_pitch[obj_idx];
		}
		}
		/* radius editing only for diegetic objects */
		if ( readInfo->obj_radius_edited[obj_idx] )
		{
		if ( readInfo->obj_radius_relative[obj_idx] )
		{
		/* radius: apply relative edit + saturation */
		editableParameters->ism_metadata[obj_idx].radius = fmaxf( fminf( editableParameters->ism_metadata[obj_idx].radius * readInfo->obj_radius[obj_idx], OBJ_EDIT_RADIUS_MAX ), 0.0f );
		}
		else
		{
		editableParameters->ism_metadata[obj_idx].radius = readInfo->obj_radius[obj_idx];
		}
		}
		#endif
		}

		/* gain editing for all objects */

lib_com/common_api_types.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -312,6 +312,9 @@ typedef enum
		#endif
		typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG
		{
		#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT
		uint16_t aeID; /* Acoustic environment ID*/
		#endif
		int16_t nBands; /* Number of frequency bands for which reverb properties are provided, integer, range [2..256] */
		float pFc_input[IVAS_CLDFB_NO_CHANNELS_MAX]; /* Center frequencies for which following values are provided: */
		float pAcoustic_rt60[IVAS_CLDFB_NO_CHANNELS_MAX]; /* - The room's T60 per center frequency */

lib_com/ivas_cnst.h

100755 → 100644

+17 −0

Original line number	Diff line number	Diff line
		@@ -177,6 +177,12 @@ typedef enum
		#define MAX_SPAR_INTERNAL_CHANNELS IVAS_SPAR_MAX_CH
		#define MAX_CLDFB_DIGEST_CHANNELS 3 /* == maximum of ParamISM TCs and ParamMC TCs */

		#ifdef FIX_GAIN_EDIT_LIMITS
		#define EDIT_GAIN_MIN 0.0630957f /* Minimum allowed gain edit with parametric modes: -24 dB */
		#define EDIT_GAIN_MAX 3.9810719f /* Maximum allowed gain edit: +12 dB */
		#endif


		typedef enum
		{
		TC_BUFFER_MODE_RENDERER,
		@@ -1251,7 +1257,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
		{
		@@ -1483,6 +1493,10 @@ typedef enum

		#define VBAP_NUM_SEARCH_SECTORS 4

		#ifdef NONBE_FIX_1426_STEREO_PANNING_BETWEEN_OPT_LEVEL
		#define LS_ANGLE_RAD_30_DEG 0.52359879f /* 30.0f * PI_OVER_180 */
		#define INV_TAN_LS_ANGLE_RAD_30_DEG 1.7320507f /* 1.0f/tanf(30.0f * PI_OVER_180) */
		#endif

		/----------------------------------------------------------------------------------
		* Binaural Rendering Constants
		@@ -1588,6 +1602,9 @@ typedef enum
		#define RV_LENGTH_NR_FC ( RV_FILTER_MAX_FFT_SIZE / 2 ) + 1
		#define RV_LENGTH_NR_FC_16KHZ ( RV_FILTER_MAX_FFT_SIZE / 4 ) + 1
		#define IVAS_REVERB_DEFAULT_N_BANDS 31
		#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT
		#define IVAS_DEFAULT_AEID ( 65535 )
		#endif

		#define LR_IAC_LENGTH_NR_FC ( RV_LENGTH_NR_FC )
		#define LR_IAC_LENGTH_NR_FC_16KHZ ( RV_LENGTH_NR_FC_16KHZ )

Admin message