Merge remote-tracking branch 'origin' into... (3b20ccff) · Commits · SA4 / Audio / IVAS BASOP

lib_enc/ivas_core_pre_proc_front_fx.c

+32 −19

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@
		#define SCE_SMC_THR 16000


		static void calculate_energy_buffer_ivas_fx( CPE_ENC_HANDLE hCPE, Word32 enerBuffer_dft[], const Word16 no_channels, const Word32 input_Fs, Word16 *enerBuffer_dft_e );
		static void calculate_energy_buffer_ivas_fx( CPE_ENC_HANDLE hCPE, Word32 enerBuffer_dft[], const Word16 no_channels, const Word32 input_Fs, Word16 enerBuffer_dft_e[] );

		#ifdef IVAS_FIXED_ENC
		static void calculate_energy_buffer_fx( CPE_ENC_HANDLE hCPE, Word64 enerBuffer_dft_fx[], Word16 *enerBuffer_dft_q_fx, const Word16 no_channels, const Word32 input_Fs );
		@@ -222,6 +222,7 @@ ivas_error pre_proc_front_ivas_fx(
		Word16 imagBuffer16[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
		Word16 res_cod_SNR_M_fx_e[STEREO_DFT_BAND_MAX];
		Word16 Qfact_PS, q_lf_E_fx;
		Word16 enerBuffer_fx_exp_buf[CLDFB_NO_CHANNELS_MAX];
		#ifdef DEBUG_MODE_INFO
		Word32 *in_buff_temp;
		Word16 in_q_temp;
		@@ -482,7 +483,7 @@ ivas_error pre_proc_front_ivas_fx(
		}
		ELSE IF( EQ_16( element_mode, IVAS_CPE_DFT ) )
		{
		calculate_energy_buffer_ivas_fx( hCPE, enerBuffer_fx, st->cldfbAnaEnc->no_channels, input_Fs, enerBuffer_fx_exp );
		calculate_energy_buffer_ivas_fx( hCPE, enerBuffer_fx, st->cldfbAnaEnc->no_channels, input_Fs, enerBuffer_fx_exp_buf );
		}
		ELSE
		{
		@@ -849,11 +850,19 @@ ivas_error pre_proc_front_ivas_fx(
		/----------------------------------------------------------------
		* NB/WB/SWB/FB bandwidth detector
		----------------------------------------------------------------/

		IF( EQ_16( element_mode, IVAS_CPE_DFT ) )
		{
		FOR( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
		{
		sf_energySum[i] = *enerBuffer_fx_exp;
		sf_energySum[i] = enerBuffer_fx_exp_buf[i];
		move16();
		}
		}
		ELSE
		{
		set16_fx( sf_energySum, *enerBuffer_fx_exp, CLDFB_NO_CHANNELS_MAX );
		}

		test();
		IF( st->idchan == 0 && NE_16( element_mode, IVAS_CPE_MDCT ) )
		@@ -864,6 +873,15 @@ ivas_error pre_proc_front_ivas_fx(
		bw_detect_fx( st, input_fx_tmp, NULL, enerBuffer_fx, sf_energySum, ivas_format, 0 );
		}

		IF( EQ_16( element_mode, IVAS_CPE_DFT ) )
		{
		maximum_fx( sf_energySum, CLDFB_NO_CHANNELS_MAX, enerBuffer_fx_exp );
		FOR( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
		{
		enerBuffer_fx[i] = L_shl( enerBuffer_fx[i], sub( sf_energySum[i], *enerBuffer_fx_exp ) );
		move32();
		}
		}

		IF( NE_16( element_mode, IVAS_CPE_MDCT ) ) /* in MDCT stereo, set_bw_stereo() is used instead */
		{
		@@ -1848,7 +1866,7 @@ static void calculate_energy_buffer_ivas_fx(
		Word32 enerBuffer_dft_fx[], /* o : energy buffer() exp(enerBuffer_dft_e)*/
		const Word16 no_channels, /* i : no. of used CLDFB channels Q0*/
		const Word32 input_Fs, /* i : input sampling rate Q0*/
		Word16 *enerBuffer_dft_e )
		Word16 enerBuffer_dft_e[] )
		{
		Word16 i, j, guard_bits;
		Word64 nrg_DMX_fx[CLDFB_NO_CHANNELS_MAX];
		@@ -1856,11 +1874,8 @@ static void calculate_energy_buffer_ivas_fx(
		Word32 pDFT_DMX_fx; /q_DFT_DMX_fx*/
		Word32 chan_width_bins_fx;
		Word16 band_res_dft_fx, chan_width_f_fx, start, stop;
		Word16 norm_nrg_DMX_fx;
		Word64 max_abs_nrg_DMX_fx;
		Word16 norm_nrg_DMX_fx[CLDFB_NO_CHANNELS_MAX];

		max_abs_nrg_DMX_fx = 0;
		move64();
		Word16 temp_q1 = sub( norm_l( input_Fs ), 1 );
		Word16 temp_q2 = norm_s( hCPE->hStereoDft->NFFT );

		@@ -1892,30 +1907,28 @@ static void calculate_energy_buffer_ivas_fx(
		p_nrg_DMX_fx = W_add( p_nrg_DMX_fx, W_shr( W_mult_32_32( pDFT_DMX_fx[2 * j + 1], pDFT_DMX_fx[2 * j + 1] ), guard_bits ) ); /* 2 * q_DFT_DMX_fx + 1 - guard_bits */
		move64();
		}
		IF( GT_64( W_abs( *p_nrg_DMX_fx ), max_abs_nrg_DMX_fx ) )
		{
		max_abs_nrg_DMX_fx = W_abs( *p_nrg_DMX_fx );
		}
		norm_nrg_DMX_fx[i] = W_norm( W_abs( *p_nrg_DMX_fx ) );
		move16();
		start = stop;
		move16();
		p_nrg_DMX_fx++;
		}

		norm_nrg_DMX_fx = W_norm( max_abs_nrg_DMX_fx );
		FOR( i = 0; i < no_channels; i++ ) /* Consider only used channels, dependent on Fs */
		{
		enerBuffer_dft_fx[i] = Mpy_32_16_1( W_extract_h( W_shl( nrg_DMX_fx[i], norm_nrg_DMX_fx ) ), 10923 /* 1/3 in Q15 / ); / 2 * q_DFT_DMX_fx + 1 - guard_bits + norm_nrg_DMX_fx - 32 */
		enerBuffer_dft_fx[i] = Mpy_32_16_1( W_extract_h( W_shl( nrg_DMX_fx[i], norm_nrg_DMX_fx[i] ) ), 10923 /* 1/3 in Q15 / ); / 2 * q_DFT_DMX_fx + 1 - guard_bits + norm_nrg_DMX_fx[i] - 32 */
		move32();
		}

		*enerBuffer_dft_e = sub( add( shl( hCPE->hStereoDft->DFT_fx_e[0], 1 ), guard_bits ), norm_nrg_DMX_fx );
		enerBuffer_dft_e[i] = sub( add( shl( hCPE->hStereoDft->DFT_fx_e[0], 1 ), guard_bits ), norm_nrg_DMX_fx[i] );
		move16();
		}

		/* Set remaining entries of enerBuffer to zero */
		FOR( ; i < CLDFB_NO_CHANNELS_MAX; i++ )
		{
		enerBuffer_dft_fx[i] = 0;
		move32();
		enerBuffer_dft_e[i] = 0;
		move16();
		}
		return;
		}

lib_enc/ivas_masa_enc_fx.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -3979,9 +3979,7 @@ static void quantize_ratio_ism_vector_ivas_fx(

		FOR( i = 0; i < no_ism_loc; i++ )
		{
		idx[i] = mult( ratio_ism_loc[i], max_sum_idx ); // exponent : ratio_ism_e + 15
		move16();
		idx[i] = shl( idx[i], sub( add( ratio_ism_e, 15 ), 15 ) ); // Q0
		idx[i] = extract_l( L_shr( L_mult0( ratio_ism_loc[i], max_sum_idx ), sub( 15, ratio_ism_e ) ) ); // Q0
		move16();
		part_idx_sum = add( part_idx_sum, idx[i] );