port CR (dffe3786) · Commits · SA4 / Audio / IVAS BASOP

lib_dec/ivas_core_dec_fx.c

+10 −9

Original line number	Diff line number	Diff line
		@@ -1222,6 +1222,7 @@ ivas_error ivas_core_dec_fx(
		}
		}

		#ifndef FIX_1320_STACK_CPE_DECODER
		IF( EQ_16( st->element_mode, EVS_MONO ) )
		{
		/----------------------------------------------------------------
		@@ -1252,7 +1253,7 @@ ivas_error ivas_core_dec_fx(
		move16();
		}
		}

		#endif
		/----------------------------------------------------------------
		* Transition and synchronization of BWE components
		----------------------------------------------------------------/
		@@ -1271,6 +1272,7 @@ ivas_error ivas_core_dec_fx(
		}
		ELSE
		{
		#ifndef FIX_1320_STACK_CPE_DECODER
		test();
		IF( EQ_16( st->extl, SWB_BWE_HIGHRATE ) \|\| EQ_16( st->extl, FB_BWE_HIGHRATE ) )
		{
		@@ -1279,9 +1281,12 @@ ivas_error ivas_core_dec_fx(
		}
		ELSE
		{
		#endif
		/* TBE on top of ACELP@16kHz */
		tmps = NS2SA_FX2( output_Fs, MAX_DELAY_TBE_NS - DELAY_SWB_TBE_16k_NS );
		#ifndef FIX_1320_STACK_CPE_DECODER
		}
		#endif
		}

		/* Smooth transitions when switching between different technologies */
		@@ -1552,24 +1557,20 @@ ivas_error ivas_core_dec_fx(

		Scale_sig( st->delay_buf_out_fx, NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ), negate( exp_max ) ); // Q0

		} /* n_channels loop */

		FOR( n = 0; n < n_channels; n++ )
		{
		st = sts[n];
		IF( st->cldfbAna )
		IF( st->cldfbAna != NULL )
		{
		scale_sig32( st->cldfbAna->cldfb_state_fx, st->cldfbAna->cldfb_size, ( Q11 - Q10 ) ); // Q11
		st->cldfbAna->Q_cldfb_state = Q11;
		move16();
		}
		IF( st->cldfbSynHB )
		IF( st->cldfbSynHB != NULL )
		{
		scale_sig32( st->cldfbSynHB->cldfb_state_fx, st->cldfbSynHB->cldfb_size, ( Q11 - Q10 ) ); // Q11
		st->cldfbSynHB->Q_cldfb_state = Q11;
		move16();
		}
		}

		} /* n_channels loop */

		pop_wmops();
		return error;