fix + _fx appendix to function names (23c91b83) · Commits · SA4 / Audio / IVAS BASOP

lib_com/prot_fx.h

+14 −13

Original line number	Diff line number	Diff line
		@@ -5982,6 +5982,7 @@ void ivas_RefineTonalComponents_fx(
		const Word16 element_mode,
		const PsychoacousticParameters *psychParamsCurrent );

		#ifndef HARMONIZE_FUNC
		ivas_error PsychoacousticParameters_Init(
		const Word32 sr_core, /* i : sampling rate of core-coder */
		const Word16 nBins, /* i : Number of bins (spectral lines) */
		@@ -5989,8 +5990,8 @@ ivas_error PsychoacousticParameters_Init(
		const Word16 isTCX20, /* i : Flag indicating if the subband division is for TCX20 or TCX10 */
		const Word16 isWarped, /* i : Flag indicating if the scale is linear or warped */
		PsychoacousticParameters *pPsychParams );

		ivas_error TonalMDCTConceal_Init(
		#endif
		ivas_error TonalMDCTConceal_Init_fx(
		TonalMDCTConcealPtr self,
		const Word16 nSamples,
		const Word16 nSamplesCore,
		@@ -6007,7 +6008,7 @@ ivas_error TonalMDCTConceal_Init_ivas_fx(
		);

		/* Must be called only when a good frame is recieved - concealment is inactive */
		void TonalMDCTConceal_SaveFreqSignal(
		void TonalMDCTConceal_SaveFreqSignal_fx(
		TonalMDCTConcealPtr self,
		const Word32 *mdctSpectrum,
		const Word16 mdctSpectrum_exp,
		@@ -6028,21 +6029,21 @@ void TonalMDCTConceal_SaveFreqSignal_ivas_fx(
		const Word16 gain_tcx_exp,
		const Word16 infoIGFStartLine );

		void TonalMDCTConceal_UpdateState(
		void TonalMDCTConceal_UpdateState_fx(
		TonalMDCTConcealPtr self,
		Word16 nNewSamples,
		Word32 pitchLag,
		Word16 badBlock,
		Word8 tonalConcealmentActive );
		const Word16 nNewSamples,
		const Word32 pitchLag,
		const Word16 badBlock,
		const Word8 tonalConcealmentActive );

		void TonalMDCTConceal_Detect(
		void TonalMDCTConceal_Detect_fx(
		const TonalMDCTConcealPtr self, /IN /
		const Word32 pitchLag, /IN /
		Word16 umIndices, /OUT*/
		Word16 element_mode /* IN */
		const Word16 element_mode /* IN */
		);

		void TonalMDCTConceal_Apply(
		void TonalMDCTConceal_Apply_fx(
		const TonalMDCTConcealPtr hTonalMDCTConc, /IN /
		Word32 mdctSpectrum, /IN/OUT*/
		Word16 mdctSpectrum_exp /IN */
		@@ -6068,7 +6069,7 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
		const Word16 cngLevelBackgroundTrace_e,
		const Word16 crossOverFreq );

		void TonalMDCTConceal_InsertNoise(
		void TonalMDCTConceal_InsertNoise_fx(
		const TonalMDCTConcealPtr hTonalMDCTConc, /IN /
		Word32 mdctSpectrum, /OUT*/
		Word16 mdctSpectrum_exp, /OUT*/
		@@ -6078,7 +6079,7 @@ void TonalMDCTConceal_InsertNoise(
		Word16 crossfadeGain,
		const Word16 crossOverFreq );

		void TonalMDCTConceal_SaveTimeSignal(
		void TonalMDCTConceal_SaveTimeSignal_fx(
		TonalMDCTConcealPtr hTonalMDCTConc,
		Word16 *timeSignal,
		Word16 nNewSamples );

lib_dec/core_dec_init_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -965,7 +965,7 @@ void open_decoder_LPD_fx(
		st->hTonalMDCTConc->lastBlockData.nSamples = 0;
		move16();

		TonalMDCTConceal_Init( st->hTonalMDCTConc, hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );
		TonalMDCTConceal_Init_fx( st->hTonalMDCTConc, hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );
		}
		st->last_tns_active = 0;
		move16();

lib_dec/dec_LPD_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -631,7 +631,7 @@ void decoder_LPD_fx(

		/* PLC: [TCX: Tonal Concealment] */
		/* Signal that this frame is not TCX */
		TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, 0, 0, 0, 0 );
		TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc, 0, 0, 0, 0 );

		IF( bfi == 0 )
		{
		@@ -768,7 +768,7 @@ void decoder_LPD_fx(

		IF( !bfi )
		{
		TonalMDCTConceal_SaveTimeSignal( st->hTonalMDCTConc, synthFB, L_frameTCX );
		TonalMDCTConceal_SaveTimeSignal_fx( st->hTonalMDCTConc, synthFB, L_frameTCX );
		}
		decoder_tcx_post_fx( st, synth, synthFB, Aq, bfi );
		IF( EQ_16( st->core, TCX_20_CORE ) )

lib_dec/dec_tcx_fx.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -814,7 +814,7 @@ void decoder_tcx_fx(

		IF( bfi == 0 )
		{
		TonalMDCTConceal_SaveFreqSignal( st->hTonalMDCTConc, x, x_e, L_frameTCX, L_frame, gainlpc2, gainlpc2_e, gain_tcx_e );
		TonalMDCTConceal_SaveFreqSignal_fx( st->hTonalMDCTConc, x, x_e, L_frameTCX, L_frame, gainlpc2, gainlpc2_e, gain_tcx_e );
		}
		ELSE
		{
		@@ -884,7 +884,7 @@ void decoder_tcx_fx(

		tcxGetNoiseFillingTilt( A, M, L_frame, tmp, &noiseTiltFactor );

		TonalMDCTConceal_InsertNoise( st->hTonalMDCTConc, x, &x_e, st->tonal_mdct_plc_active, &st->seed_tcx_plc,
		TonalMDCTConceal_InsertNoise_fx( st->hTonalMDCTConc, x, &x_e, st->tonal_mdct_plc_active, &st->seed_tcx_plc,
		noiseTiltFactor, f,
		infoIGFStartLine );
		}
		@@ -969,7 +969,7 @@ void decoder_tcx_fx(
		test();
		IF( bfi && st->tonal_mdct_plc_active )
		{
		TonalMDCTConceal_Apply( st->hTonalMDCTConc, x, &x_e );
		TonalMDCTConceal_Apply_fx( st->hTonalMDCTConc, x, &x_e );
		}

		tmp32 = L_deposit_h( 0 );
		@@ -986,7 +986,7 @@ void decoder_tcx_fx(
		move16();
		}

		TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, L_frameTCX, tmp32, bfi, tmp8 );
		TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc, L_frameTCX, tmp32, bfi, tmp8 );

		IF( st->enablePlcWaveadjust )
		{
		@@ -5221,7 +5221,7 @@ void decoder_tcx_noiseshaping_igf_fx(
		move16();
		}

		TonalMDCTConceal_UpdateState( st->hTonalMDCTConc,
		TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc,
		L_frameTCX,
		tmp32,
		bfi,

lib_dec/er_util_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -462,7 +462,7 @@ Word16 GetPLCModeDecision_fx(
		}
		ELSE
		{
		TonalMDCTConceal_Detect( st->hTonalMDCTConc, pitch, &numIndices, st->element_mode );
		TonalMDCTConceal_Detect_fx( st->hTonalMDCTConc, pitch, &numIndices, st->element_mode );
		}
		#endif // !HARMONIZE_2427_GETPLC

		@@ -592,7 +592,7 @@ Word16 GetPLCModeDecision_fx(
		pitch = L_add( st->old_fpitch, 0 ); /Q16/
		}

		TonalMDCTConceal_Detect( st->hTonalMDCTConc, pitch, &numIndices, st->element_mode );
		TonalMDCTConceal_Detect_fx( st->hTonalMDCTConc, pitch, &numIndices, st->element_mode );

		test();
		test();