cleanup NON_BE_FIX_1137_GSC_IVAS_FXFLT_DECODING (e3ffe22e) · Commits · SA4 / Audio / IVAS BASOP

lib_com/gs_bitallocation.c

+0 −190

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@ static float Find_bit_frac( const int16_t nb_band, const int16_t remaining_bits

		static void reajust_bits( float *bits_per_bands, const int16_t st_band, const int16_t end_band, const int16_t sum_bit_in, const int16_t bit_bdgt_in );

		#ifdef NON_BE_FIX_1137_GSC_IVAS_FXFLT_DECODING
		#define Q15_0_33 10922 /* 0.33 */
		#define Q18_0_1 26214 /* 0.1 */
		#define Q18_0_50 131072 /* 0.50 */
		@@ -76,7 +75,6 @@ static void reajust_bits( float *bits_per_bands, const int16_t st_band, const in
		static Word16 Find_norm_inv( const Word32 ToDivide, Word16 *e_div );
		static Word16 Find_bit_alloc_IVAS_int( const Word32 core_brate, const Word16 GSC_IVAS_mode, const Word16 Diff_len, const Word16 nb_tot_bands, const Word16 L_frame, Word16 bit, Word16 max_ener_band, float ener_vec, float bits_per_bands );
		static Word16 maximum_fx( const Word16 vec_fx, const Word16 lvec_fx, Word16 max_fx );
		#endif

		/-------------------------------------------------------------------
		* bands_and_bit_alloc()
		@@ -115,12 +113,7 @@ void bands_and_bit_alloc(
		int16_t pos, band;
		float SWB_bit_budget;
		float bits_per_bands[MBANDS_GN_BITALLOC16k];
		#ifndef NON_BE_FIX_1137_GSC_IVAS_FXFLT_DECODING
		float fzero_val, mp, mb, nb_bands_adj, bit_adj;
		int16_t nb_pulse_per_band[MBANDS_GN_BITALLOC16k];
		#else
		float fzero_val;
		#endif

		/* initializations */
		nb_tot_bands = 16;
		@@ -220,189 +213,8 @@ void bands_and_bit_alloc(
		{
		if ( GSC_IVAS_mode > 0 )
		{
		#ifndef NON_BE_FIX_1137_GSC_IVAS_FXFLT_DECODING
		SWB_bit_budget = *bit;
		st_band = 5;

		set_f( bits_per_bands, 0, MBANDS_GN_BITALLOC16k );

		/* 2- Decide the pourcentage of bits allocated to LF (between 50-75%) depending of the temporal contribution in GSC */
		bit_fracf = ( -0.125f * Diff_len + 76.0f ) / 100;
		bit_fracf = check_bounds( bit_fracf, 0.50f, 0.75f );

		/* Adjusment of the bitrate between LF and HF base on the content type */
		/* 1 = new GSC bit alloc
		2 = GSC bit alloc for tc frame
		3 = more music like (should not happen often given music is coded with dft) */

		if ( GSC_IVAS_mode <= 3 )
		{
		nb_bands_max -= 6;
		}

		if ( GSC_IVAS_mode == 2 )
		{
		bit_fracf += 0.1f;
		nb_bands_max--;
		}

		if ( GSC_IVAS_mode == 3 )
		{
		bit_fracf -= 0.1f;
		nb_bands_max += 3;
		}

		/* First find how much we want to share between LF and HF, at low bitrate, a miminum of bits is needed in LF by limitating the number of bands*/
		/* Adjust the number of band based on the content type and bitrate */
		nb_bands_adj = 1.0f;
		if ( GSC_IVAS_mode == 1 && core_brate < GSC_L_RATE_STG )
		{
		nb_bands_adj = 0.0125f * SWB_bit_budget - 0.75f;
		}
		else if ( GSC_IVAS_mode != 2 && core_brate > GSC_H_RATE_STG )
		{
		nb_bands_adj = 0.02f * SWB_bit_budget - 1.2f;
		}
		nb_bands_max = (int16_t) ( nb_bands_max * nb_bands_adj + 0.5f );
		nb_bands_max = check_bounds_s( nb_bands_max, 5, nb_tot_bands );

		bit_fracf *= SWB_bit_budget;

		/* Estimation of the number of bit used in HF */
		/* with only the first weigthing The number of bits in max_ener_band[st_band-1] = 17% of bit_fracf */
		mb = .17f * bit_fracf;
		mp = ( 2.0f * DSR_NB_PULSE );
		if ( core_brate < GSC_L_RATE_STG && GSC_IVAS_mode == 3 )
		{
		mp = 1.5f * DSR_NB_PULSE;
		}
		else if ( core_brate < GSC_L_RATE_STG )
		{
		mp = DSR_NB_PULSE;
		}

		/* We want max_ener_band[st_band] <= max_ener_band[st_band-1] and max_ener_band[nb_bands_max-1] <= max_ener_band[st_band]*/
		/* We will estimate the number of bits to allocate of HF and put the remaining bits, if any, back on LF */
		/* compute the total possible number of band to be coded */
		nb_tot_bands = (int16_t) ( ( SWB_bit_budget - bit_fracf ) / ( mp + ( mb - mp ) / 2.0f ) );
		mp = min( mp, mb );
		if ( nb_tot_bands + st_band > nb_bands_max )
		{
		bit_adj = ( ( mb + mp ) / 2 ) * ( nb_tot_bands + st_band - nb_bands_max );
		bit_adj = max( 0, bit_adj );
		nb_tot_bands = nb_bands_max - st_band;
		bit_fracf += bit_adj;
		}
		nb_tot_bands += st_band;

		/* Allocate bits to LF */
		etmp = 0.23f;
		for ( j = 0; j < st_band; j++ )
		{
		i = j;
		max_ener_band[j] = i;
		ener_vec[i] = MIN16B;
		bits_per_bands[j] = etmp * bit_fracf;
		etmp -= 0.015f;
		}

		SWB_bit_budget -= bit_fracf;

		/* Find low energy band in HF */
		set_s( nb_pulse_per_band, 2, MBANDS_GN_BITALLOC16k );
		for ( i = st_band + 2; i < nb_tot_bands - 1; i++ )
		{
		if ( ener_vec[i] < ener_vec[i - 1] && ener_vec[i] < ener_vec[i + 1] )
		{
		nb_pulse_per_band[i] = 1;
		}
		}
		for ( j = st_band; j < nb_tot_bands; j++ )
		{
		if ( j > 6 )
		{
		i = maximum( ener_vec, nb_tot_bands, &etmp );
		}
		else
		{
		i = j;
		}

		max_ener_band[j] = i;
		ener_vec[i] = MIN16B;
		}

		/* Recompute the final bit distribution for HF */
		if ( nb_tot_bands > st_band )
		{
		bit_fracf = DSR_NB_PULSE;
		mb = ( SWB_bit_budget * 2 / ( nb_tot_bands - st_band ) ) - mp;
		bit_fracf = ( mb - mp ) / ( nb_tot_bands - st_band );
		mb -= bit_fracf;
		/* Do the distribution */
		for ( j = st_band; j < nb_tot_bands; j++ )
		{
		if ( nb_pulse_per_band[max_ener_band[j]] > 1 )
		{
		bits_per_bands[max_ener_band[j]] = mb;
		}
		else
		{
		bits_per_bands[max_ener_band[j]] = 4.5f;
		}
		mb -= bit_fracf;
		SWB_bit_budget -= bits_per_bands[max_ener_band[j]];
		}
		}

		/* Series of verification in case bit allocated != the budget */
		if ( SWB_bit_budget > 0 )
		{
		i = st_band - 1;
		while ( SWB_bit_budget > 0 )
		{
		bits_per_bands[i]++;
		SWB_bit_budget--;
		i--;
		if ( i == -1 )
		{
		i = st_band - 1;
		}
		}
		}

		nb_bands = nb_tot_bands;

		sum_bit = 0;
		j = 0;
		for ( i = 0; i < nb_bands; i++ )
		{
		if ( bits_per_bands[i] > 112 )
		{
		sum_bit += bits_per_bands[i] - 112;
		bits_per_bands[i] = 112;
		j = i + 1;
		}

		/* safety check for overage bit reallocation */
		else if ( bits_per_bands[i] + sum_bit / 3 > 112 )
		{
		j = i + 1;
		}
		}

		if ( sum_bit != 0 )
		{
		sum_bit /= ( nb_bands - j );
		for ( i = j; i < nb_bands; i++ )
		{
		bits_per_bands[i] += sum_bit;
		}
		}
		#else
		nb_tot_bands = Find_bit_alloc_IVAS_int( core_brate, GSC_IVAS_mode, Diff_len, nb_tot_bands, L_frame, bit, max_ener_band, ener_vec, bits_per_bands );
		nb_bands = nb_tot_bands;
		#endif
		}
		else if ( GSC_noisy_speech )
		{
		@@ -966,7 +778,6 @@ static float Find_bit_frac(
		return ( var_out );
		}

		#ifdef NON_BE_FIX_1137_GSC_IVAS_FXFLT_DECODING
		static Word16 Find_bit_alloc_IVAS_int( /* o : Number of band to encode */
		const Word32 core_brate, /* i : core bit rate */
		const Word16 GSC_IVAS_mode, /* i : GSC IVAS mode */
		@@ -1265,4 +1076,3 @@ static Word16 maximum_fx( /* o : index of the maximum val

		return ind;
		}
		#endif

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -142,7 +142,6 @@

		/* ################### Start FIXES switches ########################### */

		#define NON_BE_FIX_1137_GSC_IVAS_FXFLT_DECODING /* VA: Add fix point bit allocation for special GSC mode such that float and fixed point have the same final bit allocation */
		#define NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE /* VA: issue 1132: prevent division by extremely low energy value in SWB TBE */
		#define FIX_BASOP_812_NAN_COHSNR /* FhG: BASOP issue 812: fix nan values in sparse frames for cohSNR value in ITD estimation*/