aboutsummaryrefslogtreecommitdiffstats
path: root/libFDK/include/fixmul.h
diff options
context:
space:
mode:
Diffstat (limited to 'libFDK/include/fixmul.h')
-rw-r--r--libFDK/include/fixmul.h267
1 files changed, 138 insertions, 129 deletions
diff --git a/libFDK/include/fixmul.h b/libFDK/include/fixmul.h
index ea4bc6c..a51ca0c 100644
--- a/libFDK/include/fixmul.h
+++ b/libFDK/include/fixmul.h
@@ -1,74 +1,85 @@
-
-/* -----------------------------------------------------------------------------------------------------------
+/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
- All rights reserved.
+© Copyright 1995 - 2018 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.
+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:
+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 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
+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.
+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.
+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."
+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.
+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.
+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.
+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
@@ -79,29 +90,29 @@ Am Wolfsmantel 33
www.iis.fraunhofer.de/amm
amm-info@iis.fraunhofer.de
------------------------------------------------------------------------------------------------------------ */
+----------------------------------------------------------------------------- */
-/*************************** Fraunhofer IIS FDK Tools **********************
+/******************* Library for basic calculation routines ********************
Author(s): Stefan Gewinner
+
Description: fixed point multiplication
-******************************************************************************/
+*******************************************************************************/
-#if !defined(__FIXMUL_H__)
-#define __FIXMUL_H__
+#if !defined(FIXMUL_H)
+#define FIXMUL_H
#include "FDK_archdef.h"
#include "machine_type.h"
-
#if defined(__arm__)
#include "arm/fixmul_arm.h"
-#elif defined(__mips__) /* cppp replaced: elif */
+#elif defined(__mips__)
#include "mips/fixmul_mips.h"
-#elif defined(__x86__) /* cppp replaced: elif */
+#elif defined(__x86__)
#include "x86/fixmul_x86.h"
#endif /* all cores */
@@ -114,173 +125,171 @@ amm-info@iis.fraunhofer.de
#if !defined(FUNCTION_fixmuldiv2_DD)
#define FUNCTION_fixmuldiv2_DD
-#if defined(_MSC_VER) || defined(__CC_ARM) || defined(__ANALOG_EXTENSIONS__) || defined(__TI_COMPILER_VERSION__)
-#pragma message ("Extremely slow implementation of fixmuldiv2_DD !!")
-#else
-#warning Extremely slow implementation of fixmuldiv2_DD !!
-#endif
-inline LONG fixmuldiv2_DD (const LONG a, const LONG b)
-{
- return (LONG) ((((INT64)a) * b) >> 32) ;
+inline LONG fixmuldiv2_DD(const LONG a, const LONG b) {
+ return (LONG)((((INT64)a) * b) >> 32);
}
#endif
#if !defined(FUNCTION_fixmuldiv2BitExact_DD)
#define FUNCTION_fixmuldiv2BitExact_DD
-#if defined(_MSC_VER) || defined(__CC_ARM) || defined(__ANALOG_EXTENSIONS__) || defined(__TI_COMPILER_VERSION__)
-#pragma message ("Extremely slow implementation of fixmuldiv2BitExact_DD !!")
-#else
-#warning Extremely slow implementation of fixmuldiv2BitExact_DD !!
-#endif
-inline LONG fixmuldiv2BitExact_DD (const LONG a, const LONG b)
-{
- return (LONG) ((((INT64)a) * b) >> 32) ;
+inline LONG fixmuldiv2BitExact_DD(const LONG a, const LONG b) {
+ return (LONG)((((INT64)a) * b) >> 32);
}
#endif
#if !defined(FUNCTION_fixmul_DD)
#define FUNCTION_fixmul_DD
-inline LONG fixmul_DD (const LONG a, const LONG b)
- { return fixmuldiv2_DD (a, b) << 1 ; }
+inline LONG fixmul_DD(const LONG a, const LONG b) {
+ return fixmuldiv2_DD(a, b) << 1;
+}
#endif
#if !defined(FUNCTION_fixmulBitExact_DD)
#define FUNCTION_fixmulBitExact_DD
-#if defined(_MSC_VER) || defined(__CC_ARM) || defined(__ANALOG_EXTENSIONS__) || defined(__TI_COMPILER_VERSION__) || defined(__XTENSA__)
-#pragma message ("Extremely slow implementation of fixmulBitExact_DD !!")
-#else
-#warning Extremely slow implementation of fixmulBitExact_DD !!
-#endif
-inline LONG fixmulBitExact_DD (const LONG a, const LONG b)
-{
- return ( (LONG) ((((INT64)a) * b) >> 32) ) << 1;
+inline LONG fixmulBitExact_DD(const LONG a, const LONG b) {
+ return ((LONG)((((INT64)a) * b) >> 32)) << 1;
}
#endif
#if !defined(FUNCTION_fixmuldiv2_SS)
#define FUNCTION_fixmuldiv2_SS
-inline LONG fixmuldiv2_SS (const SHORT a, const SHORT b)
- { return ((LONG)a*b); }
+inline LONG fixmuldiv2_SS(const SHORT a, const SHORT b) {
+ return ((LONG)a * b);
+}
#endif
#if !defined(FUNCTION_fixmul_SS)
#define FUNCTION_fixmul_SS
-inline LONG fixmul_SS (const SHORT a, const SHORT b)
- { return (a*b) <<1; }
+inline LONG fixmul_SS(const SHORT a, const SHORT b) { return (a * b) << 1; }
#endif
#if !defined(FUNCTION_fixmuldiv2_SD)
#define FUNCTION_fixmuldiv2_SD
-inline LONG fixmuldiv2_SD (const SHORT a, const LONG b)
+inline LONG fixmuldiv2_SD(const SHORT a, const LONG b)
#ifdef FUNCTION_fixmuldiv2_DS
- { return fixmuldiv2_DS(b, a); }
+{
+ return fixmuldiv2_DS(b, a);
+}
#else
- { return fixmuldiv2_DD(FX_SGL2FX_DBL(a), b); }
+{
+ return fixmuldiv2_DD(FX_SGL2FX_DBL(a), b);
+}
#endif
#endif
#if !defined(FUNCTION_fixmuldiv2_DS)
#define FUNCTION_fixmuldiv2_DS
-inline LONG fixmuldiv2_DS (const LONG a, const SHORT b)
+inline LONG fixmuldiv2_DS(const LONG a, const SHORT b)
#ifdef FUNCTION_fixmuldiv2_SD
- { return fixmuldiv2_SD(b, a); }
+{
+ return fixmuldiv2_SD(b, a);
+}
#else
- { return fixmuldiv2_DD(a, FX_SGL2FX_DBL(b)); }
+{
+ return fixmuldiv2_DD(a, FX_SGL2FX_DBL(b));
+}
#endif
#endif
#if !defined(FUNCTION_fixmuldiv2BitExact_SD)
#define FUNCTION_fixmuldiv2BitExact_SD
-inline LONG fixmuldiv2BitExact_SD (const SHORT a, const LONG b)
+inline LONG fixmuldiv2BitExact_SD(const SHORT a, const LONG b)
#ifdef FUNCTION_fixmuldiv2BitExact_DS
- { return fixmuldiv2BitExact_DS(b, a); }
+{
+ return fixmuldiv2BitExact_DS(b, a);
+}
#else
- { return (LONG) ((((INT64)a) * b) >> 16) ; }
+{
+ return (LONG)((((INT64)a) * b) >> 16);
+}
#endif
#endif
#if !defined(FUNCTION_fixmuldiv2BitExact_DS)
#define FUNCTION_fixmuldiv2BitExact_DS
-inline LONG fixmuldiv2BitExact_DS (const LONG a, const SHORT b)
+inline LONG fixmuldiv2BitExact_DS(const LONG a, const SHORT b)
#ifdef FUNCTION_fixmuldiv2BitExact_SD
- { return fixmuldiv2BitExact_SD(b, a); }
+{
+ return fixmuldiv2BitExact_SD(b, a);
+}
#else
- { return (LONG) ((((INT64)a) * b) >> 16) ; }
+{
+ return (LONG)((((INT64)a) * b) >> 16);
+}
#endif
#endif
#if !defined(FUNCTION_fixmul_SD)
#define FUNCTION_fixmul_SD
-inline LONG fixmul_SD (const SHORT a, const LONG b) {
+inline LONG fixmul_SD(const SHORT a, const LONG b) {
#ifdef FUNCTION_fixmul_DS
- return fixmul_SD(b, a);
+ return fixmul_DS(b, a);
#else
- return fixmuldiv2_SD (a, b) << 1 ;
+ return fixmuldiv2_SD(a, b) << 1;
#endif
}
#endif
#if !defined(FUNCTION_fixmul_DS)
#define FUNCTION_fixmul_DS
-inline LONG fixmul_DS (const LONG a, const SHORT b) {
+inline LONG fixmul_DS(const LONG a, const SHORT b) {
#ifdef FUNCTION_fixmul_SD
return fixmul_SD(b, a);
#else
- return fixmuldiv2_DS(a, b) << 1 ;
+ return fixmuldiv2_DS(a, b) << 1;
#endif
}
#endif
#if !defined(FUNCTION_fixmulBitExact_SD)
#define FUNCTION_fixmulBitExact_SD
-inline LONG fixmulBitExact_SD (const SHORT a, const LONG b)
+inline LONG fixmulBitExact_SD(const SHORT a, const LONG b)
#ifdef FUNCTION_fixmulBitExact_DS
- { return fixmulBitExact_DS(b, a); }
+{
+ return fixmulBitExact_DS(b, a);
+}
#else
- { return (LONG) (((((INT64)a) * b) >> 16) << 1); }
+{
+ return (LONG)(((((INT64)a) * b) >> 16) << 1);
+}
#endif
#endif
#if !defined(FUNCTION_fixmulBitExact_DS)
#define FUNCTION_fixmulBitExact_DS
-inline LONG fixmulBitExact_DS (const LONG a, const SHORT b)
+inline LONG fixmulBitExact_DS(const LONG a, const SHORT b)
#ifdef FUNCTION_fixmulBitExact_SD
- { return fixmulBitExact_SD(b, a); }
+{
+ return fixmulBitExact_SD(b, a);
+}
#else
- { return (LONG) (((((INT64)a) * b) >> 16) << 1); }
+{
+ return (LONG)(((((INT64)a) * b) >> 16) << 1);
+}
#endif
#endif
-
#if !defined(FUNCTION_fixpow2div2_D)
-#ifdef ARCH_WA_16BITMULT
-#error Fallback for fixpow2div2_D is not 16 bit safe !
-#endif
#define FUNCTION_fixpow2div2_D
-inline LONG fixpow2div2_D (const LONG a)
- { return fixmuldiv2_DD(a, a); }
+inline LONG fixpow2div2_D(const LONG a) { return fixmuldiv2_DD(a, a); }
#endif
#if !defined(FUNCTION_fixpow2_D)
-#ifdef ARCH_WA_16BITMULT
-#error Fallback for fixpow2_D is not 16 bit safe !
-#endif
#define FUNCTION_fixpow2_D
-inline LONG fixpow2_D (const LONG a)
- { return fixpow2div2_D(a)<<1; }
+inline LONG fixpow2_D(const LONG a) { return fixpow2div2_D(a) << 1; }
#endif
#if !defined(FUNCTION_fixpow2div2_S)
#define FUNCTION_fixpow2div2_S
-inline LONG fixpow2div2_S (const SHORT a)
- { return fixmuldiv2_SS(a, a); }
+inline LONG fixpow2div2_S(const SHORT a) { return fixmuldiv2_SS(a, a); }
#endif
#if !defined(FUNCTION_fixpow2_S)
#define FUNCTION_fixpow2_S
-inline LONG fixpow2_S (const SHORT a)
- { return fixpow2div2_S(a)<<1; }
+inline LONG fixpow2_S(const SHORT a) {
+ LONG result = fixpow2div2_S(a) << 1;
+ return result ^ (result >> 31);
+}
#endif
-
-#endif /* __FIXMUL_H__ */
+#endif /* FIXMUL_H */