merge from main (d62381c9) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -448,12 +448,10 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR
		if ( !arg.renderConfigEnabled && ( arg.render_num_subframes != asked_num_subframes ) )
		{
		fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );
		}
		#endif
		}

		/------------------------------------------------------------------------------------------
		@@ -913,6 +911,9 @@ static bool parseCmdlIVAS_dec(
		arg->inputFormat = IVAS_DEC_INPUT_FORMAT_G192;
		arg->non_diegetic_pan_enabled = false;
		arg->non_diegetic_pan_gain = 0.f;
		#ifdef FIX_2318_CLANG_DECODER
		arg->non_diegetic_pan_gain_fx = 0;
		#endif
		arg->tsmEnabled = false;
		arg->render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
		arg->aeSequence.count = 0;

apps/renderer.c

+0 −36

Original line number	Diff line number	Diff line
		@@ -167,9 +167,6 @@ typedef struct
		int16_t numInMetadataFiles;
		char outMetadataFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		char headRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		char splitRendBFIFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		#endif
		char referenceVectorFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		char referenceRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		char externalOrientationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		@@ -220,9 +217,6 @@ typedef enum
		CmdLnOptionId_listFormats,
		CmdLnOptionId_inputGain,
		CmdLnOptionId_outputMetadata,
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		CmdLnOptionId_SplitRendBFIFile,
		#endif
		CmdLnOptionId_referenceVectorFile,
		CmdLnOptionId_exteriorOrientationFile,
		CmdLnOptionId_framing,
		@@ -281,14 +275,6 @@ static const CmdLnParser_Option cliOptions[] = {
		.matchShort = "om",
		.description = "coded metadata file for BINAURAL_SPLIT_PCM output mode",
		},
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		{
		.id = CmdLnOptionId_SplitRendBFIFile,
		.match = "post_rend_bfi_file",
		.matchShort = "prbfi",
		.description = "Split rendering option: bfi file",
		},
		#endif
		{
		.id = CmdLnOptionId_refRotFile,
		.match = "reference_rotation_file",
		@@ -764,9 +750,6 @@ int main(
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[RENDERER_MAX_INPUT_CHANNELS];
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[RENDERER_MAX_INPUT_CHANNELS];
		int16_t cldfb_in_flag, CLDFBframeSize_smpls;
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		SplitRendBFIFileReader *splitRendBFIReader = NULL;
		#endif
		Vector3PairFileReader *referenceVectorReader = NULL;
		hrtfFileReader *hrtfFileReader = NULL;
		IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL;
		@@ -896,13 +879,6 @@ int main(
		}
		}

		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		if ( !isEmptyString( args.splitRendBFIFilePath ) )
		{
		convert_backslash( args.splitRendBFIFilePath );
		SplitRendBFIFileReader_open( args.splitRendBFIFilePath, &splitRendBFIReader );
		}
		#endif
		if ( !isEmptyString( args.externalOrientationFilePath ) )
		{
		if ( RotationFileReader_open( args.externalOrientationFilePath, &externalOrientationFileReader ) != IVAS_ERR_OK )
		@@ -2184,9 +2160,6 @@ cleanup:
		}

		split_rend_reader_writer_close( &hSplitRendFileReadWrite );
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		SplitRendBFIFileReader_close( &splitRendBFIReader );
		#endif

		for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )
		{
		@@ -2798,9 +2771,6 @@ static CmdlnArgs defaultArgs(

		clearString( args.headRotationFilePath );
		clearString( args.outMetadataFilePath );
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		clearString( args.splitRendBFIFilePath );
		#endif
		clearString( args.referenceVectorFilePath );
		clearString( args.referenceRotationFilePath );
		clearString( args.customHrtfFilePath );
		@@ -2907,12 +2877,6 @@ static void parseOption(
		assert( numOptionValues == 1 );
		strncpy( args->outMetadataFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
		break;
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		case CmdLnOptionId_SplitRendBFIFile:
		assert( numOptionValues == 1 );
		strncpy( args->splitRendBFIFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
		break;
		#endif
		case CmdLnOptionId_referenceVectorFile:
		assert( numOptionValues == 1 );
		strncpy( args->referenceVectorFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

lib_com/cldfb_fx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -595,9 +595,7 @@ void cldfbAnalysis_ts_fx_var_q(
		IF( NE_16( h_cldfb->Q_cldfb_state, *q_cldfb ) )
		{
		Word16 norm_st = L_norm_arr( timeBuffer_fx, offset );
		#ifdef FIX_2257_INCR_GUARD_BITS
		norm_st = sub( norm_st, find_guarded_bits_fx( shr( h_cldfb->no_channels, 2 ) ) );
		#endif
		IF( GE_16( norm_st, sub( *q_cldfb, h_cldfb->Q_cldfb_state ) ) )
		{
		scale_sig32( timeBuffer_fx, offset, sub( *q_cldfb, h_cldfb->Q_cldfb_state ) );

lib_com/cng_exc_fx.c

+24 −6

Original line number	Diff line number	Diff line
		@@ -180,12 +180,14 @@ IF( GT_16( element_mode, IVAS_SCE ) )
		{
		return;
		}

		/---------------------------------------------------------------------
		* Generate white noise vector
		---------------------------------------------------------------------/

		/for ( i=0; i<L_frame; i++ )exc2[i] = (float)own_random( seed );/
		Random_Fill( seed, L_frame, exc2, 4 );

		/------------------------------------------------------------
		* Insert random variation for excitation energy
		* (random variation is scaled according to *lp_ener value)
		@@ -240,6 +242,7 @@ FOR( i_subfr = 0; i_subfr < L_frame; i_subfr += L_SUBFR )
		move16();
		}
		}

		IF( NE_16( Opt_AMR_WB, 1 ) )
		{
		Copy( exc2, exc3, L_FRAME16k );
		@@ -538,7 +541,6 @@ IF( NE_16( Opt_AMR_WB, 1 ) )
		}
		L_tmp2 = L_shr( L_tmp2, sub( add( Q_exc, Q_exc ), 5 ) ); /Q6/


		/* enr = (lp_ener)/enr; /
		/* ftmp = sqrt(enr); */
		L_tmp = L_max( 1, lp_ener ); /Q6*/
		@@ -592,12 +594,15 @@ ELSE
		return;
		}


		/-------------------------------------------------------
		* cng_params_postupd_fx
		*
		* Post-update of CNG parameters
		-------------------------------------------------------/

		void cng_params_postupd_fx(
		#ifndef HARM_NON_LINEARITY
		const Word16 ho_circ_ptr, /* i : pointer for CNG averaging buffers Q0 */
		Word16 cng_buf_cnt, / i/o: counter for CNG store buffers Q0 */
		const Word16 const cng_exc2_buf, / i : Excitation buffer Q_exc */
		@@ -702,6 +707,7 @@ void cng_params_postupd_fx(
		}

		void cng_params_postupd_ivas_fx(
		#endif
		const Word16 ho_circ_ptr, /* i : pointer for CNG averaging buffers Q0 */
		Word16 cng_buf_cnt, / i/o: counter for CNG store buffers Q0 */
		const Word16 const cng_exc2_buf, / i : Excitation buffer Q_exc */
		@@ -781,7 +787,6 @@ void cng_params_postupd_ivas_fx(
		}
		ELSE
		{

		CNG_mode = get_cng_mode( last_active_brate );

		/* att = 1/pow(2,ENR_ATT_fx[CNG_mode]); */
		@@ -828,6 +833,7 @@ void cng_params_postupd_ivas_fx(
		*
		* update CNG parameters
		-------------------------------------------------------/
		#ifndef HARM_NON_LINEARITY
		void cng_params_upd_fx(
		const Word16 lsp_new[], /* i : LSP aprameters Q15 */
		const Word16 exc2[], /* i : current enhanced excitation Q_exc */
		@@ -997,8 +1003,13 @@ void cng_params_upd_fx(

		return;
		}
		#endif

		#ifdef HARM_NON_LINEARITY
		void cng_params_upd_fx(
		#else
		void cng_params_upd_ivas_fx(
		#endif
		const Word16 lsp_new[], /* i : LSP aprameters Q15 */
		const Word16 exc2[], /* i : current enhanced excitation Q_exc */
		const Word16 L_frame, /* i : frame length Q0 */
		@@ -1008,7 +1019,7 @@ void cng_params_upd_ivas_fx(
		Word16 ho_lsp_circ[], /* o : old LSP buffer for CNG averaging Q15 */
		const Word16 Q_exc, /* i : Q value of excitation */
		const Word16 enc_dec_flag, /* i : Flag indicating encoder or decoder (ENC,DEC) */
		Word32 ho_env_circ[], /* i/o: Envelope buffer Q(6+shift) */
		Word32 ho_env_circ[], /* i/o: Envelope buffer Q6/Q(6+shift) */
		Word16 cng_buf_cnt, / i/o: Counter of postponed FFT-processing instances */
		Word16 cng_exc2_buf[], /* i/o: Excitation buffer Q_exc */
		Word16 cng_Qexc_buf[], /* i/o: Q_exc buffer Q0 */
		@@ -1176,10 +1187,17 @@ void cng_params_upd_ivas_fx(
		/* update the circular buffer of old residual envelope */
		/* Copy32( env, &(ho_env_circ[add(shl(ho_circ_ptr,4),shl(ho_circ_ptr,2))]), NUM_ENV_CNG ); */
		Copy32( env, &( ho_env_circ[( ho_circ_ptr ) NUM_ENV_CNG] ), NUM_ENV_CNG );
		#ifdef HARM_NON_LINEARITY
		IF( NE_16( element_mode, EVS_MONO ) )
		#endif
		{
		scale_sig32( &( ho_env_circ[( ho_circ_ptr ) NUM_ENV_CNG] ), NUM_ENV_CNG, shift ); // Q(6+shift)
		}
		}

		ho_circ_size = add( ho_circ_size, 1 );
		move16();

		if ( GT_16( *ho_circ_size, HO_HIST_SIZE ) )
		{
		*ho_circ_size = HO_HIST_SIZE;

lib_com/gs_gains_fx.c

+8 −718

File changed.

Preview size limit exceeded, changes collapsed.