Merge branch 'main' into 1836-replace-overflow-basop-operators-by-overflow-free-variants-in-lib_com (70d076f4) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -570,7 +570,9 @@ int main(
		#endif
		goto cleanup;
		}
		#ifndef FIX_587_DEFAULT_REVERB
		renderConfig.roomAcoustics.override = true;
		#endif
		}

		/* ISAR frame size is set from command line, not renderer config file.

apps/renderer.c

+42 −1

Original line number	Diff line number	Diff line
		@@ -174,6 +174,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;
		@@ -979,7 +983,12 @@ int main(

		Word32 nonDiegeticPanGain_fx = ( args.nonDiegeticPanGain == 1.0f ) ? ONE_IN_Q31 : ( args.nonDiegeticPanGain == -1.0f ) ? L_negate( ONE_IN_Q31 )
		: (Word32) ( args.nonDiegeticPanGain * ( 1LL << Q31 ) );

		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		IF( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, nonDiegeticPanGain_fx, 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, nonDiegeticPanGain_fx, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError opening renderer handle: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		@@ -1167,7 +1176,18 @@ int main(
		fprintf( stderr, "\nFailed to read renderer configuration from file %s\n", args.renderConfigFilePath );
		goto cleanup;
		}

		#ifdef NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND
		if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, args.directivityPatternId, renderConfig.directivity_fx ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", args.directivityPatternId[0], args.directivityPatternId[1], args.directivityPatternId[2], args.directivityPatternId[3] );
		goto cleanup;
		}
		if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt_fx ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to get Distance Attenuation \n\n" );
		goto cleanup;
		}
		#endif
		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		@@ -1192,7 +1212,9 @@ int main(
		#endif
		goto cleanup;
		}
		#ifndef FIX_587_DEFAULT_REVERB
		renderConfig.roomAcoustics.override = 1;
		#endif
		}

		/* ISAR frame size is set from command line, not renderer config file.
		@@ -2757,7 +2779,13 @@ 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;

		@@ -2849,6 +2877,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:
		@@ -2869,6 +2900,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:
		@@ -3002,6 +3036,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/bitstream_fx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -4461,8 +4461,6 @@ ivas_error read_indices_fx(

		st_ivas->BER_detect = 0;
		move16();
		st_ivas->num_bits = num_bits;
		move16();
		sts = reset_elements( st_ivas );

		#ifdef DEBUGGING

lib_com/cnst.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@
		#define NUM_SAMPLES_320 (320)
		#define NUM_SAMPLES_160 (160)
		#define L_SUBFRAME_48k (240)
		#define L_SUBFRAME_32k (180)
		#define L_SUBFRAME_32k (160)
		#define L_SUBFRAME_16k (80)
		#define L_SUBFRAME_8k (40)
		#define Q31_BY_NUM_SAMPLES_960 ( 2239294 ) /* 1/959 in Q31 */

lib_com/common_api_types.h

+2 −5

Original line number	Diff line number	Diff line
		@@ -315,13 +315,10 @@ typedef enum

		typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG
		{
		#ifndef FIX_587_DEFAULT_REVERB
		Word16 override;
		#endif
		Word16 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 */
		float pAcoustic_dsr[IVAS_CLDFB_NO_CHANNELS_MAX]; /* - The room's Diffuse to Source Ratio per center frequency */
		float acousticPreDelay; /* Time elapsed between input signal and late reverberation start, float, range [0.001..10] */
		float inputPreDelay; /* Offset in seconds from where DSR is computed in the RIR (0 = at source), float, range [0.001..10] */
		Word32 pFc_input_fx[IVAS_CLDFB_NO_CHANNELS_MAX]; /Q16 Center frequencies for which following values are provided: /
		Word32 pAcoustic_rt60_fx[IVAS_CLDFB_NO_CHANNELS_MAX]; /Q26 - The room's T60 per center frequency /
		Word32 pAcoustic_dsr_fx[IVAS_CLDFB_NO_CHANNELS_MAX]; /Q30 - The room's Diffuse to Source Ratio per center frequency /