Merge branch 'cleanup_20220910' into 'main' (25e0e3f9) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,6 @@
		/#define FIX_IVAS_185_MDCT_ST_PLC_FADEOUT/ /* IVAS-185 fix bug in TCX-PLC fadeout for MDCT-Stereo and improve fadeout by fading to background noise instead of white noise */
		/#define FIX_I1_113/ /* under review : MCT bit distribution optimization for SBA high bitrates*/

		#define FIX_ADAP_STEFI_SHIFT /* Issue 89: fix bug in parameter shift of adaptive stereo filling */
		#define SPAR_SCALING_HARMONIZATION /* Issue 80: Changes to harmonize scaling in spar */

+1 −2

Original line number	Diff line number	Diff line
		@@ -70,8 +70,7 @@ static void ivas_mcmasa_dmx( MCMASA_ENC_HANDLE hMcMasa, float data_f[][L_FRAME48

		static void compute_cov_mtx( float sr[MCMASA_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], float si[MCMASA_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], const int16_t freq, const int16_t N, CovarianceMatrix *COVls );

		static void computeIntensityVector_enc( const int16_t *band_grouping, float Cldfb_RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], float Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX],
		const int16_t enc_param_start_band, const int16_t num_frequency_bands, float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS] );
		static void computeIntensityVector_enc( const int16_t *band_grouping, float Cldfb_RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], float Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], const int16_t enc_param_start_band, const int16_t num_frequency_bands, float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS] );

		static void computeVerticalDiffuseness( float *buffer_intensity, const float buffer_energy, const int16_t averaging_length, const int16_t num_freq_bands, float *diffuseness );

+0 −8

Original line number	Diff line number	Diff line
		@@ -2943,15 +2943,11 @@ static void stereo_dft_enc_compute_prm(

		/* parameters for bred0 <= b < bpred1 are estimated from parameters of
		the remaining bands with ptrans0 <= b < btrans1. */
		#ifdef FIX_ADAP_STEFI_SHIFT
		bpred1 = ( hStereoDft->nbands > 10 ) ? STEREO_DFT_RES_PRED_BAND_MAX - 2 : hStereoDft->nbands;
		if ( hStereoDft->band_res[k_offset] == STEREO_DFT_BAND_RES_LOW )
		{
		bpred1 = min( bpred1, 6 );
		}
		#else
		bpred1 = ( hStereoDft->nbands > 10 ) ? hStereoDft->nbands - 2 : hStereoDft->nbands;
		#endif
		bpred0 = bpred1 - STEREO_DFT_RES_PRED_BAND_MIN_CONST;

		/* get estimate (currently the maximal index) */
		@@ -2971,11 +2967,7 @@ static void stereo_dft_enc_compute_prm(

		if ( hStereoDft->reverb_flag && hStereoDft->nbands > 10 ) /SWB and FB/
		{
		#ifdef FIX_ADAP_STEFI_SHIFT
		for ( b = STEREO_DFT_RES_PRED_BAND_MAX - 1; b >= STEREO_DFT_RES_PRED_BAND_MAX - 2; b-- )
		#else
		for ( b = hStereoDft->nbands - 1; b >= hStereoDft->nbands - 2; b-- )
		#endif
		{
		hStereoDft->res_pred_index_EC[b - STEREO_DFT_RES_PRED_BAND_MIN_CONST] = hStereoDft->res_pred_index_EC[b];
		}