diff options
author | Dave Burke <daveburke@google.com> | 2012-06-10 21:50:35 -0700 |
---|---|---|
committer | Dave Burke <daveburke@google.com> | 2012-06-11 20:07:04 -0700 |
commit | 18a4af02f9a877b757be77babd190a2e0b44fbd2 (patch) | |
tree | 24cd840dc4022d293ecb0d4f47cdaa14486dc7c9 /libSBRdec/src/sbrdec_freq_sca.cpp | |
parent | 698b536f3b34a7cfc41a80e1034cc359456bdd66 (diff) | |
download | ODR-AudioEnc-18a4af02f9a877b757be77babd190a2e0b44fbd2.tar.gz ODR-AudioEnc-18a4af02f9a877b757be77babd190a2e0b44fbd2.tar.bz2 ODR-AudioEnc-18a4af02f9a877b757be77babd190a2e0b44fbd2.zip |
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.
Diffstat (limited to 'libSBRdec/src/sbrdec_freq_sca.cpp')
-rw-r--r-- | libSBRdec/src/sbrdec_freq_sca.cpp | 118 |
1 files changed, 87 insertions, 31 deletions
diff --git a/libSBRdec/src/sbrdec_freq_sca.cpp b/libSBRdec/src/sbrdec_freq_sca.cpp index f48c7d0..b877545 100644 --- a/libSBRdec/src/sbrdec_freq_sca.cpp +++ b/libSBRdec/src/sbrdec_freq_sca.cpp @@ -1,31 +1,89 @@ -/**************************************************************************** - (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. - This software and/or program is protected by copyright law and international - treaties. Any reproduction or distribution of this software and/or program, - or any portion of it, may result in severe civil and criminal penalties, and - will be prosecuted to the maximum extent possible under law. +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 +----------------------------------------------------------------------------------------------------------- */ -*******************************************************************************/ /*! \file - \brief Frequency scale calculation $Revision: 36841 $ + \brief Frequency scale calculation */ #include "sbrdec_freq_sca.h" @@ -151,27 +209,27 @@ getStopBand(UINT fs, /*!< Output sampling frequency */ if ( ((k2 - k0) > MAX_FREQ_COEFFS) || (k2 <= k0) ) { return 255; } - + if (headerDataFlags & (SBRDEC_SYNTAX_USAC|SBRDEC_SYNTAX_RSVD50)) { - /* 1 <= difference <= 35; 42000 <= fs <= 96000 */ - if ( (fs >= 42000) && ( (k2 - k0) > MAX_FREQ_COEFFS_FS44100 ) ) { + /* 1 <= difference <= 35; 42000 <= fs <= 96000 */ + if ( (fs >= 42000) && ( (k2 - k0) > MAX_FREQ_COEFFS_FS44100 ) ) { return 255; } - /* 1 <= difference <= 32; 46009 <= fs <= 96000 */ + /* 1 <= difference <= 32; 46009 <= fs <= 96000 */ if ( (fs >= 46009) && ( (k2 - k0) > MAX_FREQ_COEFFS_FS48000 ) ) { return 255; } } else { - /* 1 <= difference <= 35; fs == 44100 */ - if ( (fs == 44100) && ( (k2 - k0) > MAX_FREQ_COEFFS_FS44100 ) ) { + /* 1 <= difference <= 35; fs == 44100 */ + if ( (fs == 44100) && ( (k2 - k0) > MAX_FREQ_COEFFS_FS44100 ) ) { return 255; } - /* 1 <= difference <= 32; 48000 <= fs <= 96000 */ + /* 1 <= difference <= 32; 48000 <= fs <= 96000 */ if ( (fs >= 48000) && ( (k2 - k0) > MAX_FREQ_COEFFS_FS48000 ) ) { return 255; } - } + } return k2; } @@ -364,16 +422,14 @@ sbrdecUpdateFreqScale(UCHAR * v_k_master, /*!< Master table to be created */ */ static FIXP_SGL calcFactorPerBand(int k_start, int k_stop, int num_bands) { -/* Changes CT fract class -> IIS fract class: - * scaled bandfactor and step 1 bit right to avoid overflow - * use CTdbouble data type */ +/* Scaled bandfactor and step 1 bit right to avoid overflow + * use double data type */ FIXP_DBL bandfactor = FL2FXCONST_DBL(0.25f); /* Start value */ FIXP_DBL step = FL2FXCONST_DBL(0.125f); /* Initial increment for factor */ int direction = 1; -/* Changes CT fract class -> IIS fract class: - * because saturation can't be done in INT IIS, +/* Because saturation can't be done in INT IIS, * changed start and stop data type from FIXP_SGL to FIXP_DBL */ FIXP_DBL start = k_start << (DFRACT_BITS-8); FIXP_DBL stop = k_stop << (DFRACT_BITS-8); |