initial changes (b9f78e08) · Commits · SA4 / Audio / IVAS BASOP

lib_enc/enc_pit_exc_fx.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -775,6 +775,8 @@ void enc_pit_exc_ivas_fx(
		push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
		}

		st_fx->hSpMusClas->lowrate_pitchGain = mac_r( L_mult( 29491 /* 0.9 in Q15 /, st_fx->hSpMusClas->lowrate_pitchGain ), 3277 / 0.1 in Q15 /, gain_pit ); / Q14 */

		gpit_tmp = gain_pit;
		move16(); /Q14/
		test();

lib_enc/ext_sig_ana_fx.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1385,6 +1385,8 @@ void core_signal_analysis_high_bitrate_ivas_fx(
		ProcessIGF_ivas_fx( st, N_MAX + L_MDCT_OVLP_MAX, hTcxEnc->spectrum_fx[frameno], hTcxEnc->spectrum_fx[frameno], &q_spectrum, powerSpec, powerSpec_e, transform_type[frameno] == TCX_20, frameno, 0, vad_hover_flag );
		}
		}
		st->hTcxEnc->spectrum_length = L_subframe;
		move16();
		}

lib_enc/ivas_front_vad_fx.c

+35 −4

Original line number	Diff line number	Diff line
		@@ -666,14 +666,45 @@ ivas_error front_vad_spar_fx(

		old_pitch = st->pitch[1];
		move16();
		Scale_sig( wsp_fx, 368, sub( Q8, Q_inp_12k8 ) ); // Q8
		pitch_ol_ivas_fx( st->pitch, st->voicing_fx, &st->old_pitch, &st->old_corr_fx, corr_shift_fx, &st->old_thres_fx, &st->delta_pit, st->old_wsp2_fx, wsp_fx, st->mem_decim2_fx, relE_fx, st->clas, st->input_bwidth, st->Opt_SC_VBR, Q8 );
		Word16 shift, Q_wsp;
		Word16 shift1 = norm_arr( old_wsp_fx, L_WSP_MEM );
		Word16 shift2 = norm_arr( wsp_fx, L_WSP - L_WSP_MEM );
		maximum_abs_16_fx( old_wsp_fx, L_WSP_MEM, &shift );
		if ( !shift )
		{
		shift1 = Q15;
		move16();
		}
		maximum_abs_16_fx( wsp_fx, L_WSP - L_WSP_MEM, &shift );
		if ( !shift )
		{
		shift2 = Q15;
		move16();
		}

		shift = s_min( Q15, s_min( add( Q_inp_12k8, shift1 ), add( Q_inp_12k8, shift2 ) ) );
		shift = s_min( shift, add( norm_arr( st->mem_decim2_fx, 3 ), st->Q_old_wsp2 ) );
		shift = s_min( shift, add( norm_arr( st->old_wsp2_fx, ( L_WSP_MEM - L_INTERPOL ) / OPL_DECIM ), st->Q_old_wsp2 ) );

		scale_sig( old_wsp_fx, L_WSP_MEM, sub( shift, Q_inp_12k8 ) );
		scale_sig( wsp_fx, L_WSP - L_WSP_MEM, sub( shift, Q_inp_12k8 ) );

		Q_wsp = shift;
		move16();

		scale_sig( st->mem_decim2_fx, 3, sub( Q_wsp, st->Q_old_wsp2 ) ); // Q( mem_decim ) = Q( old_wsp2 )
		scale_sig( st->old_wsp2_fx, ( L_WSP_MEM - L_INTERPOL ) / OPL_DECIM, sub( Q_wsp, st->Q_old_wsp2 ) ); // Q_wsp

		st->Q_old_wsp2 = Q_wsp;
		move16();

		pitch_ol_ivas_fx( st->pitch, st->voicing_fx, &st->old_pitch, &st->old_corr_fx, corr_shift_fx, &st->old_thres_fx, &st->delta_pit, st->old_wsp2_fx, wsp_fx, st->mem_decim2_fx, relE_fx, st->clas, st->input_bwidth, st->Opt_SC_VBR, Q_wsp );

		/* Updates for adaptive lag window memory */
		st->old_pitch_la = st->pitch[2]; /* Q0 */
		move16();
		Scale_sig( wsp_fx, 368, Q9 - Q8 ); /* Q9 */
		StableHighPitchDetect_ivas_fx( &flag_spitch, st->pitch, st->voicing_fx, wsp_fx, st->localVAD, &st->voicing_sm_fx, &st->voicing0_sm_fx, &st->LF_EnergyRatio_sm_fx, &st->predecision_flag, &st->diff_sm_fx, &st->energy_sm_fx, Q12, st->lgBin_E_fx );

		StableHighPitchDetect_ivas_fx( &flag_spitch, st->pitch, st->voicing_fx, wsp_fx, st->localVAD, &st->voicing_sm_fx, &st->voicing0_sm_fx, &st->LF_EnergyRatio_sm_fx, &st->predecision_flag, &st->diff_sm_fx, &st->energy_sm_fx, Q_wsp, st->lgBin_E_fx );
		IF( st->hSpMusClas != NULL )
		{
		Word16 dummy_int;

lib_enc/ivas_mdct_core_enc_fx.c

+37 −33

Original line number	Diff line number	Diff line
		@@ -1251,6 +1251,8 @@ void ivas_mdct_core_whitening_enc_fx(
		FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
		{
		st = sts[ch];
		st->hTcxEnc->spectrum_length = st->hTcxEnc->L_frameTCX;
		move16();
		IF( GE_16( add( imult1616( hCPE->cpe_id, CPE_CHANNELS ), ch ), nChannels ) )
		{
		CONTINUE;
		@@ -1266,6 +1268,8 @@ void ivas_mdct_core_whitening_enc_fx(

		core_signal_analysis_high_bitrate_ivas_fx( new_samples_fx[ch] + L_INP_MEM, T_op[ch], NULL, NULL, st, tnsSize[ch], tnsBits[ch], param_core[ch], &ltpBits[ch], windowedSignal_fx[ch], st->L_frame, st->hTcxEnc->L_frameTCX, hCPE->last_element_mode, 0, mdst_spectrum_fx[ch], mdst_spectrum_e[ch], &Q_new, &q_windowedSignal[ch] );

		st->hTcxEnc->spectrum_length = s_max( st->hTcxEnc->spectrum_length, st->hTcxEnc->L_frameTCX );
		move16();
		/* BWD in MDCT domain */
		IF( NE_16( st->hTcxCfg->tcx_last_overlap_mode, TRANSITION_OVERLAP ) )
		{
		@@ -1373,16 +1377,16 @@ void ivas_mdct_core_whitening_enc_fx(

		q_min = sub( Q31, q_min );

		q_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /hTcxEnc1->L_frameTCX / nSubframes/ ), L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /hTcxEnc0->L_frameTCX / nSubframes/ ) );
		q_com = s_min( q_com, L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /hTcxEnc0->L_frameTCX / nSubframes/ ) );
		q_com = s_min( q_com, L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /hTcxEnc1->L_frameTCX / nSubframes/ ) );
		q_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->spectrum_length, shift ) /hTcxEnc1->L_frameTCX / nSubframes/ ), L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->spectrum_length, shift ) /hTcxEnc0->L_frameTCX / nSubframes/ ) );
		q_com = s_min( q_com, L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->spectrum_length, shift ) /hTcxEnc0->L_frameTCX / nSubframes/ ) );
		q_com = s_min( q_com, L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->spectrum_length, shift ) /hTcxEnc1->L_frameTCX / nSubframes/ ) );

		q_com = s_min( Q31, add( q_min, q_com ) );

		Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /hTcxEnc0->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEnc0->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /hTcxEnc1->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEnc1->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /hTcxEnc0->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, mdst_spectrum_e[0][n] ) ) ); // q_com
		Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /hTcxEnc1->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, mdst_spectrum_e[1][n] ) ) ); // q_com
		Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->spectrum_length, shift ) /hTcxEnc0->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEnc0->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->spectrum_length, shift ) /hTcxEnc1->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEnc1->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->spectrum_length, shift ) /hTcxEnc0->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, mdst_spectrum_e[0][n] ) ) ); // q_com
		Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->spectrum_length, shift ) /hTcxEnc1->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, mdst_spectrum_e[1][n] ) ) ); // q_com

		const Word16 switchKernel = /* these 4 transform types can be applied: 0 = MDCT-IV, 1 = MDST-II, 2 = MDCT-II, 3 = MDST-IV */
		kernel_switch_detect_fx( hTcxEnc0->spectrum_fx[n], hTcxEnc1->spectrum_fx[n], mdst_spectrum_fx[0][n], mdst_spectrum_fx[1][n], q_com, nSampCore / nSubframes,
		@@ -1470,11 +1474,11 @@ void ivas_mdct_core_whitening_enc_fx(
		q_min = s_max( mdst_spectrum_e[0][n], hTcxEnc0->spectrum_e[n] );
		q_min = sub( Q31, q_min );

		q_com = s_min( L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /hTcxEnc0->L_frameTCX / nSubframes/ ), L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /hTcxEnc0->L_frameTCX / nSubframes/ ) );
		q_com = s_min( L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->spectrum_length, shift ) /hTcxEnc0->L_frameTCX / nSubframes/ ), L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->spectrum_length, shift ) /hTcxEnc0->L_frameTCX / nSubframes/ ) );
		q_com = s_min( Q31, add( q_min, q_com ) );

		Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /hTcxEnc0->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEnc0->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /hTcxEnc0->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, mdst_spectrum_e[0][n] ) ) ); // q_com
		Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->spectrum_length, shift ) /hTcxEnc0->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEnc0->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->spectrum_length, shift ) /hTcxEnc0->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, mdst_spectrum_e[0][n] ) ) ); // q_com

		speech = NULL;
		if ( NE_16( n, 1 ) )
		@@ -1491,11 +1495,11 @@ void ivas_mdct_core_whitening_enc_fx(
		q_min = s_max( mdst_spectrum_e[1][n], hTcxEnc1->spectrum_e[n] );
		q_min = sub( Q31, q_min );

		q_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /hTcxEnc1->L_frameTCX / nSubframes/ ), L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /hTcxEnc1->L_frameTCX / nSubframes/ ) );
		q_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->spectrum_length, shift ) /hTcxEnc1->L_frameTCX / nSubframes/ ), L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->spectrum_length, shift ) /hTcxEnc1->L_frameTCX / nSubframes/ ) );
		q_com = s_min( Q31, add( q_min, q_com ) );

		Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /hTcxEnc1->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEnc1->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /hTcxEnc1->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, mdst_spectrum_e[1][n] ) ) ); // q_com
		Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->spectrum_length, shift ) /hTcxEnc1->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEnc1->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->spectrum_length, shift ) /hTcxEnc1->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, mdst_spectrum_e[1][n] ) ) ); // q_com

		speech = NULL;
		if ( NE_16( n, 1 ) )
		@@ -1532,7 +1536,7 @@ void ivas_mdct_core_whitening_enc_fx(
		move16();
		/* length = max(nSampCore / (2 * NB_DIV), L_subframeTCX / (2 * NB_DIV), NB_DIV = 2 */
		length = shr( s_max( nSampCore, L_subframeTCX ), 2 );
		len_sbfr = shr( hTcxEnc0->L_frameTCX, shift );
		len_sbfr = shr( hTcxEnc0->spectrum_length, shift );
		assert( hTcxEnc0->L_frameTCX == hTcxEnc1->L_frameTCX );
		exp_max = s_max( hTcxEnc0->spectrum_e[n], hTcxEnc1->spectrum_e[n] );
		exp_max = s_max( exp_max, mdst_spectrum_e[0][n] );
		@@ -1624,22 +1628,22 @@ void ivas_mdct_core_whitening_enc_fx(
		{
		Word16 length;
		length = shr( s_max( nSampCore, L_subframeTCX ), shift ); // max(/* nSampCore/nSubframes, L_subframeTCX/nSubframes) */
		Word16 offset2 = sub( shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, length );
		Word16 offset2 = sub( shr( hTcxEnc0->spectrum_length, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, length );
		exp_max = s_max( hTcxEnc0->spectrum_e[n], hTcxEnc1->spectrum_e[n] );
		exp_max = s_max( exp_max, mdst_spectrum_e[0][n] );
		exp_max = s_max( exp_max, mdst_spectrum_e[1][n] );

		exp_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes / ), L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) / hTcxEnc0->L_frameTCX/nSubframes */ ) );
		exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */ ) );
		exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */ ) );
		exp_com = s_min( L_norm_arr( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->spectrum_length, shift ) /* hTcxEnc1->L_frameTCX/nSubframes / ), L_norm_arr( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->spectrum_length, shift ) / hTcxEnc0->L_frameTCX/nSubframes */ ) );
		exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[0][n], shr( hTcxEnc0->spectrum_length, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */ ) );
		exp_com = s_min( exp_com, L_norm_arr( mdst_spectrum_fx[1][n], shr( hTcxEnc1->spectrum_length, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */ ) );

		q_com = sub( s_min( Q31, add( sub( Q31, exp_max ), exp_com ) ), 6 );
		exp_com = sub( Q31, q_com );

		Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, sub( hTcxEnc0->spectrum_e[n], exp_com ) ); // hTcxEnc0->spectrum_e
		Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */, sub( hTcxEnc1->spectrum_e[n], exp_com ) ); // hTcxEnc0->spectrum_e
		Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->L_frameTCX, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, sub( mdst_spectrum_e[0][n], exp_com ) ); // mdst_spectrum_e
		Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->L_frameTCX, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */, sub( mdst_spectrum_e[1][n], exp_com ) ); // mdst_spectrum_e
		Scale_sig32( hTcxEnc0->spectrum_fx[n], shr( hTcxEnc0->spectrum_length, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, sub( hTcxEnc0->spectrum_e[n], exp_com ) ); // hTcxEnc0->spectrum_e
		Scale_sig32( hTcxEnc1->spectrum_fx[n], shr( hTcxEnc1->spectrum_length, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */, sub( hTcxEnc1->spectrum_e[n], exp_com ) ); // hTcxEnc0->spectrum_e
		Scale_sig32( mdst_spectrum_fx[0][n], shr( hTcxEnc0->spectrum_length, shift ) /* hTcxEnc0->L_frameTCX/nSubframes */, sub( mdst_spectrum_e[0][n], exp_com ) ); // mdst_spectrum_e
		Scale_sig32( mdst_spectrum_fx[1][n], shr( hTcxEnc1->spectrum_length, shift ) /* hTcxEnc1->L_frameTCX/nSubframes */, sub( mdst_spectrum_e[1][n], exp_com ) ); // mdst_spectrum_e

		Word16 q_com_orig = q_com;
		move16();
		@@ -1724,12 +1728,12 @@ void ivas_mdct_core_whitening_enc_fx(

		q_min = s_max( mdst_spectrum_e[ch][n], hTcxEncCh->spectrum_e[n] );
		q_min = sub( Q31, q_min );
		q_com = s_min( L_norm_arr( mdst_spectrum_fx[ch][n], shr( hTcxEncCh->L_frameTCX, shift ) /hTcxEncCh->L_frameTCX / nSubframes/ ), L_norm_arr( hTcxEncCh->spectrum_fx[n], shr( hTcxEncCh->L_frameTCX, shift ) /hTcxEncCh->L_frameTCX / nSubframes/ ) );
		q_com = s_min( L_norm_arr( mdst_spectrum_fx[ch][n], shr( hTcxEncCh->spectrum_length, shift ) /hTcxEncCh->L_frameTCX / nSubframes/ ), L_norm_arr( hTcxEncCh->spectrum_fx[n], shr( hTcxEncCh->spectrum_length, shift ) /hTcxEncCh->L_frameTCX / nSubframes/ ) );

		q_com = s_min( Q31, add( q_min, q_com ) );

		Scale_sig32( hTcxEncCh->spectrum_fx[n], shr( hTcxEncCh->L_frameTCX, shift ) /hTcxEncCh->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEncCh->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( mdst_spectrum_fx[ch][n], shr( hTcxEncCh->L_frameTCX, shift ) /hTcxEncCh->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, mdst_spectrum_e[ch][n] ) ) ); // q_com
		Scale_sig32( hTcxEncCh->spectrum_fx[n], shr( hTcxEncCh->spectrum_length, shift ) /hTcxEncCh->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEncCh->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( mdst_spectrum_fx[ch][n], shr( hTcxEncCh->spectrum_length, shift ) /hTcxEncCh->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, mdst_spectrum_e[ch][n] ) ) ); // q_com

		speech = hTcxEncCh->speech_TCX;
		if ( n != 0 )
		@@ -1769,7 +1773,7 @@ void ivas_mdct_core_whitening_enc_fx(
		FOR( n = 0; n < nSubframes; n++ )
		{
		q_min = s_max( q_min, hTcxEnc->spectrum_e[n] );
		q_com = s_min( q_com, L_norm_arr( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->L_frameTCX, shift ) /hTcxEnc->L_frameTCX / nSubframes/ ) );
		q_com = s_min( q_com, L_norm_arr( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->spectrum_length, shift ) /hTcxEnc->L_frameTCX / nSubframes/ ) );
		}
		}
		q_min = sub( Q31, q_min );
		@@ -1791,7 +1795,7 @@ void ivas_mdct_core_whitening_enc_fx(
		}
		FOR( n = 0; n < nSubframes; n++ )
		{
		Scale_sig32( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->L_frameTCX, shift ) /hTcxEnc->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEnc->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->spectrum_length, shift ) /hTcxEnc->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEnc->spectrum_e[n] ) ) ); // q_com
		hTcxEnc->spectrum_e[n] = sub( Q31, q_com );
		move16();
		}
		@@ -1825,8 +1829,8 @@ void ivas_mdct_core_whitening_enc_fx(
		q_min = s_max( q_min, hTcxEnc->spectrum_e[n] );
		q_min = s_max( q_min, mdst_spectrum_e[ch][n] );

		q_com = s_min( q_com, L_norm_arr( mdst_spectrum_fx[ch][n], shr( hTcxEnc->L_frameTCX, shift ) /hTcxEnc->L_frameTCX / nSubframes/ ) );
		q_com = s_min( q_com, L_norm_arr( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->L_frameTCX, shift ) /hTcxEnc->L_frameTCX / nSubframes/ ) );
		q_com = s_min( q_com, L_norm_arr( mdst_spectrum_fx[ch][n], shr( hTcxEnc->spectrum_length, shift ) /hTcxEnc->L_frameTCX / nSubframes/ ) );
		q_com = s_min( q_com, L_norm_arr( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->spectrum_length, shift ) /hTcxEnc->L_frameTCX / nSubframes/ ) );
		}
		}
		q_min = sub( Q31, q_min );
		@@ -1849,8 +1853,8 @@ void ivas_mdct_core_whitening_enc_fx(
		}
		FOR( n = 0; n < nSubframes; n++ )
		{
		Scale_sig32( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->L_frameTCX, shift ) /hTcxEnc->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEnc->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( mdst_spectrum_fx[ch][n], shr( hTcxEnc->L_frameTCX, shift ) /hTcxEnc->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, mdst_spectrum_e[ch][n] ) ) ); // q_com
		Scale_sig32( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->spectrum_length, shift ) /hTcxEnc->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, hTcxEnc->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( mdst_spectrum_fx[ch][n], shr( hTcxEnc->spectrum_length, shift ) /hTcxEnc->L_frameTCX / nSubframes/, sub( q_com, sub( Q31, mdst_spectrum_e[ch][n] ) ) ); // q_com
		hTcxEnc->spectrum_e[n] = sub( Q31, q_com );
		move16();
		mdst_spectrum_e[ch][n] = sub( Q31, q_com );
		@@ -2137,7 +2141,7 @@ void ivas_mdct_core_whitening_enc_fx(
		{
		q_min = s_max( q_min, hTcxEnc->spectrum_e[n] );

		q_com = s_min( q_com, L_norm_arr( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->L_frameTCX, shift ) /hTcxEnc->L_frameTCX / nSubframes/ ) );
		q_com = s_min( q_com, L_norm_arr( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->spectrum_length, shift ) /hTcxEnc->L_frameTCX / nSubframes/ ) );
		}
		}
		q_min = sub( Q31, q_min );
		@@ -2161,7 +2165,7 @@ void ivas_mdct_core_whitening_enc_fx(

		FOR( n = 0; n < nSubframes; n++ )
		{
		Scale_sig32( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->L_frameTCX, shift ) /hTcxEnc->L_frameTCX / nSubframes/, sub( q_com, sub( 31, hTcxEnc->spectrum_e[n] ) ) ); // q_com
		Scale_sig32( hTcxEnc->spectrum_fx[n], shr( hTcxEnc->spectrum_length, shift ) /hTcxEnc->L_frameTCX / nSubframes/, sub( q_com, sub( 31, hTcxEnc->spectrum_e[n] ) ) ); // q_com
		hTcxEnc->spectrum_e[n] = sub( 31, q_com );
		move16();
		}

