Fix changed to not run stereo_dft_enc_update (f55fd465) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -1165,11 +1165,7 @@ void stereo_enc_itd_init(

		void stereo_dft_enc_update(
		STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder DFT stereo handle */
		#ifdef FIX_395_CNG_BW
		const int16_t bwidth /* i : encoded bandwidth */
		#else
		const int16_t max_bwidth /* i : maximum encoded bandwidth */
		#endif
		);

		void stereo_dft_enc_destroy(

lib_enc/ivas_cpe_enc.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -578,9 +578,7 @@ ivas_error ivas_cpe_enc(
		#ifdef DEBUG_MODE_DFT
		hCPE->hStereoDft->res_cod_bits = 0;
		#endif
		#ifdef FIX_395_CNG_BW
		stereo_dft_enc_update( hCPE->hStereoDft, min( SWB, sts[0]->bwidth ) );
		#else
		#ifndef FIX_395_CNG_BW
		stereo_dft_enc_update( hCPE->hStereoDft, min( SWB, sts[0]->max_bwidth ) );
		#endif
		}

lib_enc/ivas_stereo_dft_enc.c

+18 −9

Original line number	Diff line number	Diff line
		@@ -582,11 +582,7 @@ void stereo_enc_itd_init(

		void stereo_dft_enc_update(
		STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder stereo handle */
		#ifdef FIX_395_CNG_BW
		const int16_t bwidth /* i : encoded bandwidth */
		#else
		const int16_t max_bwidth /* i : maximum encoded bandwidth */
		#endif
		)
		{
		int16_t i, k_offset;
		@@ -632,13 +628,9 @@ void stereo_dft_enc_update(
		hStereoDft->last_res_cod_mode_modify_flag = hStereoDft->res_cod_sw_flag;
		hStereoDft->res_cod_sw_flag = 0;

		#ifdef FIX_395_CNG_BW
		/* update band limits in case of rate switching */
		NFFT_inner = STEREO_DFT_N_MAX_ENC * inner_frame_tbl[bwidth] / L_FRAME48k;
		#else
		/* update band limits in case of rate switching assuming max_bwidth as BWD output not yet know here */
		NFFT_inner = STEREO_DFT_N_MAX_ENC * inner_frame_tbl[max_bwidth] / L_FRAME48k;
		#endif

		hStereoDft->nbands = stereo_dft_band_config( hStereoDft->band_limits, hStereoDft->hConfig->band_res, NFFT_inner, ENC );
		hStereoDft->nbands_dmx = stereo_dft_band_config( hStereoDft->band_limits_dmx, 1, NFFT_inner, ENC );

		@@ -2177,6 +2169,22 @@ void stereo_dft_enc_write_BS(

		nbands_full = hStereoDft->nbands;

		#ifdef FIX_395_CNG_BW
		if ( core_brate == FRAME_NO_DATA \|\| core_brate == SID_2k40 )
		{
		NFFT_inner = min( STEREO_DFT_N_32k_ENC, STEREO_DFT_N_MAX_ENC * inner_frame_tbl[hCPE->hCoreCoder[0]->bwidth] / L_FRAME48k );
		hStereoDft->band_res[k_offset] = hStereoDft->hConfig->band_res;
		hStereoDft->res_pred_mode[k_offset] = 0;
		hStereoDft->res_cod_mode[k_offset] = 0;
		}
		else
		{
		NFFT_inner = STEREO_DFT_N_MAX_ENC * inner_frame_tbl[hCPE->hCoreCoder[0]->bwidth] / L_FRAME48k;
		}

		/* set number of bands according to bandwidth after BWD */
		hStereoDft->nbands = stereo_dft_band_config(hStereoDft->band_limits, hStereoDft->band_res[k_offset], NFFT_inner, ENC);
		#else
		NFFT_inner = STEREO_DFT_N_MAX_ENC * inner_frame_tbl[hCPE->hCoreCoder[0]->bwidth] / L_FRAME48k;

		if ( !( core_brate == SID_2k40 \|\| core_brate == FRAME_NO_DATA ) )
		@@ -2184,6 +2192,7 @@ void stereo_dft_enc_write_BS(
		/* set number of bands according to bandwidth after BWD */
		hStereoDft->nbands = stereo_dft_band_config( hStereoDft->band_limits, hStereoDft->band_res[k_offset], NFFT_inner, ENC );
		}
		#endif

		if ( core_brate == FRAME_NO_DATA )
		{

lib_com/options.h

+1 −1

File changed.

Contains only whitespace changes.