few smaller improvements (1dde7138) · Commits · SA4 / Audio / IVAS BASOP

lib_dec/fd_cng_dec_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1303,8 +1303,8 @@ void perform_noise_estimation_dec_fx(
		hFdCngDec->msPeriodogBuf,
		&( hFdCngDec->msPeriodogBufPtr ),
		hFdCngDec->hFdCngCom,
		0,
		0,
		DEC,
		EVS_MONO,
		0 );
		#else
		minimum_statistics(

lib_enc/fd_cng_enc_fx.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -1944,10 +1944,10 @@ void perform_noise_estimation_enc_fx(
		HANDLE_FD_CNG_ENC hFdCngEnc, /* i/o: CNG structure containing all buffers and variables */
		const Word32 input_Fs, /* i : input sampling rate Q0*/
		CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
		int element_mode /* i : is element EVS or IVAS */
		Word16 element_mode /* i : is element EVS or IVAS */
		)
		{
		if ( element_mode == 0 )
		if ( EQ_16( element_mode, EVS_MONO ) )
		{
		(void) input_Fs;
		(void) hCPE;
		@@ -1986,7 +1986,7 @@ void perform_noise_estimation_enc_fx(
		numBands = sub( regularStopBand, numCoreBands ); /* Q0 */

		/* Adjust to the desired time resolution by averaging the periodograms over the CLDFB time slots */
		IF( element_mode > 0 ) /IVAS: more precission/
		IF( GT_16( element_mode, EVS_MONO ) ) /IVAS: more precission/
		{
		Word16 max_exp = -31;
		move16();
		@@ -2057,7 +2057,7 @@ void perform_noise_estimation_enc_fx(
		}
		ELSE /EVS_MONO/
		{
		IF( numBands > 0 )
		IF( GT_16( numBands, 0 ) )
		{
		/* Adjust to the desired time resolution by averaging the periodograms over the CLDFB time slots */
		FOR( j = numCoreBands; j < regularStopBand; j++ )
		@@ -2073,9 +2073,9 @@ void perform_noise_estimation_enc_fx(
		}
		}

		IF( numBands > 0 )
		IF( GT_16( numBands, 0 ) )
		{
		///* Adjust CLDFB filterbank to the desired frequency resolution by averaging over spectral partitions for SID transmission */
		/* Adjust CLDFB filterbank to the desired frequency resolution by averaging over spectral partitions for SID transmission */
		bandcombinepow(
		periodog,
		hFdCngEnc->hFdCngCom->exp_cldfb_periodog,
		@@ -2125,8 +2125,8 @@ void perform_noise_estimation_enc_fx(
		nFFTpart,
		hFdCngEnc->hFdCngCom->psize_norm,
		hFdCngEnc->msLogPeriodog_fx,
		( element_mode == 0 ) ? ( (void ) hFdCngEnc->msNoiseFloor_fx ) : ( (void ) hFdCngEnc->msNoiseFloor_32fx ),
		( element_mode == 0 ) ? ( (void ) hFdCngEnc->msLogNoiseEst_fx ) : ( (void ) hFdCngEnc->msLogNoiseEst_32fx ),
		EQ_16( element_mode, EVS_MONO ) ? ( (void ) hFdCngEnc->msNoiseFloor_fx ) : ( (void ) hFdCngEnc->msNoiseFloor_32fx ),
		EQ_16( element_mode, EVS_MONO ) ? ( (void ) hFdCngEnc->msLogNoiseEst_fx ) : ( (void ) hFdCngEnc->msLogNoiseEst_32fx ),
		hFdCngEnc->msAlpha_fx,
		hFdCngEnc->msPsd_fx,
		hFdCngEnc->msPsdFirstMoment_fx,
		@@ -2143,12 +2143,12 @@ void perform_noise_estimation_enc_fx(
		&( hFdCngEnc->msPeriodogBufPtr ),
		hFdCngEnc->hFdCngCom,
		ENC,
		( hCPE == NULL ) ? 0 : hCPE->element_mode,
		( hCPE == NULL ) ? EVS_MONO : hCPE->element_mode,
		element_mode );


		/* Expand MS outputs */
		IF( element_mode > 0 )
		IF( GT_16( element_mode, EVS_MONO ) )
		{
		expand_range_fx( hFdCngEnc->msLogNoiseEst_32fx, hFdCngEnc->msNoiseEst_fx, &hFdCngEnc->msNoiseEst_fx_exp, hFdCngEnc->hFdCngCom->npart );
		}

lib_enc/prot_fx_enc.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1607,7 +1607,7 @@ void perform_noise_estimation_enc_fx(
		HANDLE_FD_CNG_ENC hFdCngEnc, /* i/o: CNG structure containing all buffers and variables */
		const Word32 input_Fs, /* i : input sampling rate Q0*/
		CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
		int element_mode /* i : is element EVS or IVAS */
		Word16 element_mode /* i : is element EVS or IVAS */
		);
		#else
		void perform_noise_estimation_enc_fx(