Upgrade to FDKv2

Bug: 71430241
Test: CTS DecoderTest and DecoderTestAacDrc

original-Change-Id: Iaa20f749b8a04d553b20247cfe1a8930ebbabe30

Apply clang-format also on header files.

original-Change-Id: I14de1ef16bbc79ec0283e745f98356a10efeb2e4

Fixes for MPEG-D DRC

original-Change-Id: If1de2d74bbbac84b3f67de3b88b83f6a23b8a15c

Catch unsupported tw_mdct at an early stage

original-Change-Id: Ied9dd00d754162a0e3ca1ae3e6b854315d818afe

Fixing PVC transition frames

original-Change-Id: Ib75725abe39252806c32d71176308f2c03547a4e

Move qmf bands sanity check

original-Change-Id: Iab540c3013c174d9490d2ae100a4576f51d8dbc4

Initialize scaling variable

original-Change-Id: I3c4087101b70e998c71c1689b122b0d7762e0f9e

Add 16 qmf band configuration to getSlotNrgHQ()

original-Change-Id: I49a5d30f703a1b126ff163df9656db2540df21f1

Always apply byte alignment at the end of the AudioMuxElement

original-Change-Id: I42d560287506d65d4c3de8bfe3eb9a4ebeb4efc7

Setup SBR element only if no parse error exists

original-Change-Id: I1915b73704bc80ab882b9173d6bec59cbd073676

Additional array index check in HCR

original-Change-Id: I18cc6e501ea683b5009f1bbee26de8ddd04d8267

Fix fade-in index selection in concealment module

original-Change-Id: Ibf802ed6ed8c05e9257e1f3b6d0ac1162e9b81c1

Enable explicit backward compatible parser for AAC_LD

original-Change-Id: I27e9c678dcb5d40ed760a6d1e06609563d02482d

Skip spatial specific config in explicit backward compatible ASC

original-Change-Id: Iff7cc365561319e886090cedf30533f562ea4d6e

Update flags description in decoder API

original-Change-Id: I9a5b4f8da76bb652f5580cbd3ba9760425c43830

Add QMF domain reset function

original-Change-Id: I4f89a8a2c0277d18103380134e4ed86996e9d8d6

DRC upgrade v2.1.0

original-Change-Id: I5731c0540139dab220094cd978ef42099fc45b74

Fix integer overflow in sqrtFixp_lookup()

original-Change-Id: I429a6f0d19aa2cc957e0f181066f0ca73968c914

Fix integer overflow in invSqrtNorm2()

original-Change-Id: I84de5cbf9fb3adeb611db203fe492fabf4eb6155

Fix integer overflow in GenerateRandomVector()

original-Change-Id: I3118a641008bd9484d479e5b0b1ee2b5d7d44d74

Fix integer overflow in adjustTimeSlot_EldGrid()

original-Change-Id: I29d503c247c5c8282349b79df940416a512fb9d5

Fix integer overflow in FDKsbrEnc_codeEnvelope()

original-Change-Id: I6b34b61ebb9d525b0c651ed08de2befc1f801449

Follow-up on: Fix integer overflow in adjustTimeSlot_EldGrid()

original-Change-Id: I6f8f578cc7089e5eb7c7b93e580b72ca35ad689a

Fix integer overflow in get_pk_v2()

original-Change-Id: I63375bed40d45867f6eeaa72b20b1f33e815938c

Fix integer overflow in Syn_filt_zero()

original-Change-Id: Ie0c02fdfbe03988f9d3b20d10cd9fe4c002d1279

Fix integer overflow in CFac_CalcFacSignal()

original-Change-Id: Id2d767c40066c591b51768e978eb8af3b803f0c5

Fix integer overflow in FDKaacEnc_FDKaacEnc_calcPeNoAH()

original-Change-Id: Idcbd0f4a51ae2550ed106aa6f3d678d1f9724841

Fix integer overflow in sbrDecoder_calculateGainVec()

original-Change-Id: I7081bcbe29c5cede9821b38d93de07c7add2d507

Fix integer overflow in CLpc_SynthesisLattice()

original-Change-Id: I4a95ddc18de150102352d4a1845f06094764c881

Fix integer overflow in Pred_Lt4()

original-Change-Id: I4dbd012b2de7d07c3e70a47b92e3bfae8dbc750a

Fix integer overflow in FDKsbrEnc_InitSbrFastTransientDetector()

original-Change-Id: I788cbec1a4a00f44c2f3a72ad7a4afa219807d04

Fix unsigned integer overflow in FDKaacEnc_WriteBitstream()

original-Change-Id: I68fc75166e7d2cd5cd45b18dbe3d8c2a92f1822a

Fix unsigned integer overflow in FDK_MetadataEnc_Init()

original-Change-Id: Ie8d025f9bcdb2442c704bd196e61065c03c10af4

Fix overflow in pseudo random number generators

original-Change-Id: I3e2551ee01356297ca14e3788436ede80bd5513c

Fix unsigned integer overflow in sbrDecoder_Parse()

original-Change-Id: I3f231b2f437e9c37db4d5b964164686710eee971

Fix unsigned integer overflow in longsub()

original-Change-Id: I73c2bc50415cac26f1f5a29e125bbe75f9180a6e

Fix unsigned integer overflow in CAacDecoder_DecodeFrame()

original-Change-Id: Ifce2db4b1454b46fa5f887e9d383f1cc43b291e4

Fix overflow at CLpdChannelStream_Read()

original-Change-Id: Idb9d822ce3a4272e4794b643644f5434e2d4bf3f

Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD()

original-Change-Id: I1ccf77c0015684b85534c5eb97162740a870b71c

Fix unsigned integer overflow in UsacConfig_Parse()

original-Change-Id: Ie6d27f84b6ae7eef092ecbff4447941c77864d9f

Fix unsigned integer overflow in aacDecoder_drcParse()

original-Change-Id: I713f28e883eea3d70b6fa56a7b8f8c22bcf66ca0

Fix unsigned integer overflow in aacDecoder_drcReadCompression()

original-Change-Id: Ia34dfeb88c4705c558bce34314f584965cafcf7a

Fix unsigned integer overflow in CDataStreamElement_Read()

