diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2015-08-05 16:30:55 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2015-08-05 17:27:28 +0900 |
| commit | 57eb34e9d791a94afaa8307fdbd538a66e01080e (patch) | |
| tree | d3532a4ee6e938e9a153e1c9e1ed1b571e7e48b2 /opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mac.h | |
| parent | 72a792824e352ad4084c3729154a444f57b7b8bb (diff) | |
| download | opencore-amr-57eb34e9d791a94afaa8307fdbd538a66e01080e.tar.gz opencore-amr-57eb34e9d791a94afaa8307fdbd538a66e01080e.tar.bz2 opencore-amr-57eb34e9d791a94afaa8307fdbd538a66e01080e.zip | |
Version update 1.2.0 -> 1.3.0 (fix crash on 64bit)tizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_unified/20170308.100415submit/tizen_ivi/20160217.000006submit/tizen_ivi/20160217.000000submit/tizen_common/20151026.085049submit/tizen_common/20151023.083358submit/tizen_3.0_wearable/20161015.000004submit/tizen_3.0_tv/20161015.000004submit/tizen_3.0_mobile/20161015.000005submit/tizen_3.0_ivi/20161010.000005submit/tizen_3.0_common/20161104.104000submit/tizen_3.0.m2/20170104.093754submit/tizen/20150805.084143accepted/tizen/wearable/20150805.103244accepted/tizen/unified/20170309.040230accepted/tizen/tv/20150805.103220accepted/tizen/mobile/20150805.103211accepted/tizen/ivi/20160218.025231accepted/tizen/3.0/wearable/20161015.083554accepted/tizen/3.0/tv/20161016.005243accepted/tizen/3.0/mobile/20161015.033933accepted/tizen/3.0/ivi/20161011.055336accepted/tizen/3.0/common/20161114.111409accepted/tizen/3.0.m2/wearable/20170105.025349accepted/tizen/3.0.m2/tv/20170105.025253accepted/tizen/3.0.m2/mobile/20170105.025145tizen_3.0_tvtizen_3.0.m2tizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0accepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_3.0_wearableaccepted/tizen_3.0_tvaccepted/tizen_3.0_mobileaccepted/tizen_3.0_iviaccepted/tizen_3.0_commonaccepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobile
Change-Id: Ide07602a8064b14e88d8842c777d5f68db71d644
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
Diffstat (limited to 'opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mac.h')
| -rw-r--r-- | opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mac.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mac.h b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mac.h index 865f043..f672428 100644 --- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mac.h +++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mac.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. @@ -86,21 +86,7 @@ extern "C" ; GLOBAL FUNCTION DEFINITIONS ; Function Prototype declaration ----------------------------------------------------------------------------*/ -#if defined(PV_ARM_V5) /* Instructions for ARM Assembly on ADS*/ - - __inline Word32 L_mac(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow) - { - Word32 result; - Word32 L_sum; - - OSCL_UNUSED_ARG(pOverflow); - - __asm {SMULBB result, var1, var2} - __asm {QDADD L_sum, L_var3, result} - return (L_sum); - } - -#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*/ static inline Word32 L_mac(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow) { |