Merge branch 'main' into ci/check-compatibility-with-float-reference-branch (2736e877) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+26 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,10 @@ typedef struct
		char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		int8_t orientation_tracking;
		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		int16_t Opt_Headrotation;
		int16_t Opt_ExternalOrientation;
		#endif
		int16_t nonDiegeticPan;
		float nonDiegeticPanGain;
		IVAS_REND_COMPLEXITY_LEVEL complexityLevel;
		@@ -882,7 +886,11 @@ int main(

		const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );

		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, args.nonDiegeticPanGain, args.Opt_Headrotation, args.Opt_ExternalOrientation, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, args.nonDiegeticPanGain, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "Error opening renderer handle: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		@@ -2510,7 +2518,12 @@ static CmdlnArgs defaultArgs(
		clearString( args.renderConfigFilePath );
		clearString( args.externalOrientationFilePath );

		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		args.Opt_Headrotation = 0;
		args.Opt_ExternalOrientation = 0;
		#endif
		args.orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;

		args.nonDiegeticPan = 0;
		args.nonDiegeticPanGain = 0.f;

		@@ -2598,6 +2611,9 @@ static void parseOption(
		break;
		case CmdLnOptionId_trajFile:
		assert( numOptionValues == 1 );
		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		args->Opt_Headrotation = 1;
		#endif
		strncpy( args->headRotationFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
		break;
		case CmdLnOptionId_outputMetadata:
		@@ -2618,6 +2634,9 @@ static void parseOption(
		break;
		case CmdLnOptionId_exteriorOrientationFile:
		assert( numOptionValues == 1 );
		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		args->Opt_ExternalOrientation = 1;
		#endif
		strncpy( args->externalOrientationFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
		break;
		case CmdLnOptionId_customHrtfFile:
		@@ -2742,6 +2761,13 @@ static CmdlnArgs parseCmdlnArgs(
		exit( -1 ); /* Error printout handled by failing function */
		}

		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		args.Opt_Headrotation = 1;
		}
		#endif

		return args;
		}

lib_com/ivas_rom_com.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1876,6 +1876,7 @@ const float ivas_param_mc_dmx_fac_CICP19_3tc[36] =
		0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f /Ct/
		};

		#ifndef FIX_1157_OBSOLETE_DMX_TABLE
		const float ivas_param_mc_dmx_fac_CICP19_4tc[48] =
		{
		1.0f, 0.0f, INV_SQRT2, INV_SQRT2, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, /Lht/
		@@ -1883,6 +1884,7 @@ const float ivas_param_mc_dmx_fac_CICP19_4tc[48] =
		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, /Lut/
		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, /Rut/
		};
		#endif

		/* Coefficient for Parametric MC ILD factorization */
		const float ivas_param_mc_ild_fac_CICP6_2tc[6] =

lib_com/options.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -172,6 +172,8 @@
		#endif
		#define FIX_1129_EXT_REND_OUTPUT_HIGH /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */
		#define FIX_1152_UNINIT_VAL_IN_ITD_VAD_COMPUTATION /* FhG: fix uninitialized value being used in ITD VAD mid signal computation that does not affect synthesis, but crashes BASOPs */
		#define FIX_1157_OBSOLETE_DMX_TABLE /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */
		#define FIX_1135_EXT_RENDERER_HANDLES /* VA: issue 1135: Memory usage reduction in external renderer: Allocate only handles that are really needed. */

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

		@@ -181,6 +183,7 @@

		#define NONBE_FIX_1141_OSBA_ROOM_RENDERING /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect */
		#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */
		#define NONBE_FIX_1143_MASA_BRSW /* Nok: Fix for issue 1143: MSAN use of uninitialized value in masa decoding to binaural with dtx bitrate switching and 5 % FER */


		#define NONE_BE_FIX_816_LFE_PLC_FLOAT /* DLB: issue 816: reduce required precision to float for LFE-PLC*/

lib_dec/ivas_masa_dec.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -1393,11 +1393,16 @@ ivas_error ivas_masa_dec_reconfigure(
		sts = st_ivas->hCPE[cpe_id]->hCoreCoder;
		sts[0]->bit_stream = bit_stream + num_bits;
		num_bits += (int16_t) ( st_ivas->hCPE[cpe_id]->element_brate / FRAMES_PER_SEC );
		#ifdef NONBE_FIX_1143_MASA_BRSW
		if ( ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate >= MASA_STEREO_MIN_BITRATE ) \|\|
		( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate == FRAME_NO_DATA ) \|\|
		( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate == IVAS_SID_5k2 ) )
		#else
		if ( ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate >= MASA_STEREO_MIN_BITRATE ) \|\|
		( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate == FRAME_NO_DATA ) )
		#endif
		{
		st_ivas->hCPE[cpe_id]->nchan_out = 1;

		if ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirACRend != NULL ) \|\| ( ( st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) && st_ivas->hDiracDecBin[0] != NULL ) )
		{
		if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE ) ) != IVAS_ERR_OK )

lib_dec/ivas_stat_dec.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -993,7 +993,7 @@ typedef struct decoder_config_structure
		int16_t Opt_non_diegetic_pan; /* indicates diegetic or not */
		float non_diegetic_pan_gain; /* non diegetic panning gain*/
		int16_t Opt_AMR_WB; /* flag indicating AMR-WB IO mode */
		int16_t Opt_ExternalOrientation; /* indiates whether external orientations are used */
		int16_t Opt_ExternalOrientation; /* indicates whether external orientations are used */
		int16_t Opt_dpid_on; /* indicates whether Directivity pattern option is used */
		int16_t Opt_aeid_on; /* indicates whether Acoustic environment option is used */
		#ifdef DEBUGGING