original-Change-Id: Iae896cc1d11f0a893d21be6aa90bd3e60a2c25f0

Fix unsigned integer overflow in transportDec_AdjustEndOfAccessUnit()

original-Change-Id: I64cf29a153ee784bb4a16fdc088baabebc0007dc

Fix unsigned integer overflow in transportDec_GetAuBitsRemaining()

original-Change-Id: I975b3420faa9c16a041874ba0db82e92035962e4

Fix unsigned integer overflow in extractExtendedData()

original-Change-Id: I2a59eb09e2053cfb58dfb75fcecfad6b85a80a8f

Fix signed integer overflow in CAacDecoder_ExtPayloadParse()

original-Change-Id: I4ad5ca4e3b83b5d964f1c2f8c5e7b17c477c7929

Fix unsigned integer overflow in CAacDecoder_DecodeFrame()

original-Change-Id: I29a39df77d45c52a0c9c5c83c1ba81f8d0f25090

Follow-up on: Fix integer overflow in CLpc_SynthesisLattice()

original-Change-Id: I8fb194ffc073a3432a380845be71036a272d388f

Fix signed integer overflow in _interpolateDrcGain()

original-Change-Id: I879ec9ab14005069a7c47faf80e8bc6e03d22e60

Fix unsigned integer overflow in FDKreadBits()

original-Change-Id: I1f47a6a8037ff70375aa8844947d5681bb4287ad

Fix unsigned integer overflow in FDKbyteAlign()

original-Change-Id: Id5f3a11a0c9e50fc6f76ed6c572dbd4e9f2af766

Fix unsigned integer overflow in FDK_get32()

original-Change-Id: I9d33b8e97e3d38cbb80629cb859266ca0acdce96

Fix unsigned integer overflow in FDK_pushBack()

original-Change-Id: Ic87f899bc8c6acf7a377a8ca7f3ba74c3a1e1c19

Fix unsigned integer overflow in FDK_pushForward()

original-Change-Id: I3b754382f6776a34be1602e66694ede8e0b8effc

Fix unsigned integer overflow in ReadPsData()

original-Change-Id: I25361664ba8139e32bbbef2ca8c106a606ce9c37

Fix signed integer overflow in E_UTIL_residu()

original-Change-Id: I8c3abd1f437ee869caa8fb5903ce7d3d641b6aad

REVERT: Follow-up on: Integer overflow in CLpc_SynthesisLattice().

original-Change-Id: I3d340099acb0414795c8dfbe6362bc0a8f045f9b

Follow-up on: Fix integer overflow in CLpc_SynthesisLattice()

original-Change-Id: I4aedb8b3a187064e9f4d985175aa55bb99cc7590

Follow-up on: Fix unsigned integer overflow in aacDecoder_drcParse()

original-Change-Id: I2aa2e13916213bf52a67e8b0518e7bf7e57fb37d

Fix integer overflow in acelp

original-Change-Id: Ie6390c136d84055f8b728aefbe4ebef6e029dc77

Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters()

original-Change-Id: I391ffd97ddb0b2c184cba76139bfb356a3b4d2e2

Adjust concealment default settings

original-Change-Id: I6a95db935a327c47df348030bcceafcb29f54b21

Saturate estimatedStartPos

original-Change-Id: I27be2085e0ae83ec9501409f65e003f6bcba1ab6

Negative shift exponent in _interpolateDrcGain()

original-Change-Id: I18edb26b26d002aafd5e633d4914960f7a359c29

Negative shift exponent in calculateICC()

original-Change-Id: I3dcd2ae98d2eb70ee0d59750863cbb2a6f4f8aba

Too large shift exponent in FDK_put()

original-Change-Id: Ib7d9aaa434d2d8de4a13b720ca0464b31ca9b671

Too large shift exponent in CalcInvLdData()

original-Change-Id: I43e6e78d4cd12daeb1dcd5d82d1798bdc2550262

Member access within null pointer of type SBR_CHANNEL

original-Change-Id: Idc5e4ea8997810376d2f36bbdf628923b135b097

Member access within null pointer of type CpePersistentData

original-Change-Id: Ib6c91cb0d37882768e5baf63324e429589de0d9d

Member access within null pointer FDKaacEnc_psyMain()

original-Change-Id: I7729b7f4479970531d9dc823abff63ca52e01997

Member access within null pointer FDKaacEnc_GetPnsParam()

original-Change-Id: I9aa3b9f3456ae2e0f7483dbd5b3dde95fc62da39

Member access within null pointer FDKsbrEnc_EnvEncodeFrame()

original-Change-Id: I67936f90ea714e90b3e81bc0dd1472cc713eb23a

Add HCR sanity check

original-Change-Id: I6c1d9732ebcf6af12f50b7641400752f74be39f7

Fix memory issue for HBE edge case with 8:3 SBR

original-Change-Id: I11ea58a61e69fbe8bf75034b640baee3011e63e9

Additional SBR parametrization sanity check for ELD

original-Change-Id: Ie26026fbfe174c2c7b3691f6218b5ce63e322140

Add MPEG-D DRC channel layout check

original-Change-Id: Iea70a74f171b227cce636a9eac4ba662777a2f72

Additional out-of-bounds checks in MPEG-D DRC

original-Change-Id: Ife4a8c3452c6fde8a0a09e941154a39a769777d4

Change-Id: Ic63cb2f628720f54fe9b572b0cb528e2599c624e

1 files changed, 321 insertions, 293 deletions

diff --git a/libSBRenc/src/nf_est.cpp b/libSBRenc/src/nf_est.cpp
index a4c5574..290ec35 100644
--- a/libSBRenc/src/nf_est.cpp
+++ b/libSBRenc/src/nf_est.cpp
@@ -1,74 +1,85 @@
-
-/* -----------------------------------------------------------------------------------------------------------
+/* -----------------------------------------------------------------------------
 Software License for The Fraunhofer FDK AAC Codec Library for Android
 
-© Copyright  1995 - 2015 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,7 +90,15 @@ Am Wolfsmantel 33
 
 www.iis.fraunhofer.de/amm
 amm-info@iis.fraunhofer.de
------------------------------------------------------------------------------------------------------------ */
+----------------------------------------------------------------------------- */
+
+/**************************** SBR encoder library ******************************
+
+   Author(s):
+
+   Description:
+
+*******************************************************************************/
 
 #include "nf_est.h"
 
