diff options
author | Steve Kondik <shade@chemlab.org> | 2012-11-18 14:51:05 -0800 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 14:51:05 -0800 |
commit | b2511c6a79ea8d029b2b9d19130fd41d9838546f (patch) | |
tree | 19735375d488a64d7005b3b8e9ecec5438168913 /libFDK | |
parent | 49fa8770b0adce84246d5db3feec09db02eeeaee (diff) | |
parent | 6ab36997af5d5acda4f21d33031f4e45c85f96b7 (diff) | |
download | android_external_aac-b2511c6a79ea8d029b2b9d19130fd41d9838546f.tar.gz android_external_aac-b2511c6a79ea8d029b2b9d19130fd41d9838546f.tar.bz2 android_external_aac-b2511c6a79ea8d029b2b9d19130fd41d9838546f.zip |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/aac into mr1-stagingcm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1
Diffstat (limited to 'libFDK')
-rw-r--r-- | libFDK/include/FDK_archdef.h | 1 | ||||
-rw-r--r-- | libFDK/include/clz.h | 3 | ||||
-rw-r--r-- | libFDK/include/common_fix.h | 2 | ||||
-rw-r--r-- | libFDK/include/mips/cplx_mul.h | 21 | ||||
-rw-r--r-- | libFDK/include/mips/fixmul_mips.h | 9 | ||||
-rw-r--r-- | libFDK/include/scale.h | 10 | ||||
-rw-r--r-- | libFDK/include/x86/clz_x86.h | 154 | ||||
-rw-r--r-- | libFDK/src/FDK_core.cpp | 2 | ||||
-rw-r--r-- | libFDK/src/qmf.cpp | 6 |
9 files changed, 188 insertions, 20 deletions
diff --git a/libFDK/include/FDK_archdef.h b/libFDK/include/FDK_archdef.h index 22ec0ed..a963f55 100644 --- a/libFDK/include/FDK_archdef.h +++ b/libFDK/include/FDK_archdef.h @@ -155,7 +155,6 @@ amm-info@iis.fraunhofer.de #endif - /* Define preferred Multiplication type */ #if defined(FDK_HIGH_PERFORMANCE) && !defined(FDK_HIGH_QUALITY) /* FDK_HIGH_PERFORMANCE */ diff --git a/libFDK/include/clz.h b/libFDK/include/clz.h index 90cdb2b..38c5073 100644 --- a/libFDK/include/clz.h +++ b/libFDK/include/clz.h @@ -100,6 +100,9 @@ amm-info@iis.fraunhofer.de #elif defined(__mips__) /* cppp replaced: elif */ #include "mips/clz_mips.h" +#elif defined(__x86__) /* cppp replaced: elif */ +#include "x86/clz_x86.h" + #endif /* all cores */ diff --git a/libFDK/include/common_fix.h b/libFDK/include/common_fix.h index 83d4ba3..a39548e 100644 --- a/libFDK/include/common_fix.h +++ b/libFDK/include/common_fix.h @@ -225,7 +225,6 @@ FDK_INLINE FIXP_DBL fAbs(FIXP_DBL x) FDK_INLINE FIXP_SGL fAbs(FIXP_SGL x) { return fixabs_S(x); } - /* workaround for TI C6x compiler but not for TI ARM9E compiler */ #if (!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__x86_64__) FDK_INLINE INT fAbs(INT x) @@ -336,7 +335,6 @@ FDK_INLINE FIXP_SGL fMin(FIXP_SGL a, FIXP_SGL b) FDK_INLINE FIXP_SGL fMax(FIXP_SGL a, FIXP_SGL b) { return fixmax_S(a,b); } - /* workaround for TI C6x compiler but not for TI ARM9E */ #if ((!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__x86_64__)) || (FIX_FRACT == 1) FDK_INLINE INT fMax(INT a, INT b) diff --git a/libFDK/include/mips/cplx_mul.h b/libFDK/include/mips/cplx_mul.h index e0781dd..fb777ce 100644 --- a/libFDK/include/mips/cplx_mul.h +++ b/libFDK/include/mips/cplx_mul.h @@ -107,19 +107,21 @@ inline void cplxMultDiv2( FIXP_DBL *c_Re, FIXP_DBL b_Re, FIXP_DBL b_Im) { - INT result; + INT result; __asm__ ("mult %[a_Re], %[b_Re];\n" "msub %[a_Im], %[b_Im];\n" - : "=hi"(result) - : [a_Re]"r"(a_Re), [b_Re]"r"(b_Re), [a_Im]"r"(a_Im), [b_Im]"r"(b_Im) + "mfhi %[result];\n" + : [result]"=r"(result) + : [a_Re]"d"(a_Re), [b_Re]"d"(b_Re), [a_Im]"d"(a_Im), [b_Im]"d"(b_Im) : "lo"); *c_Re = result; __asm__ ("mult %[a_Re], %[b_Im];\n" "madd %[a_Im], %[b_Re];\n" - : "=hi"(result) + "mfhi %[result];\n" + : [result]"=r"(result) : [a_Re]"r"(a_Re), [b_Im]"r"(b_Im), [a_Im]"r"(a_Im), [b_Re]"r"(b_Re) : "lo"); *c_Im = result; @@ -134,17 +136,22 @@ inline void cplxMult( FIXP_DBL *c_Re, FIXP_DBL b_Re, FIXP_DBL b_Im) { - INT result; + INT result; + __asm__ ("mult %[a_Re], %[b_Re];\n" "msub %[a_Im], %[b_Im];\n" - : "=hi"(result) + "mfhi %[result];\n" + //"extr_w %[result], 31;\n" + : [result]"=r"(result) : [a_Re]"r"(a_Re), [b_Re]"r"(b_Re), [a_Im]"r"(a_Im), [b_Im]"r"(b_Im) : "lo"); *c_Re = result<<1; __asm__ ("mult %[a_Re], %[b_Im];\n" "madd %[a_Im], %[b_Re];\n" - : "=hi"(result) + "mfhi %[result];\n" + //"extr_w %[result], 31;\n" + : [result]"=r"(result) : [a_Re]"r"(a_Re), [b_Im]"r"(b_Im), [a_Im]"r"(a_Im), [b_Re]"r"(b_Re) : "lo"); *c_Im = result<<1; diff --git a/libFDK/include/mips/fixmul_mips.h b/libFDK/include/mips/fixmul_mips.h index 4fb72f7..62d059e 100644 --- a/libFDK/include/mips/fixmul_mips.h +++ b/libFDK/include/mips/fixmul_mips.h @@ -101,12 +101,7 @@ amm-info@iis.fraunhofer.de inline INT fixmuldiv2_DD (const INT a, const INT b) { INT result ; - - asm ("mult %1,%2;\n" - : "=hi" (result) - : "d" (a), "r" (b) - : "lo"); - + result = ((long long)a * b)>>32; return result ; } @@ -114,3 +109,5 @@ inline INT fixmuldiv2_DD (const INT a, const INT b) #endif /* __mips__ */ +#define FUNCTION_fixmulBitExact_DD +#define fixmulBitExact_DD fixmul_DD diff --git a/libFDK/include/scale.h b/libFDK/include/scale.h index fcb6c48..d60ed2c 100644 --- a/libFDK/include/scale.h +++ b/libFDK/include/scale.h @@ -148,12 +148,20 @@ FIXP_DBL scaleValueSaturate( { if(scalefactor > 0) { if (fNorm(value) < scalefactor && value != (FIXP_DBL)0) { - return (FIXP_DBL)MAXVAL_DBL; + if (value > (FIXP_DBL)0) { + return (FIXP_DBL)MAXVAL_DBL; + } else { + return (FIXP_DBL)MINVAL_DBL; + } } else { return (value<<scalefactor); } } else { + if (-(DFRACT_BITS-1) > scalefactor) { + return (FIXP_DBL)0; + } else { return (value>>(-scalefactor)); + } } } #endif diff --git a/libFDK/include/x86/clz_x86.h b/libFDK/include/x86/clz_x86.h new file mode 100644 index 0000000..db7970d --- /dev/null +++ b/libFDK/include/x86/clz_x86.h @@ -0,0 +1,154 @@ + +/* ----------------------------------------------------------------------------------------------------------- +Software License for The Fraunhofer FDK AAC Codec Library for Android + +© Copyright 1995 - 2012 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. + All rights reserved. + + 1. INTRODUCTION +The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software that implements +the MPEG Advanced Audio Coding ("AAC") encoding and decoding scheme for digital audio. +This FDK AAC Codec software is intended to be used on a wide variety of Android devices. + +AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient general perceptual +audio codecs. AAC-ELD is considered the best-performing full-bandwidth communications codec by +independent studies and is widely deployed. AAC has been standardized by ISO and IEC as part +of the MPEG specifications. + +Patent licenses for necessary patent claims for the FDK AAC Codec (including those of Fraunhofer) +may be obtained through Via Licensing (www.vialicensing.com) or through the respective patent owners +individually for the purpose of encoding or decoding bit streams in products that are compliant with +the ISO/IEC MPEG audio standards. Please note that most manufacturers of Android devices already license +these patent claims through Via Licensing or directly from the patent owners, and therefore FDK AAC Codec +software may already be covered under those patent licenses when it is used for those licensed purposes only. + +Commercially-licensed AAC software libraries, including floating-point versions with enhanced sound quality, +are also available from Fraunhofer. Users are encouraged to check the Fraunhofer website for additional +applications information and documentation. + +2. COPYRIGHT LICENSE + +Redistribution and use in source and binary forms, with or without modification, are permitted without +payment of copyright license fees provided that you satisfy the following conditions: + +You must retain the complete text of this software license in redistributions of the FDK AAC Codec or +your modifications thereto in source code form. + +You must retain the complete text of this software license in the documentation and/or other materials +provided with redistributions of the FDK AAC Codec or your modifications thereto in binary form. +You must make available free of charge copies of the complete source code of the FDK AAC Codec and your +modifications thereto to recipients of copies in binary form. + +The name of Fraunhofer may not be used to endorse or promote products derived from this library without +prior written permission. + +You may not charge copyright license fees for anyone to use, copy or distribute the FDK AAC Codec +software or your modifications thereto. + +Your modified versions of the FDK AAC Codec must carry prominent notices stating that you changed the software +and the date of any change. For modified versions of the FDK AAC Codec, the term +"Fraunhofer FDK AAC Codec Library for Android" must be replaced by the term +"Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android." + +3. NO PATENT LICENSE + +NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without limitation the patents of Fraunhofer, +ARE GRANTED BY THIS SOFTWARE LICENSE. Fraunhofer provides no warranty of patent non-infringement with +respect to this software. + +You may use this FDK AAC Codec software or modifications thereto only for purposes that are authorized +by appropriate patent licenses. + +4. DISCLAIMER + +This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright holders and contributors +"AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, including but not limited to the implied warranties +of merchantability and fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, or consequential damages, +including but not limited to procurement of substitute goods or services; loss of use, data, or profits, +or business interruption, however caused and on any theory of liability, whether in contract, strict +liability, or tort (including negligence), arising in any way out of the use of this software, even if +advised of the possibility of such damage. + +5. CONTACT INFORMATION + +Fraunhofer Institute for Integrated Circuits IIS +Attention: Audio and Multimedia Departments - FDK AAC LL +Am Wolfsmantel 33 +91058 Erlangen, Germany + +www.iis.fraunhofer.de/amm +amm-info@iis.fraunhofer.de +----------------------------------------------------------------------------------------------------------- */ + +/*************************** Fraunhofer IIS FDK Tools ********************** + + Author(s): + Description: fixed point intrinsics + +******************************************************************************/ + +#if defined(__GNUC__) && (defined(__x86__) || defined(__x86_64__)) + + #define FUNCTION_fixnormz_D + #define FUNCTION_fixnorm_D + + inline INT fixnormz_D(LONG value) + { + INT result; + + if (value != 0) { + result = __builtin_clz(value); + } else { + result = 32; + } + return result; + } + + inline INT fixnorm_D(LONG value) + { + INT result; + if (value == 0) { + return 0; + } + if (value < 0) { + value = ~value; + } + result = fixnormz_D(value); + return result - 1; + } + + +#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) + +#include <intrin.h> + + #define FUNCTION_fixnormz_D + #define FUNCTION_fixnorm_D + + inline INT fixnormz_D(LONG value) + { + unsigned long result = 0; + unsigned char err; + err = _BitScanReverse(&result, value); + if (err) { + return 31 - result; + } else { + return 32; + } + } + + inline INT fixnorm_D(LONG value) + { + INT result; + if (value == 0) { + return 0; + } + if (value < 0) { + value = ~value; + } + result = fixnormz_D(value); + return result - 1; + } + +#endif /* toolchain */ diff --git a/libFDK/src/FDK_core.cpp b/libFDK/src/FDK_core.cpp index 37d88ee..8a07aa9 100644 --- a/libFDK/src/FDK_core.cpp +++ b/libFDK/src/FDK_core.cpp @@ -93,7 +93,7 @@ amm-info@iis.fraunhofer.de /* FDK tools library info */ #define FDK_TOOLS_LIB_VL0 2 #define FDK_TOOLS_LIB_VL1 2 -#define FDK_TOOLS_LIB_VL2 6 +#define FDK_TOOLS_LIB_VL2 8 #define FDK_TOOLS_LIB_TITLE "FDK Tools" #define FDK_TOOLS_LIB_BUILD_DATE __DATE__ #define FDK_TOOLS_LIB_BUILD_TIME __TIME__ diff --git a/libFDK/src/qmf.cpp b/libFDK/src/qmf.cpp index e410f55..314b9fe 100644 --- a/libFDK/src/qmf.cpp +++ b/libFDK/src/qmf.cpp @@ -1040,7 +1040,8 @@ qmfInitFilterBank (HANDLE_QMF_FILTER_BANK h_Qmf, /*!< Handle to return */ h_Qmf->outScalefactor = ALGORITHMIC_SCALING_IN_ANALYSIS_FILTERBANK + ALGORITHMIC_SCALING_IN_SYNTHESIS_FILTERBANK + h_Qmf->filterScale; - if (h_Qmf->p_stride == 2) { + if ( (h_Qmf->p_stride == 2) + || ((flags & QMF_FLAG_CLDFB) && (no_channels == 32)) ) { h_Qmf->outScalefactor -= 1; } h_Qmf->outGain = (FIXP_DBL)0x80000000; /* default init value will be not applied */ @@ -1147,7 +1148,8 @@ qmfChangeOutScalefactor (HANDLE_QMF_FILTER_BANK synQmf, /*!< Handle of Qmf S /* Add internal filterbank scale */ outScalefactor += ALGORITHMIC_SCALING_IN_ANALYSIS_FILTERBANK + ALGORITHMIC_SCALING_IN_SYNTHESIS_FILTERBANK + synQmf->filterScale; - if (synQmf->p_stride == 2) { + if ( (synQmf->p_stride == 2) + || ((synQmf->flags & QMF_FLAG_CLDFB) && (synQmf->no_channels == 32)) ) { outScalefactor -= 1; } |