[cleanup] accept NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549 (cb83eaf7) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -6073,12 +6073,8 @@ UWord16 get_indice_st(

		void stereo_mdct_core_enc_fx(
		CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
		#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549
		Word16 new_samples[CPE_CHANNELS][L_INP], /* i : new samples new_samples_q*/
		Word16 *new_samples_q,
		#else
		Word16 new_samples[CPE_CHANNELS][L_INP], /* i : new samples Qnew-1*/
		#endif
		Word16 old_wsp[CPE_CHANNELS][L_WSP], /* i : 12.8kHz weighted speech (for LTP Qx*/
		Word16 pitch_buf_fx[CPE_CHANNELS][NB_SUBFR16k] /* o : floating pitch for each subframe Q6*/
		);
		@@ -6125,12 +6121,8 @@ void stereo_switching_dec_fx(

		void ivas_mdct_core_whitening_enc_fx(
		CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
		#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549
		Word16 new_samples_fx[CPE_CHANNELS][L_INP], /* i : new samples Q_new[]-1*/
		Word16 Q_new, / i : new samples q */
		#else
		Word16 new_samples_fx[CPE_CHANNELS][L_INP], /* i : new samples */
		#endif
		Word16 old_wsp_fx[CPE_CHANNELS][L_WSP], /* i : 12.8kHz weighted speech (for LTP */
		Word16 pitch_buf[CPE_CHANNELS][NB_SUBFR16k], /* o : floating pitch for each subframe */
		Word32 mdst_spectrum_long[CPE_CHANNELS], / o : buffer for MDST spectrum */

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,6 @@
		/* any switch which is non-be wrt. TS 26.251 V3.0 */

		#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */
		#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549 /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */
		#define FIX_2585_BIT_ALLOCATION_DIFF /* VA : issue 2585, bit allocation different behaviors between float and fixed-point for corner cases */
		#define FIX_BASOP_2592_OVERFLOW /* FhG: BASOP #2592: fix overflow in GetF0() */
		#define FIX_BASOP_2591_EDGE_DETECT_COMP /* FhG: BASOP #2591: Wrong comparison in edge_detect_fx() */

lib_enc/ivas_core_enc_fx.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -339,13 +339,8 @@ ivas_error ivas_core_enc_fx(
		Q_spec_old[1] = hCPE->hCoreCoder[1]->hTcxEnc->spectrum_long_e;
		move16();

		#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549
		ivas_mdct_core_whitening_enc_fx( hCPE, old_inp_16k_fx, Q_new, old_wsp_fx, pitch_buf_fx, hMCT->p_mdst_spectrum_long_fx[cpe_id], hMCT->tnsBits[cpe_id], hMCT->p_orig_spectrum_long_fx[cpe_id],
		hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], hMCT->hBstr, 1, hMCT->nchan_out_woLFE, mdst_spectrum_e, orig_spectrum_e );
		#else
		ivas_mdct_core_whitening_enc_fx( hCPE, old_inp_16k_fx, old_wsp_fx, pitch_buf_fx, hMCT->p_mdst_spectrum_long_fx[cpe_id], hMCT->tnsBits[cpe_id], hMCT->p_orig_spectrum_long_fx[cpe_id],
		hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], hMCT->hBstr, 1, hMCT->nchan_out_woLFE, mdst_spectrum_e, orig_spectrum_e );
		#endif

		FOR( i = 0; i < CPE_CHANNELS; i++ )
		{
		@@ -372,11 +367,7 @@ ivas_error ivas_core_enc_fx(
		}
		ELSE
		{
		#if defined( NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549 )
		stereo_mdct_core_enc_fx( hCPE, old_inp_16k_fx, Q_new, old_wsp_fx, pitch_buf_fx );
		#else
		stereo_mdct_core_enc_fx( hCPE, old_inp_16k_fx, old_wsp_fx, pitch_buf_fx );
		#endif
		}
		}
		ELSE IF( EQ_32( sts[0]->core_brate, SID_2k40 ) && EQ_32( sts[1]->core_brate, SID_2k40 ) )

lib_enc/ivas_mdct_core_enc_fx.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -1164,12 +1164,8 @@ static void compute_power_spec(

		void ivas_mdct_core_whitening_enc_fx(
		CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
		#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549
		Word16 new_samples_fx[CPE_CHANNELS][L_INP], /* i : new samples Q_new[]-1*/
		Word16 Q_new, / i : new samples q */
		#else
		Word16 new_samples_fx[CPE_CHANNELS][L_INP], /* i : new samples Q0*/
		#endif
		Word16 old_wsp_fx[CPE_CHANNELS][L_WSP], /* i : 12.8kHz weighted speech (for LTP Qx*/
		Word16 pitch_buf_fx[CPE_CHANNELS][NB_SUBFR16k], /* o : floating pitch for each subframe Q6*/
		Word32 mdst_spectrum_long_fx[CPE_CHANNELS], / o : buffer for MDST spectrum mdst_spectrum_e*/
		@@ -1209,9 +1205,6 @@ void ivas_mdct_core_whitening_enc_fx(
		Word16 zero_side_flag[NB_DIV];
		Word16 q_com, q_min;
		Word32 *mdst_spectrum_fx[CPE_CHANNELS][NB_DIV];
		#ifndef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549
		Word16 Q_new;
		#endif
		Word16 q_windowedSignal[CPE_CHANNELS];
		Word16 shift = 0; /* 0 for one subframe and 1 for two subframes*/
		Word16 *speech;
		@@ -1327,14 +1320,7 @@ void ivas_mdct_core_whitening_enc_fx(

		tcx_ltp_encode_ivas_fx( st, st->hTcxEnc->tcxMode, L_FRAME, old_wsp_fx[ch] + L_WSP_MEM + L_LOOK_12k8, NULL, old_wsp_fx[ch] + L_WSP_MEM + L_LOOK_12k8, T_op[ch], &param_core[ch][1 + NOISE_FILL_RANGES], &ltpBits[ch], NULL, 0, IVAS_CPE_MDCT );

		#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549
		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] );
		#else
		Q_new = 0;
		move16();

		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] );
		#endif

		/* BWD in MDCT domain */
		IF( NE_16( st->hTcxCfg->tcx_last_overlap_mode, TRANSITION_OVERLAP ) )

lib_enc/ivas_stereo_mdct_core_enc_fx.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -129,12 +129,8 @@ static void sync_tcx_mode_fx(

		void stereo_mdct_core_enc_fx(
		CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
		#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549
		Word16 new_samples[CPE_CHANNELS][L_INP], /* i : new samples Q_new[]-1*/
		Word16 *Q_new,
		#else
		Word16 new_samples[CPE_CHANNELS][L_INP], /* i : new samples Q0*/
		#endif
		Word16 old_wsp[CPE_CHANNELS][L_WSP], /* i : 12.8kHz weighted speech (for LTP Qx*/
		Word16 pitch_buf_fx[CPE_CHANNELS][NB_SUBFR16k] /* o : floating pitch for each subframe Q6*/
		)
		@@ -320,13 +316,8 @@ void stereo_mdct_core_enc_fx(
		* - TNS
		---------------------------------------------------------------/

		#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549
		ivas_mdct_core_whitening_enc_fx( hCPE, new_samples, Q_new, old_wsp, pitch_buf_fx, p_mdst_spectrum_long_fx,
		tnsBits, p_orig_spectrum_long_fx, tnsSize, p_param, hBstr, 0, CPE_CHANNELS, mdst_spectrum_e, orig_spectrum_e );
		#else
		ivas_mdct_core_whitening_enc_fx( hCPE, new_samples, old_wsp, pitch_buf_fx, p_mdst_spectrum_long_fx,
		tnsBits, p_orig_spectrum_long_fx, tnsSize, p_param, hBstr, 0, CPE_CHANNELS, mdst_spectrum_e, orig_spectrum_e );
		#endif

		FOR( i = 0; i < CPE_CHANNELS; i++ )
		{