made mul_sbc_14bits static inline under macro (2658e4d7) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ari_fx.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,9 @@ Word32 L_multi31x16_X2( Word16 xh, Word16 xl, Word16 y )
		*
		* \return r*c
		*/
		#ifndef FIX_2402_INLINE_FCT_ARI_CODEC
		/* Note: moved to proto_fx.h */

		Word32 mul_sbc_14bits(
		Word32 r, /* Q0 */
		Word16 c /* Q0 */
		@@ -60,3 +63,5 @@ Word32 mul_sbc_14bits(

		return ( ret );
		}
		#endif

+1 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,7 @@
		#define FIX_2382_COPY_AQ_IN_MCT /* FhG: basop issue 2382: 2nd instance of prevent copying uninitialized values from Aq_fx[][] to Aq_fx_32[][] in TCX */
		#define FIX_2391_INIT_HQ_GENERIC_OFFSET /* FhG/Eri: basop issue 2391: make sure hq_generic_offset is initialized inside hq_hr_dec_fx() */
		#define FIX_2402_SIMPLIFY_ARI_CODEC /* FhG: basop issue 2402: simplify processing in arithmetic decoding, symbol table lookup, all BE */
		#define FIX_2402_INLINE_FCT_ARI_CODEC /* FhG: basop issue 2402: simplify processing in arithmetic decoding, inline mul_sbc_14bits, all BE */
		#define FIX_2397_COPY_AQ_MDCT_CORE_BFI /* FhG: prevent copying of uninit memory in MDCT stereo core if bfi is set */
		#define HARMONIZE_TBE /* VA: harmonize core-coder TBE function duplications */

+34 −0

Original line number	Diff line number	Diff line
		@@ -5714,10 +5714,44 @@ Word32 L_multi31x16_X2(
		Word16 y );
		#endif

		#ifndef FIX_2402_INLINE_FCT_ARI_CODEC
		Word32 mul_sbc_14bits(
		Word32 r, /* Q0 */
		Word16 c /* Q0 */
		);
		#else
		/**
		* \brief Integer Multiply
		*
		* \param[i] r
		* \param[i] c
		*
		* \return r*c
		*/
		static inline Word32 mul_sbc_14bits(
		Word32 r, /* Q0 */
		Word16 c /* Q0 */
		);
		static inline Word32 mul_sbc_14bits(
		Word32 r, /* Q0 */
		Word16 c /* Q0 */
		)
		{
		/* Note: moved from ari_fx.c to allow inlining */

		Word32 ret;

		/*
		temp = (((int32) r)*((int32) c))>>stat_bitsnew;
		*/
		assert( stat_bitsnew == 14 );
		ret = Mpy_32_16_1( L_shl( r, 15 - stat_bitsnew ), c );

		/assert( (((int) r)((int) c))>>stat_bitsnew == ret);*/

		return ( ret );
		}
		#endif

		void ham_cos_window(
		Word16 *fh,