Resolve merge conflict (0a5f388b) · Commits · SA4 / Audio / IVAS BASOP

lib_enc/ivas_core_pre_proc_front_fx.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -590,11 +590,19 @@ ivas_error pre_proc_front_ivas_fx(
		}
		ELSE IF( EQ_16( element_mode, IVAS_CPE_TD ) \|\| EQ_16( element_mode, IVAS_CPE_MDCT ) )
		{
		#ifdef NONBE_FIX_ISSUE_2206
		Copy_Scale_sig( new_inp_12k8_fx - lMemRecalc_12k8, st->buf_speech_enc + L_FRAME32k - lMemRecalc_12k8 - L_FILT, add( L_FRAME + L_FILT, lMemRecalc_12k8 ), sub( st->q_inp, st->q_inp ) ); /* Q_inp_const */
		#else
		Copy_Scale_sig( new_inp_12k8_fx - lMemRecalc_12k8, st->buf_speech_enc + L_FRAME32k - lMemRecalc_12k8 - L_FILT, add( L_FRAME + L_FILT, lMemRecalc_12k8 ), sub( Q_inp_const, st->q_inp ) ); /* Q_inp_const */
		#endif
		}
		ELSE
		{
		#ifdef NONBE_FIX_ISSUE_2206
		Copy_Scale_sig( new_inp_12k8_fx, st->buf_speech_enc + L_FRAME32k, L_FRAME, sub( st->q_inp, st->q_inp ) ); /* Q_inp_const */
		#else
		Copy_Scale_sig( new_inp_12k8_fx, st->buf_speech_enc + L_FRAME32k, L_FRAME, sub( Q_inp_const, st->q_inp ) ); /* Q_inp_const */
		#endif
		}

		/------------------------------------------------------------------
		@@ -734,12 +742,9 @@ ivas_error pre_proc_front_ivas_fx(

		Q_new = add( Q_new, Q_inp_const );
		move16();
		#ifndef NONBE_FIX_ISSUE_2206
		Copy_Scale_sig32_16( sig_out, preemp_start_idx, preemp_len, sub( add( Q_new, 1 ), st->q_inp ) ); / Q_new */
		Scale_sig( old_inp_12k8_fx, (Word16) ( preemp_start_idx - old_inp_12k8_fx ), sub( Q_new, st->q_inp ) ); / Q_new */
		#else
		Copy_Scale_sig32_16( sig_out, preemp_start_idx, preemp_len, sub( add( Q_new, 1 ), st->q_inp ) ); / Q_new */
		Scale_sig( old_inp_12k8_fx, (Word16) ( preemp_start_idx - old_inp_12k8_fx ), sub( Q_new, st->q_inp ) ); / Q_new */
		#ifdef NONBE_FIX_ISSUE_2206
		Scale_sig( old_inp_16k_fx, L_INP, sub( Q_new, st->q_inp ) ); / Q_new */
		#endif

lib_enc/ivas_cpe_enc_fx.c

+1 −1

File changed.

Contains only whitespace changes.