From 57eb34e9d791a94afaa8307fdbd538a66e01080e Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Wed, 5 Aug 2015 16:30:55 +0900 Subject: Version update 1.2.0 -> 1.3.0 (fix crash on 64bit) Change-Id: Ide07602a8064b14e88d8842c777d5f68db71d644 Signed-off-by: Jeongmo Yang --- .../audio/gsm_amr/amr_nb/common/include/l_mult.h | 23 ++-------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mult.h') diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mult.h b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mult.h index 2aaea47..33fedb1 100644 --- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mult.h +++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mult.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo + * Copyright (C) 1998-2010 PacketVideo * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -87,26 +87,7 @@ extern "C" ; GLOBAL FUNCTION DEFINITIONS ; Function Prototype declaration ----------------------------------------------------------------------------*/ - -#if defined(PV_ARM_V5) /* Instructions for ARM Assembly on ADS*/ - - __inline Word32 L_mult(Word16 var1, Word16 var2, Flag *pOverflow) - { - Word32 result; - Word32 product; - - OSCL_UNUSED_ARG(pOverflow); - - __asm - { - SMULBB product, var1, var2 - QADD result, product, product - } - - return (result); - } - -#elif defined(PV_ARM_GCC_V5) /* Instructions for ARM-linux cross-compiler*/ +#if ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))/* Instructions for ARM-linux cross-compiler*/ __inline Word32 L_mult(Word16 var1, Word16 var2, Flag *pOverflow) { -- cgit v1.2.3