Snap for 4754571 from 6cfabd35363c3ef5e3b209b867169a500b3ccc3c to pi-release

Change-Id: I130760e1e9a6c00340ae89ffd327f340c236716e

1 files changed, 104 insertions, 105 deletions

diff --git a/libAACenc/src/interface.h b/libAACenc/src/interface.h
index 51fb72a..b1a31ef 100644
--- a/libAACenc/src/interface.h
+++ b/libAACenc/src/interface.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,17 +90,18 @@ Am Wolfsmantel 33
 
 www.iis.fraunhofer.de/amm
 amm-info@iis.fraunhofer.de
------------------------------------------------------------------------------------------------------------ */
+----------------------------------------------------------------------------- */
+
+/**************************** AAC encoder library ******************************
 
-/******************************** MPEG Audio Encoder **************************
+   Author(s):   M.Werner
 
-   Initial author:       M.Werner
-   contents/description: Interface psychoaccoustic/quantizer
+   Description: Interface psychoaccoustic/quantizer
 
-******************************************************************************/
+*******************************************************************************/
 
-#ifndef _INTERFACE_H
-#define _INTERFACE_H
+#ifndef INTERFACE_H
+#define INTERFACE_H
 
 #include "common_fix.h"
 #include "FDK_audio.h"
@@ -97,73 +109,60 @@ amm-info@iis.fraunhofer.de
 #include "psy_data.h"
 #include "aacenc_tns.h"
 
-enum
-{
-  MS_NONE = 0,
-  MS_SOME = 1,
-  MS_ALL  = 2
-};
+enum { MS_NONE = 0, MS_SOME = 1, MS_ALL = 2 };
 
-enum
-{
-  MS_ON = 1
-};
+enum { MS_ON = 1 };
 
 struct TOOLSINFO {
-  INT msDigest;     /* 0 = no MS; 1 = some MS, 2 = all MS */
+  INT msDigest; /* 0 = no MS; 1 = some MS, 2 = all MS */
   INT msMask[MAX_GROUPED_SFB];
 };
 
-
-typedef struct  {
-  INT       sfbCnt;
-  INT       sfbPerGroup;
-  INT       maxSfbPerGroup;
-  INT       lastWindowSequence;
-  INT       windowShape;
-  INT       groupingMask;
-  INT       sfbOffsets[MAX_GROUPED_SFB+1];
-
-  INT       mdctScale;                      /* number of transform shifts */
-  INT       groupLen[MAX_NO_OF_GROUPS];
-
-  TNS_INFO  tnsInfo;
-  INT       noiseNrg[MAX_GROUPED_SFB];
-  INT       isBook[MAX_GROUPED_SFB];
-  INT       isScale[MAX_GROUPED_SFB];
+typedef struct {
+  INT sfbCnt;
+  INT sfbPerGroup;
+  INT maxSfbPerGroup;
+  INT lastWindowSequence;
+  INT windowShape;
+  INT groupingMask;
+  INT sfbOffsets[MAX_GROUPED_SFB + 1];
+
+  INT mdctScale; /* number of transform shifts */
+  INT groupLen[MAX_NO_OF_GROUPS];
+
+  TNS_INFO tnsInfo;
+  INT noiseNrg[MAX_GROUPED_SFB];
+  INT isBook[MAX_GROUPED_SFB];
+  INT isScale[MAX_GROUPED_SFB];
 
   /* memory located in QC_OUT_CHANNEL */
-  FIXP_DBL  *mdctSpectrum;
-  FIXP_DBL  *sfbEnergy;
-  FIXP_DBL  *sfbSpreadEnergy;
-  FIXP_DBL  *sfbThresholdLdData;
-  FIXP_DBL  *sfbMinSnrLdData;
-  FIXP_DBL  *sfbEnergyLdData;
-
+  FIXP_DBL *mdctSpectrum;
+  FIXP_DBL *sfbEnergy;
+  FIXP_DBL *sfbSpreadEnergy;
+  FIXP_DBL *sfbThresholdLdData;
+  FIXP_DBL *sfbMinSnrLdData;
+  FIXP_DBL *sfbEnergyLdData;
 
- }PSY_OUT_CHANNEL;
+} PSY_OUT_CHANNEL;
 
 typedef struct {
-
   /* information specific to each channel */
-  PSY_OUT_CHANNEL* psyOutChannel[(2)];
+  PSY_OUT_CHANNEL *psyOutChannel[(2)];
 
   /* information shared by both channels  */
-  INT       commonWindow;
+  INT commonWindow;
   struct TOOLSINFO toolsInfo;
 
 } PSY_OUT_ELEMENT;
 
 typedef struct {
+  PSY_OUT_ELEMENT *psyOutElement[((8))];
+  PSY_OUT_CHANNEL *pPsyOutChannels[(8)];
 
-  PSY_OUT_ELEMENT* psyOutElement[(8)];
-  PSY_OUT_CHANNEL* pPsyOutChannels[(8)];
-
-}PSY_OUT;
+} PSY_OUT;
 
-inline int isLowDelay( AUDIO_OBJECT_TYPE aot )
-{
-  return (aot==AOT_ER_AAC_LD || aot==AOT_ER_AAC_ELD);
+inline int isLowDelay(AUDIO_OBJECT_TYPE aot) {
+  return (aot == AOT_ER_AAC_LD || aot == AOT_ER_AAC_ELD);
 }
 
-#endif /* _INTERFACE_H */
+#endif /* INTERFACE_H */