lib_enc/ivas_stereo_mdct_core_enc_fx.c

+6 −9

Original line number	Diff line number	Diff line
		@@ -363,11 +363,11 @@ void stereo_mdct_core_enc_fx(
		move16();
		FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
		{
		length = sts[ch]->hTcxEnc->L_frameTCX;
		length = sts[ch]->hTcxEnc->spectrum_length;
		move16();
		if ( NE_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
		IF( NE_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
		{
		length = shr( sts[ch]->hTcxEnc->L_frameTCX, 1 );
		length = shr( length, 1 );
		}

		hdrm_min = s_min( hdrm_min, L_norm_arr( sts[ch]->hTcxEnc->spectrum_fx[0], length ) );
		@@ -384,15 +384,12 @@ void stereo_mdct_core_enc_fx(

		FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
		{
		Word16 n_sb = NB_DIV;
		length = sts[ch]->hTcxEnc->spectrum_length;
		move16();
		if ( EQ_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
		IF( NE_16( sts[ch]->hTcxEnc->tcxMode, TCX_20 ) )
		{
		n_sb = 1;
		move16();
		length = shr( length, 1 );
		}
		length = idiv1616( sts[ch]->hTcxEnc->L_frameTCX, n_sb ); /* Q0 */

		FOR( k = 0; k <= ( ( sts[ch]->core == TCX_20_CORE ) ? 1 : NB_DIV ) - 1; k++ )
		{
		Scale_sig32( sts[ch]->hTcxEnc->spectrum_fx[k], length, sub( q_spec, sub( Q31, sts[ch]->hTcxEnc->spectrum_e[k] ) ) ); /* q_spec */