@@ -88,23 +107,22 @@ amm-info@iis.fraunhofer.de
 #include "genericStds.h"
 
 /* smoothFilter[4]  = {0.05857864376269f, 0.2f, 0.34142135623731f, 0.4f}; */
-static const FIXP_DBL smoothFilter[4]  = { 0x077f813d, 0x19999995, 0x2bb3b1f5, 0x33333335 };
+static const FIXP_DBL smoothFilter[4] = {0x077f813d, 0x19999995, 0x2bb3b1f5,
+                                         0x33333335};
 
 /* static const INT smoothFilterLength = 4; */
 
-static const FIXP_DBL QuantOffset = (INT)0xfc000000;  /* ld64(0.25) */
+static const FIXP_DBL QuantOffset = (INT)0xfc000000; /* ld64(0.25) */
 
 #ifndef min
-#define min(a,b) ( a < b ? a:b)
+#define min(a, b) (a < b ? a : b)
 #endif
 
 #ifndef max
-#define max(a,b) ( a > b ? a:b)
+#define max(a, b) (a > b ? a : b)
 #endif
 
-#define NOISE_FLOOR_OFFSET_SCALING  (4)
-
-
+#define NOISE_FLOOR_OFFSET_SCALING (4)
 
 /**************************************************************************/
 /*!
@@ -116,38 +134,45 @@ static const FIXP_DBL QuantOffset = (INT)0xfc000000;  /* ld64(0.25) */
 
 */
 /**************************************************************************/
