Merge branch 'main' into 3gpp_issue_1819_fix (75272770) · 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

+30 −0

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;
		@@ -1203,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.
		@@ -2768,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;

		@@ -2860,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:
		@@ -2880,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:
		@@ -3013,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/common_api_types.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -315,7 +315,9 @@ 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] */
		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 /

lib_com/ivas_prot_fx.h

+12 −7

Original line number	Diff line number	Diff line
		@@ -4027,12 +4027,14 @@ void sns_avq_dec_stereo_fx(
		Word32 SNS_Ql, / o : Quantized SNS vectors (left channel) */
		Word16 *q_l,
		Word32 SNS_Qr, / o : Quantized SNS vectors (right channe) */
		Word16 *q_r );
		Word16 *q_r
		);

		void dequantize_sns_fx(
		Word16 indices[CPE_CHANNELS][NPRM_LPC_NEW],
		Word32 snsQ_out[CPE_CHANNELS][NB_DIV][M],
		Decoder_State **sts );
		Decoder_State **sts
		);

		void inverseMS_fx(
		const Word16 L_frame, /* i : frame length Q0*/
		@@ -4141,7 +4143,8 @@ Word16 ivas_smc_gmm_fx(
		const Word16 flag_spitch, /* i : flag to indicate very short stable pitch */
		Word16 Qfact_PS,
		Word16 Q_esp,
		Word16 Qfact_PS_past );
		Word16 Qfact_PS_past
		);

		void ivas_signaling_enc_fx(
		Encoder_State st, / i/o: encoder state structure */
		@@ -4187,12 +4190,13 @@ void TonalMdctConceal_create_concealment_noise_ivas_fx(
		const Word16 subframe_idx,
		const Word16 core,
		const Word16 crossfade_gain,
		const TONALMDCTCONC_NOISE_GEN_MODE noise_gen_mode );

		const TONALMDCTCONC_NOISE_GEN_MODE noise_gen_mode
		);

		Word16 rand_triangular_signed_fx(
		Word16 *seed,
		Word16 *exp_fac );
		Word16 *exp_fac
		);

		Word64 var_32_fx(
		const Word32 x, / i : input vector */
		@@ -4202,7 +4206,8 @@ Word64 var_32_fx(

		ivas_error ivas_jbm_dec_tc_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		Word32 *data_fx );
		Word32 *data_fx
		);

		ivas_error ivas_jbm_dec_flush_renderer_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */