replace olapBufferSynth_fx[] by olapBufferSynth[] (1d036b8c) · Commits · SA4 / Audio / IVAS BASOP

lib_dec/core_switching_dec_fx.c

+15 −4

Original line number	Diff line number	Diff line
		@@ -1919,10 +1919,8 @@ ivas_error core_switching_pre_dec_fx(
		lerp( st->hFdCngDec->hFdCngCom->olapBufferAna_fx + st->last_L_frame, st->hFdCngDec->hFdCngCom->olapBufferAna_fx + st->L_frame, st->L_frame, st->last_L_frame );
		}

		#ifndef FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING
		IF( EQ_16( st->element_mode, EVS_MONO ) )
		{
		#endif
		lerp( st->hFdCngDec->hFdCngCom->olapBufferSynth2, st->hFdCngDec->hFdCngCom->olapBufferSynth2, shl( st->L_frame, 1 ), shl( st->last_L_frame, 1 ) );
		test();
		IF( LE_32( st->total_brate, SID_2k40 ) && LE_32( st->last_total_brate, SID_2k40 ) )
		@@ -1946,7 +1944,6 @@ ivas_error core_switching_pre_dec_fx(
		}
		}
		}
		#ifndef FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING
		}
		ELSE
		{
		@@ -1955,27 +1952,41 @@ ivas_error core_switching_pre_dec_fx(
		test();
		IF( LE_32( st->total_brate, SID_2k40 ) && LE_32( st->last_total_brate, SID_2k40 ) )
		{
		#ifdef FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING
		lerp( st->hFdCngDec->hFdCngCom->olapBufferSynth, st->hFdCngDec->hFdCngCom->olapBufferSynth, shl( st->L_frame, 1 ), shl( st->last_L_frame, 1 ) );
		( void ) Q_olapBufferSynth;
		#else
		L_lerp_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth_fx, st->hFdCngDec->hFdCngCom->olapBufferSynth_fx, shl( st->L_frame, 1 ), shl( st->last_L_frame, 1 ), Q_olapBufferSynth );
		#endif

		IF( EQ_16( st->L_frame, L_FRAME ) )
		{
		FOR( i = 0; i < shl( st->L_frame, 1 ); i++ )
		{
		#ifdef FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING
		st->hFdCngDec->hFdCngCom->olapBufferSynth[i] = mult_r( st->hFdCngDec->hFdCngCom->olapBufferSynth[i], 20480 /* Q15/ ); / q_olapBuffer */
		move16();
		#else
		st->hFdCngDec->hFdCngCom->olapBufferSynth_fx[i] = Mult_32_16( st->hFdCngDec->hFdCngCom->olapBufferSynth_fx[i], (Word16) 20480 /* 0.6250f in Q15 */ );
		move32();
		#endif
		}
		}
		ELSE
		{
		FOR( i = 0; i < shl( st->L_frame, 1 ); i++ )
		{
		#ifdef FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING
		st->hFdCngDec->hFdCngCom->olapBufferSynth[i] = mult_r( shl( st->hFdCngDec->hFdCngCom->olapBufferSynth[i], 1 ), 26214 /* Q14/ ); / q_olapBuffer */
		move16();
		#else
		st->hFdCngDec->hFdCngCom->olapBufferSynth_fx[i] = Mult_32_16( L_shl( st->hFdCngDec->hFdCngCom->olapBufferSynth_fx[i], 1 ), (Word16) 26214 /* 1.6f in Q14 */ );
		move32();
		#endif
		}
		}
		}
		}
		#endif
		}
		}