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, 304 insertions, 446 deletions

diff --git a/libAACenc/src/dyn_bits.cpp b/libAACenc/src/dyn_bits.cpp
index 0c07109..74baeb8 100644
--- a/libAACenc/src/dyn_bits.cpp
+++ b/libAACenc/src/dyn_bits.cpp
@@ -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,14 +90,15 @@ 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: Noiseless coder module
+   Description: Noiseless coder module
 
-******************************************************************************/
+*******************************************************************************/
 
 #include "dyn_bits.h"
 #include "bit_cnt.h"
@@ -97,18 +109,15 @@ amm-info@iis.fraunhofer.de
 
 typedef INT (*lookUpTable)[CODE_BOOK_ESC_NDX + 1];
 
-static INT FDKaacEnc_getSideInfoBits(
-        const SECTION_INFO* const huffsection,
-        const SHORT* const        sideInfoTab,
-        const INT                 useHCR
-        )
-{
+static INT FDKaacEnc_getSideInfoBits(const SECTION_INFO* const huffsection,
+                                     const SHORT* const sideInfoTab,
+                                     const INT useHCR) {
   INT sideInfoBits;
 
-  if ( useHCR && ((huffsection->codeBook == 11) || (huffsection->codeBook >= 16)) ) {
+  if (useHCR &&
+      ((huffsection->codeBook == 11) || (huffsection->codeBook >= 16))) {
     sideInfoBits = 5;
-  }
-  else {
+  } else {
     sideInfoBits = sideInfoTab[huffsection->sfbCnt];
   }
 
@@ -117,43 +126,32 @@ static INT FDKaacEnc_getSideInfoBits(
 
 /* count bits using all possible tables */
 static void FDKaacEnc_buildBitLookUp(
-        const SHORT* const        quantSpectrum,
-        const INT                 maxSfb,
-        const INT* const          sfbOffset,
-        const UINT* const         sfbMax,
-        INT                       bitLookUp[MAX_SFB_LONG][CODE_BOOK_ESC_NDX + 1],
-        SECTION_INFO* const       huffsection
-        )
-{
+    const SHORT* const quantSpectrum, const INT maxSfb,
+    const INT* const sfbOffset, const UINT* const sfbMax,
+    INT bitLookUp[MAX_SFB_LONG][CODE_BOOK_ESC_NDX + 1],
+    SECTION_INFO* const huffsection) {
   INT i, sfbWidth;
 
-  for (i = 0; i < maxSfb; i++)
-  {
+  for (i = 0; i < maxSfb; i++) {
     huffsection[i].sfbCnt = 1;
     huffsection[i].sfbStart = i;
     huffsection[i].sectionBits = INVALID_BITCOUNT;
     huffsection[i].codeBook = -1;
     sfbWidth = sfbOffset[i + 1] - sfbOffset[i];
-    FDKaacEnc_bitCount(quantSpectrum + sfbOffset[i], sfbWidth, sfbMax[i], bitLookUp[i]);
+    FDKaacEnc_bitCount(quantSpectrum + sfbOffset[i], sfbWidth, sfbMax[i],
+                       bitLookUp[i]);
   }
 }
 
 /* essential helper functions */
-static INT FDKaacEnc_findBestBook(
-        const INT* const          bc,
-        INT* const                book,
-        const INT                 useVCB11
-        )
-{
+static inline INT FDKaacEnc_findBestBook(const INT* const bc, INT* const book,
+                                         const INT useVCB11) {
   INT minBits = INVALID_BITCOUNT, j;
 
   int end = CODE_BOOK_ESC_NDX;
 
-
-  for (j = 0; j <= end; j++)
-  {
-    if (bc[j] < minBits)
-    {
+  for (j = 0; j <= end; j++) {
+    if (bc[j] < minBits) {
       minBits = bc[j];
       *book = j;
     }
@@ -161,114 +159,94 @@ static INT FDKaacEnc_findBestBook(
   return (minBits);
 }
 
-static INT FDKaacEnc_findMinMergeBits(
-        const INT* const          bc1,
-        const INT* const          bc2,
-        const INT                 useVCB11
-        )
-{
+static inline INT FDKaacEnc_findMinMergeBits(const INT* const bc1,
+                                             const INT* const bc2,
+                                             const INT useVCB11) {
   INT minBits = INVALID_BITCOUNT, j;
 
-  int end = CODE_BOOK_ESC_NDX;
-
+  DWORD_ALIGNED(bc1);
+  DWORD_ALIGNED(bc2);
 
-  for (j = 0; j <= end; j++)
-  {
-    if (bc1[j] + bc2[j] < minBits)
-    {
-      minBits = bc1[j] + bc2[j];
-    }
+  for (j = 0; j <= CODE_BOOK_ESC_NDX; j++) {
+    minBits = fixMin(minBits, bc1[j] + bc2[j]);
   }
   return (minBits);
 }
 
-static void FDKaacEnc_mergeBitLookUp(
-        INT* const                bc1,
-        const INT* const          bc2
-        )
-{
+static inline void FDKaacEnc_mergeBitLookUp(INT* const RESTRICT bc1,
+                                            const INT* const RESTRICT bc2) {
   int j;
 
-  for (j = 0; j <= CODE_BOOK_ESC_NDX; j++)
-  {
+  for (j = 0; j <= CODE_BOOK_ESC_NDX; j++) {
+    FDK_ASSERT(INVALID_BITCOUNT == 0x1FFFFFFF);
     bc1[j] = fixMin(bc1[j] + bc2[j], INVALID_BITCOUNT);
   }
 }
 
-static INT FDKaacEnc_findMaxMerge(
-        const INT* const          mergeGainLookUp,
-        const SECTION_INFO* const  huffsection,
-        const INT maxSfb,
-        INT* const                maxNdx
-        )
-{
+static inline INT FDKaacEnc_findMaxMerge(const INT* const mergeGainLookUp,
+                                         const SECTION_INFO* const huffsection,
+                                         const INT maxSfb, INT* const maxNdx) {
   INT i, maxMergeGain = 0;
+  int lastMaxNdx = 0;
 
-  for (i = 0; i + huffsection[i].sfbCnt < maxSfb; i += huffsection[i].sfbCnt)
-  {
-    if (mergeGainLookUp[i] > maxMergeGain)
-    {
+  for (i = 0; i + huffsection[i].sfbCnt < maxSfb; i += huffsection[i].sfbCnt) {
+    if (mergeGainLookUp[i] > maxMergeGain) {
       maxMergeGain = mergeGainLookUp[i];
-      *maxNdx = i;
+      lastMaxNdx = i;
     }
   }
+  *maxNdx = lastMaxNdx;
   return (maxMergeGain);
 }
 
-static INT FDKaacEnc_CalcMergeGain(
-        const SECTION_INFO* const huffsection,
-        const INT                 bitLookUp[MAX_SFB_LONG][CODE_BOOK_ESC_NDX + 1],
-        const SHORT* const        sideInfoTab,
-        const INT                 ndx1,
-        const INT                 ndx2,
-        const INT                 useVCB11
-        )
-{
+static inline INT FDKaacEnc_CalcMergeGain(
+    const SECTION_INFO* const huffsection,
+    const INT bitLookUp[MAX_SFB_LONG][CODE_BOOK_ESC_NDX + 1],
+    const SHORT* const sideInfoTab, const INT ndx1, const INT ndx2,
+    const INT useVCB11) {
   INT MergeGain, MergeBits, SplitBits;
 
-  MergeBits = sideInfoTab[huffsection[ndx1].sfbCnt + huffsection[ndx2].sfbCnt] + FDKaacEnc_findMinMergeBits(bitLookUp[ndx1], bitLookUp[ndx2], useVCB11);
-  SplitBits = huffsection[ndx1].sectionBits + huffsection[ndx2].sectionBits; /* Bit amount for splitted huffsections */
+  MergeBits =
+      sideInfoTab[huffsection[ndx1].sfbCnt + huffsection[ndx2].sfbCnt] +
+      FDKaacEnc_findMinMergeBits(bitLookUp[ndx1], bitLookUp[ndx2], useVCB11);
+  SplitBits =
+      huffsection[ndx1].sectionBits +
+      huffsection[ndx2].sectionBits; /* Bit amount for splitted huffsections */
   MergeGain = SplitBits - MergeBits;
 
-  if ( (huffsection[ndx1].codeBook==CODE_BOOK_PNS_NO)||(huffsection[ndx2].codeBook==CODE_BOOK_PNS_NO)
-    || (huffsection[ndx1].codeBook==CODE_BOOK_IS_OUT_OF_PHASE_NO)||(huffsection[ndx2].codeBook==CODE_BOOK_IS_OUT_OF_PHASE_NO)
-    || (huffsection[ndx1].codeBook==CODE_BOOK_IS_IN_PHASE_NO)||(huffsection[ndx2].codeBook==CODE_BOOK_IS_IN_PHASE_NO)
-    )
-  {
+  if ((huffsection[ndx1].codeBook == CODE_BOOK_PNS_NO) ||
+      (huffsection[ndx2].codeBook == CODE_BOOK_PNS_NO) ||
+      (huffsection[ndx1].codeBook == CODE_BOOK_IS_OUT_OF_PHASE_NO) ||
+      (huffsection[ndx2].codeBook == CODE_BOOK_IS_OUT_OF_PHASE_NO) ||
+      (huffsection[ndx1].codeBook == CODE_BOOK_IS_IN_PHASE_NO) ||
+      (huffsection[ndx2].codeBook == CODE_BOOK_IS_IN_PHASE_NO)) {
     MergeGain = -1;
   }
 
   return (MergeGain);
 }
 
-
 /* sectioning Stage 0:find minimum codbooks */
 static void FDKaacEnc_gmStage0(
-        SECTION_INFO* const RESTRICT huffsection,
-        const INT                    bitLookUp[MAX_SFB_LONG][CODE_BOOK_ESC_NDX + 1],
-        const INT                    maxSfb,
-        const INT* const             noiseNrg,
-        const INT* const             isBook
-        )
-{
+    SECTION_INFO* const RESTRICT huffsection,
+    const INT bitLookUp[MAX_SFB_LONG][CODE_BOOK_ESC_NDX + 1], const INT maxSfb,
+    const INT* const noiseNrg, const INT* const isBook) {
   INT i;
 
-  for (i = 0; i < maxSfb; i++)
-  {
+  for (i = 0; i < maxSfb; i++) {
     /* Side-Info bits will be calculated in Stage 1! */
-    if (huffsection[i].sectionBits == INVALID_BITCOUNT)
-    {
+    if (huffsection[i].sectionBits == INVALID_BITCOUNT) {
       /* intensity and pns codebooks are already allocated in bitcount.c */
-      if(noiseNrg[i] != NO_NOISE_PNS){
-        huffsection[i].codeBook=CODE_BOOK_PNS_NO;
+      if (noiseNrg[i] != NO_NOISE_PNS) {
+        huffsection[i].codeBook = CODE_BOOK_PNS_NO;
         huffsection[i].sectionBits = 0;
-      }
-      else if( isBook[i] ) {
-        huffsection[i].codeBook=isBook[i];
+      } else if (isBook[i]) {
+        huffsection[i].codeBook = isBook[i];
         huffsection[i].sectionBits = 0;
-      }
-      else {
-        huffsection[i].sectionBits = FDKaacEnc_findBestBook(bitLookUp[i], &(huffsection[i].codeBook), 0); /* useVCB11 must be 0!!! */
+      } else {
+        huffsection[i].sectionBits =
+            FDKaacEnc_findBestBook(bitLookUp[i], &(huffsection[i].codeBook),
+                                   0); /* useVCB11 must be 0!!! */
       }
     }
   }
@@ -279,24 +257,18 @@ static void FDKaacEnc_gmStage0(
    calculate side info
  */
 static void FDKaacEnc_gmStage1(
-        SECTION_INFO* const RESTRICT huffsection,
-        INT                          bitLookUp[MAX_SFB_LONG][CODE_BOOK_ESC_NDX + 1],
-        const INT                    maxSfb,
-        const SHORT* const           sideInfoTab,
-        const INT                    useVCB11
-        )
-{
+    SECTION_INFO* const RESTRICT huffsection,
+    INT bitLookUp[MAX_SFB_LONG][CODE_BOOK_ESC_NDX + 1], const INT maxSfb,
+    const SHORT* const sideInfoTab, const INT useVCB11) {
   INT mergeStart = 0, mergeEnd;
 
-  do
-  {
-    for (mergeEnd = mergeStart + 1; mergeEnd < maxSfb; mergeEnd++)
-    {
+  do {
+    for (mergeEnd = mergeStart + 1; mergeEnd < maxSfb; mergeEnd++) {
       if (huffsection[mergeStart].codeBook != huffsection[mergeEnd].codeBook)
         break;
 
-
-      /* we can merge. update tables, side info bits will be updated outside of this loop */
+      /* we can merge. update tables, side info bits will be updated outside of
+       * this loop */
       huffsection[mergeStart].sfbCnt++;
       huffsection[mergeStart].sectionBits += huffsection[mergeEnd].sectionBits;
 
@@ -305,8 +277,10 @@ static void FDKaacEnc_gmStage1(
     }
 
     /* add side info info bits */
-    huffsection[mergeStart].sectionBits += FDKaacEnc_getSideInfoBits(&huffsection[mergeStart], sideInfoTab, useVCB11);
-    huffsection[mergeEnd - 1].sfbStart = huffsection[mergeStart].sfbStart;      /* speed up prev search */
+    huffsection[mergeStart].sectionBits += FDKaacEnc_getSideInfoBits(
+        &huffsection[mergeStart], sideInfoTab, useVCB11);
+    huffsection[mergeEnd - 1].sfbStart =
+        huffsection[mergeStart].sfbStart; /* speed up prev search */
 
     mergeStart = mergeEnd;
 
@@ -317,132 +291,101 @@ static void FDKaacEnc_gmStage1(
    sectioning Stage 2:greedy merge algorithm, merge connected sections with
    maximum bit gain until no more gain is possible
  */
-static void
-FDKaacEnc_gmStage2(
-        SECTION_INFO* const RESTRICT huffsection,
-        INT* const RESTRICT          mergeGainLookUp,
-        INT                          bitLookUp[MAX_SFB_LONG][CODE_BOOK_ESC_NDX + 1],
-        const INT                    maxSfb,
-        const SHORT* const           sideInfoTab,
-        const INT                    useVCB11
-        )
-{
+static inline void FDKaacEnc_gmStage2(
+    SECTION_INFO* const RESTRICT huffsection,
+    INT* const RESTRICT mergeGainLookUp,
+    INT bitLookUp[MAX_SFB_LONG][CODE_BOOK_ESC_NDX + 1], const INT maxSfb,
+    const SHORT* const sideInfoTab, const INT useVCB11) {
   INT i;
 
-  for (i = 0; i + huffsection[i].sfbCnt < maxSfb; i += huffsection[i].sfbCnt)
-  {
-    mergeGainLookUp[i] = FDKaacEnc_CalcMergeGain(huffsection,
-                                       bitLookUp,
-                                       sideInfoTab,
-                                       i,
-                                       i + huffsection[i].sfbCnt,
-                                       useVCB11);
+  for (i = 0; i + huffsection[i].sfbCnt < maxSfb; i += huffsection[i].sfbCnt) {
+    mergeGainLookUp[i] =
+        FDKaacEnc_CalcMergeGain(huffsection, bitLookUp, sideInfoTab, i,
+                                i + huffsection[i].sfbCnt, useVCB11);
   }
 
-  while (TRUE)
-  {
-    INT maxMergeGain, maxNdx = 0, maxNdxNext, maxNdxLast;
+  while (TRUE) {
+    INT maxMergeGain, maxNdx, maxNdxNext, maxNdxLast;
 
-    maxMergeGain = FDKaacEnc_findMaxMerge(mergeGainLookUp, huffsection, maxSfb, &maxNdx);
+    maxMergeGain =
+        FDKaacEnc_findMaxMerge(mergeGainLookUp, huffsection, maxSfb, &maxNdx);
 
     /* exit while loop if no more gain is possible */
-    if (maxMergeGain <= 0)
-      break;
+    if (maxMergeGain <= 0) break;
 
     maxNdxNext = maxNdx + huffsection[maxNdx].sfbCnt;
 
     /* merge sections with maximum bit gain */
     huffsection[maxNdx].sfbCnt += huffsection[maxNdxNext].sfbCnt;
-    huffsection[maxNdx].sectionBits += huffsection[maxNdxNext].sectionBits - maxMergeGain;
+    huffsection[maxNdx].sectionBits +=
+        huffsection[maxNdxNext].sectionBits - maxMergeGain;
 
     /* update bit look up table for merged huffsection  */
     FDKaacEnc_mergeBitLookUp(bitLookUp[maxNdx], bitLookUp[maxNdxNext]);
 
     /* update mergeLookUpTable */
-    if (maxNdx != 0)
-    {
+    if (maxNdx != 0) {
       maxNdxLast = huffsection[maxNdx - 1].sfbStart;
-      mergeGainLookUp[maxNdxLast] = FDKaacEnc_CalcMergeGain(huffsection,
-                                                  bitLookUp,
-                                                  sideInfoTab,
-                                                  maxNdxLast,
-                                                  maxNdx,
-                                                  useVCB11);
-
+      mergeGainLookUp[maxNdxLast] = FDKaacEnc_CalcMergeGain(
+          huffsection, bitLookUp, sideInfoTab, maxNdxLast, maxNdx, useVCB11);
     }
     maxNdxNext = maxNdx + huffsection[maxNdx].sfbCnt;
 
     huffsection[maxNdxNext - 1].sfbStart = huffsection[maxNdx].sfbStart;
 
     if (maxNdxNext < maxSfb)
-      mergeGainLookUp[maxNdx] = FDKaacEnc_CalcMergeGain(huffsection,
-                                              bitLookUp,
-                                              sideInfoTab,
-                                              maxNdx,
-                                              maxNdxNext,
-                                              useVCB11);
-
+      mergeGainLookUp[maxNdx] = FDKaacEnc_CalcMergeGain(
+          huffsection, bitLookUp, sideInfoTab, maxNdx, maxNdxNext, useVCB11);
   }
 }
 
 /* count bits used by the noiseless coder */
 static void FDKaacEnc_noiselessCounter(
-        SECTION_DATA* const RESTRICT sectionData,
-        INT                          mergeGainLookUp[MAX_SFB_LONG],
-        INT                          bitLookUp[MAX_SFB_LONG][CODE_BOOK_ESC_NDX + 1],
-        const SHORT* const           quantSpectrum,
-        const UINT* const            maxValueInSfb,
-        const INT* const             sfbOffset,
-        const INT                    blockType,
-        const INT* const             noiseNrg,
-        const INT* const             isBook,
-        const INT                    useVCB11
-        )
-{
+    SECTION_DATA* const RESTRICT sectionData, INT mergeGainLookUp[MAX_SFB_LONG],
+    INT bitLookUp[MAX_SFB_LONG][CODE_BOOK_ESC_NDX + 1],
+    const SHORT* const quantSpectrum, const UINT* const maxValueInSfb,
+    const INT* const sfbOffset, const INT blockType, const INT* const noiseNrg,
+    const INT* const isBook, const INT useVCB11) {
   INT grpNdx, i;
-  const SHORT *sideInfoTab = NULL;
-  SECTION_INFO *huffsection;
+  const SHORT* sideInfoTab = NULL;
+  SECTION_INFO* huffsection;
 
   /* use appropriate side info table */
-  switch (blockType)
-  {
-  case LONG_WINDOW:
-  case START_WINDOW:
-  case STOP_WINDOW:
-    sideInfoTab = FDKaacEnc_sideInfoTabLong;
-    break;
-  case SHORT_WINDOW:
-    sideInfoTab = FDKaacEnc_sideInfoTabShort;
-    break;
+  switch (blockType) {
+    case LONG_WINDOW:
+    case START_WINDOW:
+    case STOP_WINDOW:
+    default:
+      sideInfoTab = FDKaacEnc_sideInfoTabLong;
+      break;
+    case SHORT_WINDOW:
+      sideInfoTab = FDKaacEnc_sideInfoTabShort;
+      break;
   }
 
   sectionData->noOfSections = 0;
   sectionData->huffmanBits = 0;
   sectionData->sideInfoBits = 0;
 
-
-  if (sectionData->maxSfbPerGroup == 0)
-    return;
+  if (sectionData->maxSfbPerGroup == 0) return;
 
   /* loop trough groups */
-  for (grpNdx = 0; grpNdx < sectionData->sfbCnt; grpNdx += sectionData->sfbPerGroup)
-  {
+  for (grpNdx = 0; grpNdx < sectionData->sfbCnt;
+       grpNdx += sectionData->sfbPerGroup) {
     huffsection = sectionData->huffsection + sectionData->noOfSections;
 
     /* count bits in this group */
-    FDKaacEnc_buildBitLookUp(quantSpectrum,
-                   sectionData->maxSfbPerGroup,
-                   sfbOffset + grpNdx,
-                   maxValueInSfb + grpNdx,
-                   bitLookUp,
-                   huffsection);
+    FDKaacEnc_buildBitLookUp(quantSpectrum, sectionData->maxSfbPerGroup,
+                             sfbOffset + grpNdx, maxValueInSfb + grpNdx,
+                             bitLookUp, huffsection);
 
     /* 0.Stage :Find minimum Codebooks */
-    FDKaacEnc_gmStage0(huffsection, bitLookUp, sectionData->maxSfbPerGroup, noiseNrg+grpNdx, isBook+grpNdx);
+    FDKaacEnc_gmStage0(huffsection, bitLookUp, sectionData->maxSfbPerGroup,
+                       noiseNrg + grpNdx, isBook + grpNdx);
 
     /* 1.Stage :Merge all connected regions with the same code book */
-    FDKaacEnc_gmStage1(huffsection, bitLookUp, sectionData->maxSfbPerGroup, sideInfoTab, useVCB11);
-
+    FDKaacEnc_gmStage1(huffsection, bitLookUp, sectionData->maxSfbPerGroup,
+                       sideInfoTab, useVCB11);
 
     /*
        2.Stage
@@ -450,14 +393,8 @@ static void FDKaacEnc_noiselessCounter(
        gain until no more gain is possible
      */
 
-    FDKaacEnc_gmStage2(huffsection,
-             mergeGainLookUp,
-             bitLookUp,
-             sectionData->maxSfbPerGroup,
-             sideInfoTab,
-             useVCB11);
-
-
+    FDKaacEnc_gmStage2(huffsection, mergeGainLookUp, bitLookUp,
+                       sectionData->maxSfbPerGroup, sideInfoTab, useVCB11);
 
     /*
        compress output, calculate total huff and side bits
@@ -465,31 +402,33 @@ static void FDKaacEnc_noiselessCounter(
        to save time, we must set it here for later use in bitenc
      */
 
-    for (i = 0; i < sectionData->maxSfbPerGroup; i += huffsection[i].sfbCnt)
-    {
-      if ((huffsection[i].codeBook==CODE_BOOK_PNS_NO) ||
-          (huffsection[i].codeBook==CODE_BOOK_IS_OUT_OF_PHASE_NO) ||
-          (huffsection[i].codeBook==CODE_BOOK_IS_IN_PHASE_NO))
-      {
-        huffsection[i].sectionBits=0;
+    for (i = 0; i < sectionData->maxSfbPerGroup; i += huffsection[i].sfbCnt) {
+      if ((huffsection[i].codeBook == CODE_BOOK_PNS_NO) ||
+          (huffsection[i].codeBook == CODE_BOOK_IS_OUT_OF_PHASE_NO) ||
+          (huffsection[i].codeBook == CODE_BOOK_IS_IN_PHASE_NO)) {
+        huffsection[i].sectionBits = 0;
       } else {
-        /* the sections in the sectionData are now marked with the optimal code book */
+        /* the sections in the sectionData are now marked with the optimal code
+         * book */
 
-          FDKaacEnc_findBestBook(bitLookUp[i], &(huffsection[i].codeBook), useVCB11);
+        FDKaacEnc_findBestBook(bitLookUp[i], &(huffsection[i].codeBook),
+                               useVCB11);
 
-        sectionData->huffmanBits += huffsection[i].sectionBits - FDKaacEnc_getSideInfoBits(&huffsection[i], sideInfoTab, useVCB11);
+        sectionData->huffmanBits +=
+            huffsection[i].sectionBits -
+            FDKaacEnc_getSideInfoBits(&huffsection[i], sideInfoTab, useVCB11);
       }
 
       huffsection[i].sfbStart += grpNdx;
 
       /* sum up side info bits (section data bits) */
-      sectionData->sideInfoBits += FDKaacEnc_getSideInfoBits(&huffsection[i], sideInfoTab, useVCB11);
+      sectionData->sideInfoBits +=
+          FDKaacEnc_getSideInfoBits(&huffsection[i], sideInfoTab, useVCB11);
       sectionData->huffsection[sectionData->noOfSections++] = huffsection[i];
     }
   }
 }
 
-
 /*******************************************************************************
 
      functionname: FDKaacEnc_scfCount
@@ -525,80 +464,68 @@ static void FDKaacEnc_noiselessCounter(
                   scalfacGain (75) and the future scalefacGain (5) is 70.
 
 ********************************************************************************/
-static void FDKaacEnc_scfCount(
-        const INT* const             scalefacGain,
-        const UINT* const            maxValueInSfb,
-        SECTION_DATA* const RESTRICT sectionData,
-        const INT* const             isScale
-        )
-{
+static void FDKaacEnc_scfCount(const INT* const scalefacGain,
+                               const UINT* const maxValueInSfb,
+                               SECTION_DATA* const RESTRICT sectionData,
+                               const INT* const isScale) {
   INT i, j, k, m, n;
 
-  INT lastValScf     = 0;
-  INT deltaScf       = 0;
-  INT found          = 0;
+  INT lastValScf = 0;
+  INT deltaScf = 0;
+  INT found = 0;
   INT scfSkipCounter = 0;
-  INT lastValIs      = 0;
+  INT lastValIs = 0;
 
   sectionData->scalefacBits = 0;
 
-  if (scalefacGain == NULL)
-    return;
+  if (scalefacGain == NULL) return;
 
   sectionData->firstScf = 0;
 
-  for (i=0; i<sectionData->noOfSections; i++)
-  {
-    if (sectionData->huffsection[i].codeBook != CODE_BOOK_ZERO_NO)
-    {
+  for (i = 0; i < sectionData->noOfSections; i++) {
+    if (sectionData->huffsection[i].codeBook != CODE_BOOK_ZERO_NO) {
       sectionData->firstScf = sectionData->huffsection[i].sfbStart;
       lastValScf = scalefacGain[sectionData->firstScf];
       break;
     }
   }
 
-  for (i=0; i<sectionData->noOfSections; i++)
-  {
-    if ((sectionData->huffsection[i].codeBook == CODE_BOOK_IS_OUT_OF_PHASE_NO) ||
-        (sectionData->huffsection[i].codeBook == CODE_BOOK_IS_IN_PHASE_NO))
-    {
+  for (i = 0; i < sectionData->noOfSections; i++) {
+    if ((sectionData->huffsection[i].codeBook ==
+         CODE_BOOK_IS_OUT_OF_PHASE_NO) ||
+        (sectionData->huffsection[i].codeBook == CODE_BOOK_IS_IN_PHASE_NO)) {
       for (j = sectionData->huffsection[i].sfbStart;
-           j < sectionData->huffsection[i].sfbStart + sectionData->huffsection[i].sfbCnt;
-           j++)
-      {
-        INT deltaIs = isScale[j]-lastValIs;
-        lastValIs   = isScale[j];
-        sectionData->scalefacBits+=FDKaacEnc_bitCountScalefactorDelta(deltaIs);
+           j < sectionData->huffsection[i].sfbStart +
+                   sectionData->huffsection[i].sfbCnt;
+           j++) {
+        INT deltaIs = isScale[j] - lastValIs;
+        lastValIs = isScale[j];
+        sectionData->scalefacBits +=
+            FDKaacEnc_bitCountScalefactorDelta(deltaIs);
       }
     } /* Intensity */
     else if ((sectionData->huffsection[i].codeBook != CODE_BOOK_ZERO_NO) &&
-             (sectionData->huffsection[i].codeBook != CODE_BOOK_PNS_NO))
-    {
-      INT tmp = sectionData->huffsection[i].sfbStart + sectionData->huffsection[i].sfbCnt;
-      for (j = sectionData->huffsection[i].sfbStart; j<tmp; j++)
-      {
+             (sectionData->huffsection[i].codeBook != CODE_BOOK_PNS_NO)) {
+      INT tmp = sectionData->huffsection[i].sfbStart +
+                sectionData->huffsection[i].sfbCnt;
+      for (j = sectionData->huffsection[i].sfbStart; j < tmp; j++) {
         /* check if we can repeat the last value to save bits */
-        if (maxValueInSfb[j] == 0)
-        {
+        if (maxValueInSfb[j] == 0) {
           found = 0;
           /* are scalefactors skipped? */
-          if (scfSkipCounter == 0)
-          {
+          if (scfSkipCounter == 0) {
             /* end of section */
-            if (j == (tmp - 1) )
-              found = 0;  /* search in other sections for maxValueInSfb != 0 */
-            else
-            {
+            if (j == (tmp - 1))
+              found = 0; /* search in other sections for maxValueInSfb != 0 */
+            else {
               /* search in this section for the next maxValueInSfb[] != 0 */
-              for (k = (j+1); k < tmp; k++)
-              {
-                if (maxValueInSfb[k] != 0)
-                {
+              for (k = (j + 1); k < tmp; k++) {
+                if (maxValueInSfb[k] != 0) {
                   found = 1;
-                  if ( (fixp_abs(scalefacGain[k] - lastValScf)) <= CODE_BOOK_SCF_LAV)
-                     deltaScf = 0; /* save bits */
-                  else
-                  {
+                  if ((fixp_abs(scalefacGain[k] - lastValScf)) <=
+                      CODE_BOOK_SCF_LAV)
+                    deltaScf = 0; /* save bits */
+                  else {
                     /* do not save bits */
                     deltaScf = lastValScf - scalefacGain[j];
                     lastValScf = scalefacGain[j];
@@ -612,20 +539,19 @@ static void FDKaacEnc_scfCount(
             }
 
             /* search for the next maxValueInSfb[] != 0 in all other sections */
-            for (m=(i+1); (m < sectionData->noOfSections) && (found == 0); m++)
-            {
-              if ((sectionData->huffsection[m].codeBook != CODE_BOOK_ZERO_NO) && (sectionData->huffsection[m].codeBook != CODE_BOOK_PNS_NO))
-              {
-                INT end = sectionData->huffsection[m].sfbStart + sectionData->huffsection[m].sfbCnt;
-                for (n = sectionData->huffsection[m].sfbStart; n<end; n++)
-                {
-                  if (maxValueInSfb[n] != 0)
-                  {
+            for (m = (i + 1); (m < sectionData->noOfSections) && (found == 0);
+                 m++) {
+              if ((sectionData->huffsection[m].codeBook != CODE_BOOK_ZERO_NO) &&
+                  (sectionData->huffsection[m].codeBook != CODE_BOOK_PNS_NO)) {
+                INT end = sectionData->huffsection[m].sfbStart +
+                          sectionData->huffsection[m].sfbCnt;
+                for (n = sectionData->huffsection[m].sfbStart; n < end; n++) {
+                  if (maxValueInSfb[n] != 0) {
                     found = 1;
-                    if (fixp_abs(scalefacGain[n] - lastValScf) <= CODE_BOOK_SCF_LAV)
-                      deltaScf = 0;  /* save bits */
-                    else
-                    {
+                    if (fixp_abs(scalefacGain[n] - lastValScf) <=
+                        CODE_BOOK_SCF_LAV)
+                      deltaScf = 0; /* save bits */
+                    else {
                       /* do not save bits */
                       deltaScf = lastValScf - scalefacGain[j];
                       lastValScf = scalefacGain[j];
@@ -639,64 +565,29 @@ static void FDKaacEnc_scfCount(
               }
             }
             /* no maxValueInSfb[] != 0 found */
-            if (found == 0)
-            {
+            if (found == 0) {
               deltaScf = 0;
               scfSkipCounter = 0;
             }
-          }
-          else {
+          } else {
             /* consider skipped scalefactors */
             deltaScf = 0;
             scfSkipCounter--;
           }
-        }
-        else {
+        } else {
           deltaScf = lastValScf - scalefacGain[j];
           lastValScf = scalefacGain[j];
         }
-        sectionData->scalefacBits += FDKaacEnc_bitCountScalefactorDelta(deltaScf);
+        sectionData->scalefacBits +=
+            FDKaacEnc_bitCountScalefactorDelta(deltaScf);
       }
     }
   } /* for (i=0; i<sectionData->noOfSections; i++) */
 }
 
-#ifdef PNS_PRECOUNT_ENABLE
-/*
-  preCount bits used pns
-*/
-/* estimate bits used by pns for correction of static bits */
-/* no codebook switch estimation, see AAC LD FASTENC */
-INT noisePreCount(const INT *noiseNrg, INT maxSfb)
-{
-  INT   noisePCMFlag = TRUE;
-  INT   lastValPns = 0, deltaPns;
-  int   i, bits=0;
-
- for (i = 0; i < maxSfb; i++) {
-   if (noiseNrg[i] != NO_NOISE_PNS) {
-
-     if (noisePCMFlag) {
-       bits+=PNS_PCM_BITS;
-       lastValPns   = noiseNrg[i];
-       noisePCMFlag = FALSE;
-     }else {
-       deltaPns     = noiseNrg[i]-lastValPns;
-       lastValPns   = noiseNrg[i];
-       bits+=FDKaacEnc_bitCountScalefactorDelta(deltaPns);
-     }
-   }
- }
- return ( bits );
-}
-#endif /* PNS_PRECOUNT_ENABLE */
-
 /* count bits used by pns */
-static void FDKaacEnc_noiseCount(
-        SECTION_DATA* const RESTRICT sectionData,
-        const INT* const             noiseNrg
-        )
-{
+static void FDKaacEnc_noiseCount(SECTION_DATA* const RESTRICT sectionData,
+                                 const INT* const noiseNrg) {
   INT noisePCMFlag = TRUE;
   INT lastValPns = 0, deltaPns;
   int i, j;
@@ -707,99 +598,66 @@ static void FDKaacEnc_noiseCount(
     if (sectionData->huffsection[i].codeBook == CODE_BOOK_PNS_NO) {
       int sfbStart = sectionData->huffsection[i].sfbStart;
       int sfbEnd = sfbStart + sectionData->huffsection[i].sfbCnt;
-      for (j=sfbStart; j<sfbEnd; j++) {
-
+      for (j = sfbStart; j < sfbEnd; j++) {
         if (noisePCMFlag) {
-          sectionData->noiseNrgBits+=PNS_PCM_BITS;
-          lastValPns   = noiseNrg[j];
+          sectionData->noiseNrgBits += PNS_PCM_BITS;
+          lastValPns = noiseNrg[j];
           noisePCMFlag = FALSE;
         } else {
-          deltaPns     = noiseNrg[j]-lastValPns;
-          lastValPns   = noiseNrg[j];
-          sectionData->noiseNrgBits+=FDKaacEnc_bitCountScalefactorDelta(deltaPns);
+          deltaPns = noiseNrg[j] - lastValPns;
+          lastValPns = noiseNrg[j];
+          sectionData->noiseNrgBits +=
+              FDKaacEnc_bitCountScalefactorDelta(deltaPns);
         }
       }
     }
   }
 }
 
-INT FDKaacEnc_dynBitCount(
-        BITCNTR_STATE* const         hBC,
-        const SHORT* const           quantSpectrum,
-        const UINT* const            maxValueInSfb,
-        const INT* const             scalefac,
-        const INT                    blockType,
-        const INT                    sfbCnt,
-        const INT                    maxSfbPerGroup,
-        const INT                    sfbPerGroup,
-        const INT* const             sfbOffset,
-        SECTION_DATA* const RESTRICT sectionData,
-        const INT* const             noiseNrg,
-        const INT* const             isBook,
-        const INT* const             isScale,
-        const UINT                   syntaxFlags
-        )
-{
-  sectionData->blockType      = blockType;
-  sectionData->sfbCnt         = sfbCnt;
-  sectionData->sfbPerGroup    = sfbPerGroup;
-  sectionData->noOfGroups     = sfbCnt / sfbPerGroup;
+INT FDKaacEnc_dynBitCount(BITCNTR_STATE* const hBC,
+                          const SHORT* const quantSpectrum,
+                          const UINT* const maxValueInSfb,
+                          const INT* const scalefac, const INT blockType,
+                          const INT sfbCnt, const INT maxSfbPerGroup,
+                          const INT sfbPerGroup, const INT* const sfbOffset,
+                          SECTION_DATA* const RESTRICT sectionData,
+                          const INT* const noiseNrg, const INT* const isBook,
+                          const INT* const isScale, const UINT syntaxFlags) {
+  sectionData->blockType = blockType;
+  sectionData->sfbCnt = sfbCnt;
+  sectionData->sfbPerGroup = sfbPerGroup;
+  sectionData->noOfGroups = sfbCnt / sfbPerGroup;
   sectionData->maxSfbPerGroup = maxSfbPerGroup;
 
-  FDKaacEnc_noiselessCounter(
-                   sectionData,
-                   hBC->mergeGainLookUp,
-                   (lookUpTable)hBC->bitLookUp,
-                   quantSpectrum,
-                   maxValueInSfb,
-                   sfbOffset,
-                   blockType,
-                   noiseNrg,
-                   isBook,
-                   (syntaxFlags & AC_ER_VCB11)?1:0);
-
-  FDKaacEnc_scfCount(
-           scalefac,
-           maxValueInSfb,
-           sectionData,
-           isScale);
-
-  FDKaacEnc_noiseCount(sectionData,
-             noiseNrg);
-
-  return (sectionData->huffmanBits +
-          sectionData->sideInfoBits +
-          sectionData->scalefacBits +
-          sectionData->noiseNrgBits);
+  FDKaacEnc_noiselessCounter(sectionData, hBC->mergeGainLookUp,
+                             (lookUpTable)hBC->bitLookUp, quantSpectrum,
+                             maxValueInSfb, sfbOffset, blockType, noiseNrg,
+                             isBook, (syntaxFlags & AC_ER_VCB11) ? 1 : 0);
+
+  FDKaacEnc_scfCount(scalefac, maxValueInSfb, sectionData, isScale);
+
+  FDKaacEnc_noiseCount(sectionData, noiseNrg);
+
+  return (sectionData->huffmanBits + sectionData->sideInfoBits +
+          sectionData->scalefacBits + sectionData->noiseNrgBits);
 }
 
-INT FDKaacEnc_BCNew(BITCNTR_STATE **phBC
-         ,UCHAR* dynamic_RAM
-         )
-{
-  BITCNTR_STATE *hBC =  GetRam_aacEnc_BitCntrState();
+INT FDKaacEnc_BCNew(BITCNTR_STATE** phBC, UCHAR* dynamic_RAM) {
+  BITCNTR_STATE* hBC = GetRam_aacEnc_BitCntrState();
 
-  if (hBC)
-  {
+  if (hBC) {
     *phBC = hBC;
-    hBC->bitLookUp       = GetRam_aacEnc_BitLookUp(0,dynamic_RAM);
-    hBC->mergeGainLookUp = GetRam_aacEnc_MergeGainLookUp(0,dynamic_RAM);
-    if (hBC->bitLookUp       == 0 ||
-        hBC->mergeGainLookUp == 0)
-    {
+    hBC->bitLookUp = GetRam_aacEnc_BitLookUp(0, dynamic_RAM);
+    hBC->mergeGainLookUp = GetRam_aacEnc_MergeGainLookUp(0, dynamic_RAM);
+    if (hBC->bitLookUp == 0 || hBC->mergeGainLookUp == 0) {
       return 1;
     }
   }
   return (hBC == 0) ? 1 : 0;
 }
 
-void FDKaacEnc_BCClose(BITCNTR_STATE **phBC)
-{
-  if (*phBC!=NULL) {
-
+void FDKaacEnc_BCClose(BITCNTR_STATE** phBC) {
+  if (*phBC != NULL) {
     FreeRam_aacEnc_BitCntrState(phBC);
   }
 }
-
-
-