-static void
-smoothingOfNoiseLevels(FIXP_DBL *NoiseLevels,        /*!< pointer to noise-floor levels.*/
-                       INT nEnvelopes,               /*!< Number of noise floor envelopes.*/
-                       INT noNoiseBands,             /*!< Number of noise bands for every noise floor envelope. */
-                       FIXP_DBL prevNoiseLevels[NF_SMOOTHING_LENGTH][MAX_NUM_NOISE_VALUES],/*!< Previous noise floor envelopes. */
-                       const FIXP_DBL *smoothFilter, /*!< filter used for smoothing the noise floor levels. */
-                       INT transientFlag)            /*!< flag indicating if a transient is present*/
+static void smoothingOfNoiseLevels(
+    FIXP_DBL *NoiseLevels, /*!< pointer to noise-floor levels.*/
+    INT nEnvelopes,        /*!< Number of noise floor envelopes.*/
+    INT noNoiseBands, /*!< Number of noise bands for every noise floor envelope.
+                       */
+    FIXP_DBL prevNoiseLevels[NF_SMOOTHING_LENGTH]
+                            [MAX_NUM_NOISE_VALUES], /*!< Previous noise floor
+                                                       envelopes. */
+    const FIXP_DBL *
+        pSmoothFilter, /*!< filter used for smoothing the noise floor levels. */
+    INT transientFlag) /*!< flag indicating if a transient is present*/
 
 {
-  INT i,band,env;
+  INT i, band, env;
   FIXP_DBL accu;
 
-  for(env = 0; env < nEnvelopes; env++){
-    if(transientFlag){
-      for (i = 0; i < NF_SMOOTHING_LENGTH; i++){
-        FDKmemcpy(prevNoiseLevels[i],NoiseLevels+env*noNoiseBands,noNoiseBands*sizeof(FIXP_DBL));
+  for (env = 0; env < nEnvelopes; env++) {
+    if (transientFlag) {
+      for (i = 0; i < NF_SMOOTHING_LENGTH; i++) {
+        FDKmemcpy(prevNoiseLevels[i], NoiseLevels + env * noNoiseBands,
+                  noNoiseBands * sizeof(FIXP_DBL));
       }
-    }
-    else {
-      for (i = 1; i < NF_SMOOTHING_LENGTH; i++){
-        FDKmemcpy(prevNoiseLevels[i - 1],prevNoiseLevels[i],noNoiseBands*sizeof(FIXP_DBL));
+    } else {
+      for (i = 1; i < NF_SMOOTHING_LENGTH; i++) {
+        FDKmemcpy(prevNoiseLevels[i - 1], prevNoiseLevels[i],
+                  noNoiseBands * sizeof(FIXP_DBL));
       }
-      FDKmemcpy(prevNoiseLevels[NF_SMOOTHING_LENGTH - 1],NoiseLevels+env*noNoiseBands,noNoiseBands*sizeof(FIXP_DBL));
+      FDKmemcpy(prevNoiseLevels[NF_SMOOTHING_LENGTH - 1],
+                NoiseLevels + env * noNoiseBands,
+                noNoiseBands * sizeof(FIXP_DBL));
     }
 
-    for (band = 0; band < noNoiseBands; band++){
+    for (band = 0; band < noNoiseBands; band++) {
       accu = FL2FXCONST_DBL(0.0f);
-      for (i = 0; i < NF_SMOOTHING_LENGTH; i++){
-        accu += fMultDiv2(smoothFilter[i], prevNoiseLevels[i][band]);
+      for (i = 0; i < NF_SMOOTHING_LENGTH; i++) {
+        accu += fMultDiv2(pSmoothFilter[i], prevNoiseLevels[i][band]);
       }
-      FDK_ASSERT( (band + env*noNoiseBands) < MAX_NUM_NOISE_VALUES);
-      NoiseLevels[band+ env*noNoiseBands] = accu<<1;
+      FDK_ASSERT((band + env * noNoiseBands) < MAX_NUM_NOISE_VALUES);
+      NoiseLevels[band + env * noNoiseBands] = accu << 1;
     }
   }
 }
@@ -162,92 +187,100 @@ smoothingOfNoiseLevels(FIXP_DBL *NoiseLevels,        /*!< pointer to noise-floor
 
 */
 /**************************************************************************/
-static void
-qmfBasedNoiseFloorDetection(FIXP_DBL *noiseLevel,              /*!< Pointer to vector to store the noise levels in.*/
-                            FIXP_DBL ** quotaMatrixOrig,       /*!< Matrix holding the quota values of the original. */
-                            SCHAR *indexVector,                /*!< Index vector to obtain the patched data. */
-                            INT startIndex,                    /*!< Start index. */
-                            INT stopIndex,                     /*!< Stop index. */
-                            INT startChannel,                  /*!< Start channel of the current noise floor band.*/
-                            INT stopChannel,                   /*!< Stop channel of the current noise floor band. */
-                            FIXP_DBL ana_max_level,            /*!< Maximum level of the adaptive noise.*/
-                            FIXP_DBL noiseFloorOffset,         /*!< Noise floor offset. */
-                            INT missingHarmonicFlag,           /*!< Flag indicating if a strong tonal component is missing.*/
-                            FIXP_DBL weightFac,                /*!< Weightening factor for the difference between orig and sbr. */
-                            INVF_MODE diffThres,               /*!< Threshold value to control the inverse filtering decision.*/
-                            INVF_MODE inverseFilteringLevel)   /*!< Inverse filtering level of the current band.*/
+static void qmfBasedNoiseFloorDetection(
+    FIXP_DBL *noiseLevel,            /*!< Pointer to vector to
+                                        store the noise levels
+                                        in.*/
+    FIXP_DBL **quotaMatrixOrig,      /*!< Matrix holding the quota
+                                        values of the original. */
+    SCHAR *indexVector,              /*!< Index vector to obtain the
+                                        patched data. */
+    INT startIndex,                  /*!< Start index. */
+    INT stopIndex,                   /*!< Stop index. */
+    INT startChannel,                /*!< Start channel of the current
+                                        noise floor band.*/
+    INT stopChannel,                 /*!< Stop channel of the current
+                                        noise floor band. */
+    FIXP_DBL ana_max_level,          /*!< Maximum level of the
+                                        adaptive noise.*/
+    FIXP_DBL noiseFloorOffset,       /*!< Noise floor offset. */
+    INT missingHarmonicFlag,         /*!< Flag indicating if a
+                                        strong tonal component
+                                        is missing.*/
+    FIXP_DBL weightFac,              /*!< Weightening factor for the
+                                        difference between orig and sbr.
+                                      */
+    INVF_MODE diffThres,             /*!< Threshold value to control the
+                                        inverse filtering decision.*/
+    INVF_MODE inverseFilteringLevel) /*!< Inverse filtering
+                                        level of the current
+                                        band.*/
 {
   INT scale, l, k;
-  FIXP_DBL meanOrig=FL2FXCONST_DBL(0.0f), meanSbr=FL2FXCONST_DBL(0.0f), diff;
-  FIXP_DBL invIndex = GetInvInt(stopIndex-startIndex);
-  FIXP_DBL invChannel = GetInvInt(stopChannel-startChannel);
+  FIXP_DBL meanOrig = FL2FXCONST_DBL(0.0f), meanSbr = FL2FXCONST_DBL(0.0f),
+           diff;
+  FIXP_DBL invIndex = GetInvInt(stopIndex - startIndex);
+  FIXP_DBL invChannel = GetInvInt(stopChannel - startChannel);
   FIXP_DBL accu;
 
-   /*
-   Calculate the mean value, over the current time segment, for the original, the HFR
-   and the difference, over all channels in the current frequency range.
-   */
+  /*
+  Calculate the mean value, over the current time segment, for the original, the
+  HFR and the difference, over all channels in the current frequency range.
+  */
 
-  if(missingHarmonicFlag == 1){
-    for(l = startChannel; l < stopChannel;l++){
+  if (missingHarmonicFlag == 1) {
+    for (l = startChannel; l < stopChannel; l++) {
       /* tonalityOrig */
       accu = FL2FXCONST_DBL(0.0f);
-      for(k = startIndex ; k < stopIndex; k++){
+      for (k = startIndex; k < stopIndex; k++) {
         accu += fMultDiv2(quotaMatrixOrig[k][l], invIndex);
       }
-      meanOrig = fixMax(meanOrig,(accu<<1));
+      meanOrig = fixMax(meanOrig, (accu << 1));
 
       /* tonalitySbr */
       accu = FL2FXCONST_DBL(0.0f);
-      for(k = startIndex ; k < stopIndex; k++){
+      for (k = startIndex; k < stopIndex; k++) {
         accu += fMultDiv2(quotaMatrixOrig[k][indexVector[l]], invIndex);
       }
-      meanSbr  = fixMax(meanSbr,(accu<<1));
-
+      meanSbr = fixMax(meanSbr, (accu << 1));
     }
-  }
-  else{
-    for(l = startChannel; l < stopChannel;l++){
+  } else {
+    for (l = startChannel; l < stopChannel; l++) {
       /* tonalityOrig */
       accu = FL2FXCONST_DBL(0.0f);
-      for(k = startIndex ; k < stopIndex; k++){
+      for (k = startIndex; k < stopIndex; k++) {
         accu += fMultDiv2(quotaMatrixOrig[k][l], invIndex);
       }
-      meanOrig += fMult((accu<<1), invChannel);
+      meanOrig += fMult((accu << 1), invChannel);
 
       /* tonalitySbr */
       accu = FL2FXCONST_DBL(0.0f);
-      for(k = startIndex ; k < stopIndex; k++){
+      for (k = startIndex; k < stopIndex; k++) {
         accu += fMultDiv2(quotaMatrixOrig[k][indexVector[l]], invIndex);
       }
-      meanSbr  += fMult((accu<<1), invChannel);
+      meanSbr += fMult((accu << 1), invChannel);
     }
   }
 
   /* Small fix to avoid noise during silent passages.*/
-  if( meanOrig <= FL2FXCONST_DBL(0.000976562f*RELAXATION_FLOAT) &&
-      meanSbr <= FL2FXCONST_DBL(0.000976562f*RELAXATION_FLOAT) )
-  {
-    meanOrig = FL2FXCONST_DBL(101.5936673f*RELAXATION_FLOAT);
-    meanSbr  = FL2FXCONST_DBL(101.5936673f*RELAXATION_FLOAT);
+  if (meanOrig <= FL2FXCONST_DBL(0.000976562f * RELAXATION_FLOAT) &&
+      meanSbr <= FL2FXCONST_DBL(0.000976562f * RELAXATION_FLOAT)) {
+    meanOrig = FL2FXCONST_DBL(101.5936673f * RELAXATION_FLOAT);
+    meanSbr = FL2FXCONST_DBL(101.5936673f * RELAXATION_FLOAT);
   }
 
-  meanOrig = fixMax(meanOrig,RELAXATION);
-  meanSbr  = fixMax(meanSbr,RELAXATION);
+  meanOrig = fixMax(meanOrig, RELAXATION);
+  meanSbr = fixMax(meanSbr, RELAXATION);
 
-  if (missingHarmonicFlag == 1 ||
-      inverseFilteringLevel == INVF_MID_LEVEL ||
+  if (missingHarmonicFlag == 1 || inverseFilteringLevel == INVF_MID_LEVEL ||
       inverseFilteringLevel == INVF_LOW_LEVEL ||
-      inverseFilteringLevel == INVF_OFF ||
-      inverseFilteringLevel <= diffThres)
-  {
+      inverseFilteringLevel == INVF_OFF || inverseFilteringLevel <= diffThres) {
     diff = RELAXATION;
-  }
-  else {
+  } else {
     accu = fDivNorm(meanSbr, meanOrig, &scale);
 
-    diff = fixMax( RELAXATION,
-                   fMult(RELAXATION_FRACT,fMult(weightFac,accu)) >>( RELAXATION_SHIFT-scale ) ) ;
+    diff = fixMax(RELAXATION, fMult(RELAXATION_FRACT, fMult(weightFac, accu)) >>
+                                  (RELAXATION_SHIFT - scale));
   }
 
   /*
@@ -258,24 +291,27 @@ qmfBasedNoiseFloorDetection(FIXP_DBL *noiseLevel,              /*!< Pointer to v
   accu = fDivNorm(diff, meanOrig, &scale);
   scale -= 2;
 
-  if ( (scale>0) && (accu > ((FIXP_DBL)MAXVAL_DBL)>>scale) ) {
+  if ((scale > 0) && (accu > ((FIXP_DBL)MAXVAL_DBL) >> scale)) {
     *noiseLevel = (FIXP_DBL)MAXVAL_DBL;
-  }
-  else {
+  } else {
     *noiseLevel = scaleValue(accu, scale);
   }
 
   /*
    * Add a noise floor offset to compensate for bias in the detector
    *****************************************************************/
-  if(!missingHarmonicFlag) {
-    *noiseLevel = fixMin(fMult(*noiseLevel, noiseFloorOffset), (FIXP_DBL)MAXVAL_DBL>>NOISE_FLOOR_OFFSET_SCALING) << NOISE_FLOOR_OFFSET_SCALING;
+  if (!missingHarmonicFlag) {
+    *noiseLevel = fixMin(fMult(*noiseLevel, noiseFloorOffset),
+                         (FIXP_DBL)MAXVAL_DBL >> NOISE_FLOOR_OFFSET_SCALING)
+                  << NOISE_FLOOR_OFFSET_SCALING;
   }
 
   /*
    * check to see that we don't exceed the maximum allowed level
    **************************************************************/
-  *noiseLevel = fixMin(*noiseLevel, ana_max_level);     /* ana_max_level is scaled with factor 0.25 */
+  *noiseLevel =
+      fixMin(*noiseLevel,
+             ana_max_level); /* ana_max_level is scaled with factor 0.25 */
 }
 
 /**************************************************************************/
@@ -290,85 +326,78 @@ qmfBasedNoiseFloorDetection(FIXP_DBL *noiseLevel,              /*!< Pointer to v
 
 */
 /**************************************************************************/
-void
-FDKsbrEnc_sbrNoiseFloorEstimateQmf(HANDLE_SBR_NOISE_FLOOR_ESTIMATE h_sbrNoiseFloorEstimate, /*!< Handle to SBR_NOISE_FLOOR_ESTIMATE struct */
-                         const SBR_FRAME_INFO *frame_info,   /*!< Time frequency grid of the current frame. */
-                         FIXP_DBL *noiseLevels,              /*!< Pointer to vector to store the noise levels in.*/
-                         FIXP_DBL **quotaMatrixOrig,         /*!< Matrix holding the quota values of the original. */
-                         SCHAR    *indexVector,              /*!< Index vector to obtain the patched data. */
-                         INT missingHarmonicsFlag,           /*!< Flag indicating if a strong tonal component will be missing. */
-                         INT startIndex,                     /*!< Start index. */
-                         UINT numberOfEstimatesPerFrame,     /*!< The number of tonality estimates per frame. */
-                         int transientFrame,                 /*!< A flag indicating if a transient is present. */
-                         INVF_MODE* pInvFiltLevels,          /*!< Pointer to the vector holding the inverse filtering levels. */
-                         UINT sbrSyntaxFlags
-                         )
+void FDKsbrEnc_sbrNoiseFloorEstimateQmf(
+    HANDLE_SBR_NOISE_FLOOR_ESTIMATE
+        h_sbrNoiseFloorEstimate, /*!< Handle to SBR_NOISE_FLOOR_ESTIMATE struct
+                                  */
+    const SBR_FRAME_INFO
+        *frame_info, /*!< Time frequency grid of the current frame. */
+    FIXP_DBL
+        *noiseLevels, /*!< Pointer to vector to store the noise levels in.*/
+    FIXP_DBL **quotaMatrixOrig, /*!< Matrix holding the quota values of the
+                                   original. */
+    SCHAR *indexVector,         /*!< Index vector to obtain the patched data. */
+    INT missingHarmonicsFlag,   /*!< Flag indicating if a strong tonal component
+                                   will be missing. */
+    INT startIndex,             /*!< Start index. */
+    UINT numberOfEstimatesPerFrame, /*!< The number of tonality estimates per
+                                       frame. */
+    int transientFrame, /*!< A flag indicating if a transient is present. */
+    INVF_MODE *pInvFiltLevels, /*!< Pointer to the vector holding the inverse
+                                  filtering levels. */
+    UINT sbrSyntaxFlags)
 
 {
-
   INT nNoiseEnvelopes, startPos[2], stopPos[2], env, band;
 
-  INT noNoiseBands      = h_sbrNoiseFloorEstimate->noNoiseBands;
-  INT *freqBandTable    = h_sbrNoiseFloorEstimate->freqBandTableQmf;
+  INT noNoiseBands = h_sbrNoiseFloorEstimate->noNoiseBands;
+  INT *freqBandTable = h_sbrNoiseFloorEstimate->freqBandTableQmf;
 
   nNoiseEnvelopes = frame_info->nNoiseEnvelopes;
 
-  if (sbrSyntaxFlags & SBR_SYNTAX_LOW_DELAY) {
-    nNoiseEnvelopes = 1;
-    startPos[0] = startIndex;
-    stopPos[0]  = startIndex + min(numberOfEstimatesPerFrame,2);
-  } else
-  if(nNoiseEnvelopes == 1){
-    startPos[0] = startIndex;
-    stopPos[0]  = startIndex + 2;
-  }
-  else{
-    startPos[0] = startIndex;
-    stopPos[0]  = startIndex + 1;
+  startPos[0] = startIndex;
+
+  if (nNoiseEnvelopes == 1) {
+    stopPos[0] = startIndex + min(numberOfEstimatesPerFrame, 2);
+  } else {
+    stopPos[0] = startIndex + 1;
     startPos[1] = startIndex + 1;
-    stopPos[1]  = startIndex + 2;
+    stopPos[1] = startIndex + min(numberOfEstimatesPerFrame, 2);
   }
 
   /*
    * Estimate the noise floor.
    **************************************/
-  for(env = 0; env < nNoiseEnvelopes; env++){
-    for(band = 0; band < noNoiseBands; band++){
-      FDK_ASSERT( (band + env*noNoiseBands) < MAX_NUM_NOISE_VALUES);
-      qmfBasedNoiseFloorDetection(&noiseLevels[band + env*noNoiseBands],
-                                  quotaMatrixOrig,
-                                  indexVector,
-                                  startPos[env],
-                                  stopPos[env],
-                                  freqBandTable[band],
-                                  freqBandTable[band+1],
-                                  h_sbrNoiseFloorEstimate->ana_max_level,
-                                  h_sbrNoiseFloorEstimate->noiseFloorOffset[band],
-                                  missingHarmonicsFlag,
-                                  h_sbrNoiseFloorEstimate->weightFac,
-                                  h_sbrNoiseFloorEstimate->diffThres,
-                                  pInvFiltLevels[band]);
+  for (env = 0; env < nNoiseEnvelopes; env++) {
+    for (band = 0; band < noNoiseBands; band++) {
+      FDK_ASSERT((band + env * noNoiseBands) < MAX_NUM_NOISE_VALUES);
+      qmfBasedNoiseFloorDetection(
+          &noiseLevels[band + env * noNoiseBands], quotaMatrixOrig, indexVector,
+          startPos[env], stopPos[env], freqBandTable[band],
+          freqBandTable[band + 1], h_sbrNoiseFloorEstimate->ana_max_level,
+          h_sbrNoiseFloorEstimate->noiseFloorOffset[band], missingHarmonicsFlag,
+          h_sbrNoiseFloorEstimate->weightFac,
+          h_sbrNoiseFloorEstimate->diffThres, pInvFiltLevels[band]);
     }
   }
 
-
   /*
    * Smoothing of the values.
    **************************/
-  smoothingOfNoiseLevels(noiseLevels,
-                         nNoiseEnvelopes,
+  smoothingOfNoiseLevels(noiseLevels, nNoiseEnvelopes,
                          h_sbrNoiseFloorEstimate->noNoiseBands,
                          h_sbrNoiseFloorEstimate->prevNoiseLevels,
-                         h_sbrNoiseFloorEstimate->smoothFilter,
-                         transientFrame);
-
+                         h_sbrNoiseFloorEstimate->smoothFilter, transientFrame);
 
   /* quantisation*/
-  for(env = 0; env < nNoiseEnvelopes; env++){
-    for(band = 0; band < noNoiseBands; band++){
-      FDK_ASSERT( (band + env*noNoiseBands) < MAX_NUM_NOISE_VALUES);
-      noiseLevels[band + env*noNoiseBands] =
-         (FIXP_DBL)NOISE_FLOOR_OFFSET_64 - (FIXP_DBL)CalcLdData(noiseLevels[band + env*noNoiseBands]+(FIXP_DBL)1) + QuantOffset;
+  for (env = 0; env < nNoiseEnvelopes; env++) {
+    for (band = 0; band < noNoiseBands; band++) {
+      FDK_ASSERT((band + env * noNoiseBands) < MAX_NUM_NOISE_VALUES);
+      noiseLevels[band + env * noNoiseBands] =
+          (FIXP_DBL)NOISE_FLOOR_OFFSET_64 -
+          (FIXP_DBL)CalcLdData(noiseLevels[band + env * noNoiseBands] +
+                               (FIXP_DBL)1) +
+          QuantOffset;
     }
   }
 }
@@ -382,39 +411,39 @@ FDKsbrEnc_sbrNoiseFloorEstimateQmf(HANDLE_SBR_NOISE_FLOOR_ESTIMATE h_sbrNoiseFlo
 
 */
 /**************************************************************************/
-static INT
-downSampleLoRes(INT *v_result,              /*!<    */
-                INT num_result,             /*!<    */
-                const UCHAR *freqBandTableRef,/*!<    */
-                INT num_Ref)                /*!<    */
+static INT downSampleLoRes(INT *v_result,                 /*!<    */
+                           INT num_result,                /*!<    */
+                           const UCHAR *freqBandTableRef, /*!<    */
+                           INT num_Ref)                   /*!<    */
 {
   INT step;
-  INT i,j;
-  INT org_length,result_length;
-  INT v_index[MAX_FREQ_COEFFS/2];
+  INT i, j;
+  INT org_length, result_length;
+  INT v_index[MAX_FREQ_COEFFS / 2];
 
   /* init */
-  org_length=num_Ref;
-  result_length=num_result;
-
-  v_index[0]=0;	/* Always use left border */
-  i=0;
-  while(org_length > 0)	/* Create downsample vector */
-    {
-      i++;
-      step=org_length/result_length; /* floor; */
-      org_length=org_length - step;
-      result_length--;
-      v_index[i]=v_index[i-1]+step;
-    }
+  org_length = num_Ref;
+  result_length = num_result;
 
-  if(i != num_result )	/* Should never happen */
-    return (1);/* error downsampling */
+  v_index[0] = 0; /* Always use left border */
+  i = 0;
+  while (org_length > 0) /* Create downsample vector */
+  {
+    i++;
+    step = org_length / result_length; /* floor; */
+    org_length = org_length - step;
+    result_length--;
+    v_index[i] = v_index[i - 1] + step;
+  }
 
-  for(j=0;j<=i;j++)	/* Use downsample vector to index LoResolution vector. */
-    {
-      v_result[j]=freqBandTableRef[v_index[j]];
-    }
+  if (i != num_result) /* Should never happen */
+    return (1);        /* error downsampling */
+
+  for (j = 0; j <= i;
+       j++) /* Use downsample vector to index LoResolution vector. */
+  {
+    v_result[j] = freqBandTableRef[v_index[j]];
+  }
 
   return (0);
 }
@@ -428,48 +457,48 @@ downSampleLoRes(INT *v_result,              /*!<    */
 
 */
 /**************************************************************************/
-INT
-FDKsbrEnc_InitSbrNoiseFloorEstimate (HANDLE_SBR_NOISE_FLOOR_ESTIMATE  h_sbrNoiseFloorEstimate,   /*!< Handle to SBR_NOISE_FLOOR_ESTIMATE struct */
-                             INT ana_max_level,                       /*!< Maximum level of the adaptive noise. */
-                             const UCHAR *freqBandTable,      /*!< Frequany band table. */
-                             INT nSfb,                                /*!< Number of frequency bands. */
-                             INT noiseBands,                          /*!< Number of noise bands per octave. */
-                             INT noiseFloorOffset,                    /*!< Noise floor offset. */
-                             INT timeSlots,                           /*!< Number of time slots in a frame. */
-                             UINT useSpeechConfig             /*!< Flag: adapt tuning parameters according to speech */
-                            )
-{
+INT FDKsbrEnc_InitSbrNoiseFloorEstimate(
+    HANDLE_SBR_NOISE_FLOOR_ESTIMATE
+        h_sbrNoiseFloorEstimate, /*!< Handle to SBR_NOISE_FLOOR_ESTIMATE struct
+                                  */
+    INT ana_max_level,           /*!< Maximum level of the adaptive noise. */
+    const UCHAR *freqBandTable,  /*!< Frequency band table. */
+    INT nSfb,                    /*!< Number of frequency bands. */
+    INT noiseBands,              /*!< Number of noise bands per octave. */
+    INT noiseFloorOffset,        /*!< Noise floor offset. */
+    INT timeSlots,               /*!< Number of time slots in a frame. */
+    UINT useSpeechConfig /*!< Flag: adapt tuning parameters according to speech
+                          */
+) {
   INT i, qexp, qtmp;
   FIXP_DBL tmp, exp;
 
-  FDKmemclear(h_sbrNoiseFloorEstimate,sizeof(SBR_NOISE_FLOOR_ESTIMATE));
+  FDKmemclear(h_sbrNoiseFloorEstimate, sizeof(SBR_NOISE_FLOOR_ESTIMATE));
 
   h_sbrNoiseFloorEstimate->smoothFilter = smoothFilter;
   if (useSpeechConfig) {
     h_sbrNoiseFloorEstimate->weightFac = (FIXP_DBL)MAXVAL_DBL;
     h_sbrNoiseFloorEstimate->diffThres = INVF_LOW_LEVEL;
-  }
-  else {
+  } else {
     h_sbrNoiseFloorEstimate->weightFac = FL2FXCONST_DBL(0.25f);
     h_sbrNoiseFloorEstimate->diffThres = INVF_MID_LEVEL;
   }
 
-  h_sbrNoiseFloorEstimate->timeSlots     = timeSlots;
-  h_sbrNoiseFloorEstimate->noiseBands    = noiseBands;
+  h_sbrNoiseFloorEstimate->timeSlots = timeSlots;
+  h_sbrNoiseFloorEstimate->noiseBands = noiseBands;
 
   /* h_sbrNoiseFloorEstimate->ana_max_level is scaled by 0.25  */
-  switch(ana_max_level)
-  {
-  case 6:
+  switch (ana_max_level) {
+    case 6:
       h_sbrNoiseFloorEstimate->ana_max_level = (FIXP_DBL)MAXVAL_DBL;
       break;
-  case 3:
+    case 3:
       h_sbrNoiseFloorEstimate->ana_max_level = FL2FXCONST_DBL(0.5);
       break;
-  case -3:
+    case -3:
       h_sbrNoiseFloorEstimate->ana_max_level = FL2FXCONST_DBL(0.125);
       break;
-  default:
+    default:
       /* Should not enter here */
       h_sbrNoiseFloorEstimate->ana_max_level = (FIXP_DBL)MAXVAL_DBL;
       break;
@@ -478,26 +507,26 @@ FDKsbrEnc_InitSbrNoiseFloorEstimate (HANDLE_SBR_NOISE_FLOOR_ESTIMATE  h_sbrNoise
   /*
     calculate number of noise bands and allocate
   */
-  if(FDKsbrEnc_resetSbrNoiseFloorEstimate(h_sbrNoiseFloorEstimate,freqBandTable,nSfb))
-    return(1);
+  if (FDKsbrEnc_resetSbrNoiseFloorEstimate(h_sbrNoiseFloorEstimate,
+                                           freqBandTable, nSfb))
+    return (1);
 
-  if(noiseFloorOffset == 0) {
-    tmp = ((FIXP_DBL)MAXVAL_DBL)>>NOISE_FLOOR_OFFSET_SCALING;
-  }
-  else {
+  if (noiseFloorOffset == 0) {
+    tmp = ((FIXP_DBL)MAXVAL_DBL) >> NOISE_FLOOR_OFFSET_SCALING;
+  } else {
     /* noiseFloorOffset has to be smaller than 12, because
        the result of the calculation below must be smaller than 1:
        (2^(noiseFloorOffset/3))*2^4<1                                        */
-    FDK_ASSERT(noiseFloorOffset<12);
+    FDK_ASSERT(noiseFloorOffset < 12);
 
     /* Assumes the noise floor offset in tuning table are in q31    */
     /* Change the qformat here when non-zero values would be filled */
     exp = fDivNorm((FIXP_DBL)noiseFloorOffset, 3, &qexp);
-    tmp = fPow(2, DFRACT_BITS-1, exp, qexp, &qtmp);
-    tmp = scaleValue(tmp, qtmp-NOISE_FLOOR_OFFSET_SCALING);
+    tmp = fPow(2, DFRACT_BITS - 1, exp, qexp, &qtmp);
+    tmp = scaleValue(tmp, qtmp - NOISE_FLOOR_OFFSET_SCALING);
   }
 
-  for(i=0;i<h_sbrNoiseFloorEstimate->noNoiseBands;i++) {
+  for (i = 0; i < h_sbrNoiseFloorEstimate->noNoiseBands; i++) {
     h_sbrNoiseFloorEstimate->noiseFloorOffset[i] = tmp;
   }
 
@@ -514,52 +543,50 @@ FDKsbrEnc_InitSbrNoiseFloorEstimate (HANDLE_SBR_NOISE_FLOOR_ESTIMATE  h_sbrNoise
 
 */
 /**************************************************************************/
-INT
-FDKsbrEnc_resetSbrNoiseFloorEstimate (HANDLE_SBR_NOISE_FLOOR_ESTIMATE h_sbrNoiseFloorEstimate, /*!< Handle to SBR_NOISE_FLOOR_ESTIMATE struct */
-                            const UCHAR *freqBandTable,             /*!< Frequany band table. */
-                            INT nSfb)                             /*!< Number of bands in the frequency band table. */
-{
-    INT k2,kx;
+INT FDKsbrEnc_resetSbrNoiseFloorEstimate(
+    HANDLE_SBR_NOISE_FLOOR_ESTIMATE
+        h_sbrNoiseFloorEstimate, /*!< Handle to SBR_NOISE_FLOOR_ESTIMATE struct
+                                  */
+    const UCHAR *freqBandTable,  /*!< Frequency band table. */
+    INT nSfb /*!< Number of bands in the frequency band table. */
+) {
+  INT k2, kx;
 
+  /*
+   * Calculate number of noise bands
+   ***********************************/
+  k2 = freqBandTable[nSfb];
+  kx = freqBandTable[0];
+  if (h_sbrNoiseFloorEstimate->noiseBands == 0) {
+    h_sbrNoiseFloorEstimate->noNoiseBands = 1;
+  } else {
     /*
-    * Calculate number of noise bands
-    ***********************************/
-    k2=freqBandTable[nSfb];
-    kx=freqBandTable[0];
-    if(h_sbrNoiseFloorEstimate->noiseBands == 0){
-        h_sbrNoiseFloorEstimate->noNoiseBands = 1;
-    }
-    else{
-        /*
-        * Calculate number of noise bands 1,2 or 3 bands/octave
-        ********************************************************/
-        FIXP_DBL tmp, ratio, lg2;
-        INT ratio_e, qlg2, nNoiseBands;
-
-        ratio = fDivNorm(k2, kx, &ratio_e);
-        lg2 = fLog2(ratio, ratio_e, &qlg2);
-        tmp = fMult((FIXP_DBL)(h_sbrNoiseFloorEstimate->noiseBands<<24), lg2);
-        tmp = scaleValue(tmp, qlg2-23);
+     * Calculate number of noise bands 1,2 or 3 bands/octave
+     ********************************************************/
+    FIXP_DBL tmp, ratio, lg2;
+    INT ratio_e, qlg2, nNoiseBands;
 
-        nNoiseBands = (INT)((tmp + (FIXP_DBL)1) >> 1);
+    ratio = fDivNorm(k2, kx, &ratio_e);
+    lg2 = fLog2(ratio, ratio_e, &qlg2);
+    tmp = fMult((FIXP_DBL)(h_sbrNoiseFloorEstimate->noiseBands << 24), lg2);
+    tmp = scaleValue(tmp, qlg2 - 23);
 
+    nNoiseBands = (INT)((tmp + (FIXP_DBL)1) >> 1);
 
-        if (nNoiseBands > MAX_NUM_NOISE_COEFFS ) {
-          nNoiseBands = MAX_NUM_NOISE_COEFFS;
-        }
-
-        if( nNoiseBands == 0 ) {
-          nNoiseBands = 1;
-        }
-
-        h_sbrNoiseFloorEstimate->noNoiseBands = nNoiseBands;
+    if (nNoiseBands > MAX_NUM_NOISE_COEFFS) {
+      nNoiseBands = MAX_NUM_NOISE_COEFFS;
+    }
 
+    if (nNoiseBands == 0) {
+      nNoiseBands = 1;
     }
 
+    h_sbrNoiseFloorEstimate->noNoiseBands = nNoiseBands;
+  }
 
-    return(downSampleLoRes(h_sbrNoiseFloorEstimate->freqBandTableQmf,
-        h_sbrNoiseFloorEstimate->noNoiseBands,
-        freqBandTable,nSfb));
+  return (downSampleLoRes(h_sbrNoiseFloorEstimate->freqBandTableQmf,
+                          h_sbrNoiseFloorEstimate->noNoiseBands, freqBandTable,
+                          nSfb));
 }
 
 /**************************************************************************/
@@ -572,10 +599,11 @@ FDKsbrEnc_resetSbrNoiseFloorEstimate (HANDLE_SBR_NOISE_FLOOR_ESTIMATE h_sbrNoise
 
 */
 /**************************************************************************/
-void
-FDKsbrEnc_deleteSbrNoiseFloorEstimate (HANDLE_SBR_NOISE_FLOOR_ESTIMATE h_sbrNoiseFloorEstimate)  /*!< Handle to SBR_NOISE_FLOOR_ESTIMATE struct */
+void FDKsbrEnc_deleteSbrNoiseFloorEstimate(
+    HANDLE_SBR_NOISE_FLOOR_ESTIMATE
+        h_sbrNoiseFloorEstimate) /*!< Handle to SBR_NOISE_FLOOR_ESTIMATE struct
+                                  */
 {
-
   if (h_sbrNoiseFloorEstimate) {
     /*
       nothing to do