From 18a4af02f9a877b757be77babd190a2e0b44fbd2 Mon Sep 17 00:00:00 2001 From: Dave Burke Date: Sun, 10 Jun 2012 21:50:35 -0700 Subject: Added license boilerplate to all source files. Change-Id: I42a702487e6db4953dca0027710ea4fe266052fd Also: - Removed dead code in several source files. - Minor changes in comments. - No functional changes. No changes in executed code. - Added documentation PDFs. --- libFDK/src/arm/dct_arm.cpp | 123 +++++++++++++++++++++++++++++++++------------ 1 file changed, 92 insertions(+), 31 deletions(-) (limited to 'libFDK/src/arm/dct_arm.cpp') diff --git a/libFDK/src/arm/dct_arm.cpp b/libFDK/src/arm/dct_arm.cpp index dd0ca09..187c843 100644 --- a/libFDK/src/arm/dct_arm.cpp +++ b/libFDK/src/arm/dct_arm.cpp @@ -1,24 +1,85 @@ -/**************************************************************************** - (C) copyright Fraunhofer IIS (2004) - All Rights Reserved +/* ----------------------------------------------------------------------------------------------------------- +Software License for The Fraunhofer FDK AAC Codec Library for Android - Please be advised that this software and/or program delivery is - Confidential Information of Fraunhofer and subject to and covered by the +© Copyright 1995 - 2012 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. + All rights reserved. - Fraunhofer IIS Software Evaluation Agreement - between Google Inc. and Fraunhofer - effective and in full force since March 1, 2012. + 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. - You may use this software and/or program only under the terms and - conditions described in the above mentioned Fraunhofer IIS Software - Evaluation Agreement. Any other and/or further use requires a separate agreement. +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. - $Id$ +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 +----------------------------------------------------------------------------------------------------------- */ @@ -211,8 +272,8 @@ dct_IV_loop2_2nd_part: __asm void dst_IV_func1( int i, - const FIXP_SPK *twiddle, - FIXP_DBL *pDat_0, + const FIXP_SPK *twiddle, + FIXP_DBL *pDat_0, FIXP_DBL *pDat_1) { /* Register map: @@ -235,7 +296,7 @@ dst_IV_loop1 LDR r6, [r2, #4] // accu3 = pDat_0[1] RSB r5, r5, #0 // accu2 = -accu2 SMULWT r9, r5, r8 // accuX = (-accu2)*val_tw.l - LDR r4, [r3, #-4] // accu1 = pDat_1[-1] + LDR r4, [r3, #-4] // accu1 = pDat_1[-1] RSB r9, r9, #0 // accuX = -(-accu2)*val_tw.l SMLAWB r9, r4, r8, r9 // accuX = accu1*val_tw.h-(-accu2)*val_tw.l SMULWT r4, r4, r8 // accu1 = accu1*val_tw.l @@ -258,7 +319,7 @@ dst_IV_loop1 LDR r6, [r2, #4] // accu3 = pDat_0[1] RSB r5, r5, #0 // accu2 = -accu2 SMULWT r9, r5, r8 // accuX = (-accu2)*val_tw.l - LDR r4, [r3, #-4] // accu1 = pDat_1[-1] + LDR r4, [r3, #-4] // accu1 = pDat_1[-1] RSB r9, r9, #0 // accuX = -(-accu2)*val_tw.l SMLAWB r9, r4, r8, r9 // accuX = accu1*val_tw.h-(-accu2)*val_tw.l SMULWT r4, r4, r8 // accu1 = accu1*val_tw.l @@ -286,18 +347,18 @@ dst_IV_loop1 #ifdef FUNCTION_dst_IV_func2 -FDK_INLINE +FDK_INLINE /* __attribute__((noinline)) */ static void dst_IV_func2( int i, const FIXP_SPK *twiddle, - FIXP_DBL *RESTRICT pDat_0, + FIXP_DBL *RESTRICT pDat_0, FIXP_DBL *RESTRICT pDat_1, int inc) { FIXP_DBL accu1,accu2,accu3,accu4; LONG val_tw; - + accu4 = pDat_0[0]; accu3 = pDat_0[1]; accu4 >>= 1; @@ -310,17 +371,17 @@ static void dst_IV_func2( *pDat_0++ = accu3; *pDat_1-- = accu4; - + __asm { B dst_IV_loop2_2nd_part - + /* 50 cycles for 2 iterations = 25 cycles/iteration */ dst_IV_loop2: LDR val_tw, [twiddle], inc, LSL #2 // val_tw = *twiddle; twiddle += inc - + RSB accu2, accu2, #0 // accu2 = -accu2 RSB accu1, accu1, #0 // accu1 = -accu1 SMULWT accu3, accu2, val_tw // accu3 = (-accu2)*val_tw.l @@ -330,10 +391,10 @@ dst_IV_loop2: SMLAWB accu2, accu2, val_tw, accu4 // accu2 = (-accu1)*val_tw.l+(-accu2)*val_tw.h STR accu1, [pDat_1], #-4 // *pDat_1-- = accu1 STR accu2, [pDat_0], #4 // *pDat_0++ = accu2 - + LDR accu4, [pDat_0] // accu4 = pDat_0[0] LDR accu3, [pDat_0, #4] // accu3 = pDat_0[1] - + RSB accu4, accu4, #0 // accu4 = -accu4 RSB accu3, accu3, #0 // accu3 = -accu3 @@ -345,14 +406,14 @@ dst_IV_loop2: LDR accu1, [pDat_1, #-4] // accu1 = pDat_1[-1] LDR accu2, [pDat_1] // accu2 = pDat_1[0] - + STR accu3, [pDat_0], #4 // *pDat_0++ = accu3 STR accu4, [pDat_1], #-4 // *pDat_1-- = accu4 dst_IV_loop2_2nd_part: LDR val_tw, [twiddle], inc, LSL #2 // val_tw = *twiddle; twiddle += inc - + RSB accu2, accu2, #0 // accu2 = -accu2 RSB accu1, accu1, #0 // accu1 = -accu1 SMULWT accu3, accu2, val_tw // accu3 = (-accu2)*val_tw.l @@ -362,10 +423,10 @@ dst_IV_loop2_2nd_part: SMLAWB accu2, accu2, val_tw, accu4 // accu2 = (-accu1)*val_tw.l+(-accu2)*val_tw.h STR accu1, [pDat_1], #-4 // *pDat_1-- = accu1 STR accu2, [pDat_0], #4 // *pDat_0++ = accu2 - + LDR accu4, [pDat_0] // accu4 = pDat_0[0] LDR accu3, [pDat_0, #4] // accu3 = pDat_0[1] - + RSB accu4, accu4, #0 // accu4 = -accu4 RSB accu3, accu3, #0 // accu3 = -accu3 @@ -377,14 +438,14 @@ dst_IV_loop2_2nd_part: LDR accu1, [pDat_1, #-4] // accu1 = pDat_1[-1] LDR accu2, [pDat_1] // accu2 = pDat_1[0] - + STR accu3, [pDat_0], #4 // *pDat_0++ = accu3 STR accu4, [pDat_1], #-4 // *pDat_1-- = accu4 SUBS i, i, #1 BNE dst_IV_loop2 } - + /* Last Sin and Cos value pair are the same */ accu1 = fMultDiv2(-accu1, WTC(0x5a82799a)); accu2 = fMultDiv2(-accu2, WTC(0x5a82799a)); -- cgit v1.2.3