diff options
Diffstat (limited to 'opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/normalize_amr_wb.h')
-rw-r--r-- | opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/normalize_amr_wb.h | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/normalize_amr_wb.h b/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/normalize_amr_wb.h index 7c5fe22..73ccb71 100644 --- a/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/normalize_amr_wb.h +++ b/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/normalize_amr_wb.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. @@ -48,7 +48,6 @@ terms listed above has been obtained from the copyright holder. ----------------------------------------------------------------------------*/ #include "pv_amr_wb_type_defs.h" - /*---------------------------------------------------------------------------- ; MACROS ; Define module specific macros here @@ -62,21 +61,7 @@ terms listed above has been obtained from the copyright holder. ; DEFINES AND SIMPLE TYPEDEF'S ----------------------------------------------------------------------------*/ -#if defined(PV_ARM_V5) - -__inline int16 normalize_amr_wb(int32 x) -{ - int32 y; - __asm - { - clz y, x; - sub y, y, #1 - } - return (y); -} - - -#elif defined(PV_ARM_GCC_V5) +#if ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC)) __inline int16 normalize_amr_wb(int32 x) |