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, 451 insertions, 481 deletions

diff --git a/libAACenc/src/psy_configuration.cpp b/libAACenc/src/psy_configuration.cpp
index 9a72c68..eef90bc 100644
--- a/libAACenc/src/psy_configuration.cpp
+++ b/libAACenc/src/psy_configuration.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,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: Psychoaccoustic configuration
+   Description: Psychoaccoustic configuration
 
-******************************************************************************/
+*******************************************************************************/
 
 #include "psy_configuration.h"
 #include "adj_thr.h"
@@ -96,15 +108,14 @@ amm-info@iis.fraunhofer.de
 
 #include "FDK_trigFcts.h"
 
-typedef struct{
-    LONG  sampleRate;
-    const SFB_PARAM_LONG  *paramLong;
-    const SFB_PARAM_SHORT *paramShort;
-}SFB_INFO_TAB;
-
+typedef struct {
+  LONG sampleRate;
+  const SFB_PARAM_LONG *paramLong;
+  const SFB_PARAM_SHORT *paramShort;
+} SFB_INFO_TAB;
 
 static const SFB_INFO_TAB sfbInfoTab[] = {
-    {8000,  &p_FDKaacEnc_8000_long_1024,  &p_FDKaacEnc_8000_short_128},
+    {8000, &p_FDKaacEnc_8000_long_1024, &p_FDKaacEnc_8000_short_128},
     {11025, &p_FDKaacEnc_11025_long_1024, &p_FDKaacEnc_11025_short_128},
     {12000, &p_FDKaacEnc_12000_long_1024, &p_FDKaacEnc_12000_short_128},
     {16000, &p_FDKaacEnc_16000_long_1024, &p_FDKaacEnc_16000_short_128},
@@ -121,108 +132,81 @@ static const SFB_INFO_TAB sfbInfoTab[] = {
 
 /* 22050 and 24000 Hz */
 static const SFB_PARAM_LONG p_22050_long_512 = {
-    31,
-    {  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-       4,  8,  8,  8, 12, 12, 12, 16, 20, 24,
-      28, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32}
-};
+    31, {4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  8,  8,  8,  12, 12,
+         12, 16, 20, 24, 28, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32}};
 
 /* 32000 Hz */
 static const SFB_PARAM_LONG p_32000_long_512 = {
     37,
-    {  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-       4,  4,  4,  4,  8,  8,  8,  8,  8, 12,
-      12, 12, 12, 16, 16, 16, 20, 24, 24, 28,
-      32, 32, 32, 32, 32, 32, 32}
-};
+    {4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  8,  8,  8,  8, 8,
+     12, 12, 12, 12, 16, 16, 16, 20, 24, 24, 28, 32, 32, 32, 32, 32, 32, 32}};
 
 /* 44100 Hz */
 static const SFB_PARAM_LONG p_44100_long_512 = {
-    36,
-    {4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-     4,  4,  4,  4,  4,  8,  8,  8,  8,  8,
-    12, 12, 12, 12, 16, 20, 24, 28, 32, 32,
-    32, 32, 32, 32, 32, 52}
-};
+    36, {4, 4, 4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  8,  8,  8,
+         8, 8, 12, 12, 12, 12, 16, 20, 24, 28, 32, 32, 32, 32, 32, 32, 32, 52}};
 
 static const SFB_INFO_TAB sfbInfoTabLD512[] = {
-    { 8000, &p_22050_long_512, NULL},
-    {11025, &p_22050_long_512, NULL},
-    {12000, &p_22050_long_512, NULL},
-    {16000, &p_22050_long_512, NULL},
-    {22050, &p_22050_long_512, NULL},
-    {24000, &p_22050_long_512, NULL},
-    {32000, &p_32000_long_512, NULL},
-    {44100, &p_44100_long_512, NULL},
-    {48000, &p_44100_long_512, NULL},
-    {64000, &p_44100_long_512, NULL},
-    {88200, &p_44100_long_512, NULL},
-    {96000, &p_44100_long_512, NULL},
-
+    {8000, &p_22050_long_512, NULL},   {11025, &p_22050_long_512, NULL},
+    {12000, &p_22050_long_512, NULL},  {16000, &p_22050_long_512, NULL},
+    {22050, &p_22050_long_512, NULL},  {24000, &p_22050_long_512, NULL},
+    {32000, &p_32000_long_512, NULL},  {44100, &p_44100_long_512, NULL},
+    {48000, &p_44100_long_512, NULL},  {64000, &p_44100_long_512, NULL},
+    {88200, &p_44100_long_512, NULL},  {96000, &p_44100_long_512, NULL},
+    {128000, &p_44100_long_512, NULL}, {176400, &p_44100_long_512, NULL},
+    {192000, &p_44100_long_512, NULL}, {256000, &p_44100_long_512, NULL},
+    {352800, &p_44100_long_512, NULL}, {384000, &p_44100_long_512, NULL},
 };
 
-
 /* 22050 and 24000 Hz */
 static const SFB_PARAM_LONG p_22050_long_480 = {
-    30,
-    { 4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-      4,  8,  8,  8, 12, 12, 12, 16, 20, 24,
-     28, 32, 32, 32, 32, 32, 32, 32, 32, 32}
-};
+    30, {4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  8,  8,  8,  12,
+         12, 12, 16, 20, 24, 28, 32, 32, 32, 32, 32, 32, 32, 32, 32}};
 
 /* 32000 Hz */
 static const SFB_PARAM_LONG p_32000_long_480 = {
-    37,
-    { 4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  8,  8,  8,  8,
-      8,  8, 12, 12, 12, 16, 16, 20, 24, 32,
-     32, 32, 32, 32, 32, 32, 32}
-};
+    37, {4, 4, 4, 4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  8,  8, 8,
+         8, 8, 8, 12, 12, 12, 16, 16, 20, 24, 32, 32, 32, 32, 32, 32, 32, 32}};
 
 /* 44100 Hz */
 static const SFB_PARAM_LONG p_44100_long_480 = {
-    35,
-    { 4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  8,  8,  8,  8,  8, 12,
-     12, 12, 12, 12, 16, 16, 24, 28, 32, 32,
-     32, 32, 32, 32, 48}
-};
+    35, {4, 4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  8,  8,  8, 8,
+         8, 12, 12, 12, 12, 12, 16, 16, 24, 28, 32, 32, 32, 32, 32, 32, 48}};
 
 static const SFB_INFO_TAB sfbInfoTabLD480[] = {
-    { 8000, &p_22050_long_480, NULL},
-    {11025, &p_22050_long_480, NULL},
-    {12000, &p_22050_long_480, NULL},
-    {16000, &p_22050_long_480, NULL},
-    {22050, &p_22050_long_480, NULL},
-    {24000, &p_22050_long_480, NULL},
-    {32000, &p_32000_long_480, NULL},
-    {44100, &p_44100_long_480, NULL},
-    {48000, &p_44100_long_480, NULL},
-    {64000, &p_44100_long_480, NULL},
-    {88200, &p_44100_long_480, NULL},
-    {96000, &p_44100_long_480, NULL},
-
+    {8000, &p_22050_long_480, NULL},   {11025, &p_22050_long_480, NULL},
+    {12000, &p_22050_long_480, NULL},  {16000, &p_22050_long_480, NULL},
+    {22050, &p_22050_long_480, NULL},  {24000, &p_22050_long_480, NULL},
+    {32000, &p_32000_long_480, NULL},  {44100, &p_44100_long_480, NULL},
+    {48000, &p_44100_long_480, NULL},  {64000, &p_44100_long_480, NULL},
+    {88200, &p_44100_long_480, NULL},  {96000, &p_44100_long_480, NULL},
+    {128000, &p_44100_long_480, NULL}, {176400, &p_44100_long_480, NULL},
+    {192000, &p_44100_long_480, NULL}, {256000, &p_44100_long_480, NULL},
+    {352800, &p_44100_long_480, NULL}, {384000, &p_44100_long_480, NULL},
 };
 
 /* Fixed point precision definitions */
-#define Q_BARCVAL        (25)
-
-static AAC_ENCODER_ERROR FDKaacEnc_initSfbTable(LONG sampleRate, INT blockType, INT granuleLength, INT *sfbOffset, INT *sfbCnt)
-{
-  INT  i, specStartOffset = 0;
-  const UCHAR* sfbWidth = NULL;
+#define Q_BARCVAL (25)
+
+AAC_ENCODER_ERROR FDKaacEnc_initSfbTable(const LONG sampleRate,
+                                         const INT blockType,
+                                         const INT granuleLength,
+                                         INT *const sfbOffset,
+                                         INT *const sfbCnt) {
+  INT i, specStartOffset = 0;
+  INT granuleLengthWindow = granuleLength;
+  const UCHAR *sfbWidth = NULL;
   const SFB_INFO_TAB *sfbInfo = NULL;
   int size;
 
   /*
     select table
   */
-  switch(granuleLength) {
+  switch (granuleLength) {
     case 1024:
-    case  960:
+    case 960:
       sfbInfo = sfbInfoTab;
-      size = (INT)(sizeof(sfbInfoTab)/sizeof(SFB_INFO_TAB));
+      size = (INT)(sizeof(sfbInfoTab) / sizeof(SFB_INFO_TAB));
       break;
     case 512:
       sfbInfo = sfbInfoTabLD512;
@@ -236,20 +220,20 @@ static AAC_ENCODER_ERROR FDKaacEnc_initSfbTable(LONG sampleRate, INT blockType,
       return AAC_ENC_INVALID_FRAME_LENGTH;
   }
 
-  for(i = 0; i < size; i++){
-    if(sfbInfo[i].sampleRate == sampleRate){
-      switch(blockType){
-      case LONG_WINDOW:
-      case START_WINDOW:
-      case STOP_WINDOW:
-        sfbWidth = sfbInfo[i].paramLong->sfbWidth;
-        *sfbCnt  = sfbInfo[i].paramLong->sfbCnt;
-        break;
-      case SHORT_WINDOW:
-        sfbWidth = sfbInfo[i].paramShort->sfbWidth;
-        *sfbCnt  = sfbInfo[i].paramShort->sfbCnt;
-        granuleLength /= TRANS_FAC;
-        break;
+  for (i = 0; i < size; i++) {
+    if (sfbInfo[i].sampleRate == sampleRate) {
+      switch (blockType) {
+        case LONG_WINDOW:
+        case START_WINDOW:
+        case STOP_WINDOW:
+          sfbWidth = sfbInfo[i].paramLong->sfbWidth;
+          *sfbCnt = sfbInfo[i].paramLong->sfbCnt;
+          break;
+        case SHORT_WINDOW:
+          sfbWidth = sfbInfo[i].paramShort->sfbWidth;
+          *sfbCnt = sfbInfo[i].paramShort->sfbCnt;
+          granuleLengthWindow /= TRANS_FAC;
+          break;
       }
       break;
     }
@@ -261,21 +245,19 @@ static AAC_ENCODER_ERROR FDKaacEnc_initSfbTable(LONG sampleRate, INT blockType,
   /*
     calc sfb offsets
   */
-  for(i = 0; i < *sfbCnt; i++){
-      sfbOffset[i] = specStartOffset;
-      specStartOffset += sfbWidth[i];
-      if (specStartOffset >= granuleLength) {
-          i++;
-          break;
-      }
+  for (i = 0; i < *sfbCnt; i++) {
+    sfbOffset[i] = specStartOffset;
+    specStartOffset += sfbWidth[i];
+    if (specStartOffset >= granuleLengthWindow) {
+      i++;
+      break;
+    }
   }
-  *sfbCnt = fixMin(i,*sfbCnt);
-  sfbOffset[*sfbCnt] = fixMin(specStartOffset,granuleLength);
-
+  *sfbCnt = fixMin(i, *sfbCnt);
+  sfbOffset[*sfbCnt] = fixMin(specStartOffset, granuleLengthWindow);
   return AAC_ENC_OK;
 }
 
-
 /*****************************************************************************
 
     functionname: FDKaacEnc_BarcLineValue
@@ -285,51 +267,53 @@ static AAC_ENCODER_ERROR FDKaacEnc_initSfbTable(LONG sampleRate, INT blockType,
     output:
 
 *****************************************************************************/
-static FIXP_DBL FDKaacEnc_BarcLineValue(INT noOfLines, INT fftLine, LONG samplingFreq)
-{
-
-    FIXP_DBL FOURBY3EM4     = (FIXP_DBL)0x45e7b273; /* 4.0/3 * 0.0001 in q43 */
-    FIXP_DBL PZZZ76         = (FIXP_DBL)0x639d5e4a; /* 0.00076 in q41 */
-    FIXP_DBL ONE3P3         = (FIXP_DBL)0x35333333; /* 13.3 in q26 */
-    FIXP_DBL THREEP5        = (FIXP_DBL)0x1c000000; /* 3.5 in q27 */
-    FIXP_DBL INV480         = (FIXP_DBL)0x44444444; // 1/480 in q39
-
-    FIXP_DBL center_freq, x1, x2;
-    FIXP_DBL bvalFFTLine, atan1, atan2;
-
-    /* Theoritical maximum of center_freq (samp_freq*0.5) is 96khz * 0.5 = 48000        */
-    /* Theoritical maximum of x1 is 1.3333333e-4f * center_freq = 6.4, can keep in q28  */
-    /* Theoritical maximum of x2 is 0.00076f * center_freq = 36.48, can keep in q25     */
-
-    center_freq = fftLine * samplingFreq;       /* q11 or q8 */
-
-    switch (noOfLines) {
-      case 1024:
-        center_freq = center_freq << 2; /* q13 */
-        break;
-      case 128:
-        center_freq = center_freq << 5; /* q13 */
-        break;
-      case 512:
-        center_freq = (fftLine * samplingFreq) << 3;   // q13
-        break;
-      case 480:
-        center_freq = fMult(center_freq, INV480) << 4; // q13
-        break;
-      default:
-        center_freq = (FIXP_DBL)0;
-    }
-
-    x1 = fMult(center_freq, FOURBY3EM4);        /* q13 * q43 - (DFRACT_BITS-1) = q25 */
-    x2 = fMult(center_freq, PZZZ76) << 2;       /* q13 * q41 - (DFRACT_BITS-1) + 2 = q25 */
+static FIXP_DBL FDKaacEnc_BarcLineValue(INT noOfLines, INT fftLine,
+                                        LONG samplingFreq) {
+  FIXP_DBL FOURBY3EM4 = (FIXP_DBL)0x45e7b273; /* 4.0/3 * 0.0001 in q43 */
+  FIXP_DBL PZZZ76 = (FIXP_DBL)0x639d5e4a;     /* 0.00076 in q41 */
+  FIXP_DBL ONE3P3 = (FIXP_DBL)0x35333333;     /* 13.3 in q26 */
+  FIXP_DBL THREEP5 = (FIXP_DBL)0x1c000000;    /* 3.5 in q27 */
+  FIXP_DBL INV480 = (FIXP_DBL)0x44444444;     // 1/480 in q39
+
+  FIXP_DBL center_freq, x1, x2;
+  FIXP_DBL bvalFFTLine, atan1, atan2;
+
+  /* Theoritical maximum of center_freq (samp_freq*0.5) is 96khz * 0.5 = 48000
+   */
+  /* Theoritical maximum of x1 is 1.3333333e-4f * center_freq = 6.4, can keep in
+   * q28  */
+  /* Theoritical maximum of x2 is 0.00076f * center_freq = 36.48, can keep in
+   * q25     */
+
+  center_freq = fftLine * samplingFreq; /* q11 or q8 */
+
+  switch (noOfLines) {
+    case 1024:
+      center_freq = center_freq << 2; /* q13 */
+      break;
+    case 128:
+      center_freq = center_freq << 5; /* q13 */
+      break;
+    case 512:
+      center_freq = (fftLine * samplingFreq) << 3;  // q13
+      break;
+    case 480:
+      center_freq = fMult(center_freq, INV480) << 4;  // q13
+      break;
+    default:
+      center_freq = (FIXP_DBL)0;
+  }
 
-    atan1 = fixp_atan(x1);
-    atan2 = fixp_atan(x2);
+  x1 = fMult(center_freq, FOURBY3EM4); /* q13 * q43 - (DFRACT_BITS-1) = q25 */
+  x2 = fMult(center_freq, PZZZ76)
+       << 2; /* q13 * q41 - (DFRACT_BITS-1) + 2 = q25 */
 
-    /* q25 (q26 * q30 - (DFRACT_BITS-1)) + q25 (q27 * q30 * q30) */
-    bvalFFTLine = fMult(ONE3P3, atan2) + fMult(THREEP5, fMult(atan1, atan1));
-    return(bvalFFTLine);
+  atan1 = fixp_atan(x1);
+  atan2 = fixp_atan(x2);
 
+  /* q25 (q26 * q30 - (DFRACT_BITS-1)) + q25 (q27 * q30 * q30) */
+  bvalFFTLine = fMult(ONE3P3, atan2) + fMult(THREEP5, fMult(atan1, atan1));
+  return (bvalFFTLine);
 }
 
 /*
@@ -338,320 +322,306 @@ static FIXP_DBL FDKaacEnc_BarcLineValue(INT noOfLines, INT fftLine, LONG samplin
    might need to be configurable to e.g. 24 bit PCM Input or a lower
    resolution for low bit rates
 */
-static void FDKaacEnc_InitMinPCMResolution(int   numPb,
-                                 int   *pbOffset,
-                                 FIXP_DBL *sfbPCMquantThreshold)
-{
-  /* PCM_QUANT_NOISE = FDKpow(10.0f, - 20.f / 10.0f) * ABS_LOW * NORM_PCM_ENERGY * FDKpow(2,PCM_QUANT_THR_SCALE) */
-  #define PCM_QUANT_NOISE  ((FIXP_DBL)0x00547062)
-
-  for( int i = 0; i < numPb; i++ ) {
-    sfbPCMquantThreshold[i] = (pbOffset[i+1] - pbOffset[i]) * PCM_QUANT_NOISE;
+static void FDKaacEnc_InitMinPCMResolution(int numPb, int *pbOffset,
+                                           FIXP_DBL *sfbPCMquantThreshold) {
+/* PCM_QUANT_NOISE = FDKpow(10.0f, - 20.f / 10.0f) * ABS_LOW * NORM_PCM_ENERGY *
+ * FDKpow(2,PCM_QUANT_THR_SCALE) */
+#define PCM_QUANT_NOISE ((FIXP_DBL)0x00547062)
+
+  for (int i = 0; i < numPb; i++) {
+    sfbPCMquantThreshold[i] = (pbOffset[i + 1] - pbOffset[i]) * PCM_QUANT_NOISE;
   }
 }
 
-static FIXP_DBL getMaskFactor(
-        const FIXP_DBL dbVal_fix,
-        const INT      dbVal_e,
-        const FIXP_DBL ten_fix,
-        const INT      ten_e
-        )
-{
-    INT q_msk;
-    FIXP_DBL mask_factor;
+static FIXP_DBL getMaskFactor(const FIXP_DBL dbVal_fix, const INT dbVal_e,
+                              const FIXP_DBL ten_fix, const INT ten_e) {
+  INT q_msk;
+  FIXP_DBL mask_factor;
 
-    mask_factor = fPow(ten_fix, DFRACT_BITS-1-ten_e, -dbVal_fix, DFRACT_BITS-1-dbVal_e, &q_msk);
-    q_msk = fixMin(DFRACT_BITS-1,fixMax(-(DFRACT_BITS-1),q_msk));
+  mask_factor = fPow(ten_fix, DFRACT_BITS - 1 - ten_e, -dbVal_fix,
+                     DFRACT_BITS - 1 - dbVal_e, &q_msk);
+  q_msk = fixMin(DFRACT_BITS - 1, fixMax(-(DFRACT_BITS - 1), q_msk));
 
-    if ( (q_msk>0) && (mask_factor>(FIXP_DBL)MAXVAL_DBL>>q_msk) ) {
-      mask_factor = (FIXP_DBL)MAXVAL_DBL;
-    }
-    else {
-      mask_factor = scaleValue(mask_factor, q_msk);
-    }
+  if ((q_msk > 0) && (mask_factor > (FIXP_DBL)MAXVAL_DBL >> q_msk)) {
+    mask_factor = (FIXP_DBL)MAXVAL_DBL;
+  } else {
+    mask_factor = scaleValue(mask_factor, q_msk);
+  }
 
-    return (mask_factor);
+  return (mask_factor);
 }
 
-static void FDKaacEnc_initSpreading(INT numPb,
-                          FIXP_DBL *pbBarcValue,
-                          FIXP_DBL *pbMaskLoFactor,
-                          FIXP_DBL *pbMaskHiFactor,
-                          FIXP_DBL *pbMaskLoFactorSprEn,
-                          FIXP_DBL *pbMaskHiFactorSprEn,
-                          const LONG bitrate,
-                          const INT blockType)
+static void FDKaacEnc_initSpreading(INT numPb, FIXP_DBL *pbBarcValue,
+                                    FIXP_DBL *pbMaskLoFactor,
+                                    FIXP_DBL *pbMaskHiFactor,
+                                    FIXP_DBL *pbMaskLoFactorSprEn,
+                                    FIXP_DBL *pbMaskHiFactorSprEn,
+                                    const LONG bitrate, const INT blockType)
 
 {
-    INT i;
-    FIXP_DBL MASKLOWSPREN, MASKHIGHSPREN;
-
-    FIXP_DBL MASKHIGH               = (FIXP_DBL)0x30000000; /* 1.5 in q29 */
-    FIXP_DBL MASKLOW                = (FIXP_DBL)0x60000000; /* 3.0 in q29 */
-    FIXP_DBL MASKLOWSPRENLONG       = (FIXP_DBL)0x60000000; /* 3.0 in q29 */
-    FIXP_DBL MASKHIGHSPRENLONG      = (FIXP_DBL)0x40000000; /* 2.0 in q29 */
-    FIXP_DBL MASKHIGHSPRENLONGLOWBR = (FIXP_DBL)0x30000000; /* 1.5 in q29 */
-    FIXP_DBL MASKLOWSPRENSHORT      = (FIXP_DBL)0x40000000; /* 2.0 in q29 */
-    FIXP_DBL MASKHIGHSPRENSHORT     = (FIXP_DBL)0x30000000; /* 1.5 in q29 */
-    FIXP_DBL TEN                    = (FIXP_DBL)0x50000000; /* 10.0 in q27 */
-
-    if (blockType != SHORT_WINDOW)
-    {
-        MASKLOWSPREN = MASKLOWSPRENLONG;
-        MASKHIGHSPREN = (bitrate>20000)?MASKHIGHSPRENLONG:MASKHIGHSPRENLONGLOWBR;
-    }
-    else
-    {
-        MASKLOWSPREN = MASKLOWSPRENSHORT;
-        MASKHIGHSPREN = MASKHIGHSPRENSHORT;
-    }
+  INT i;
+  FIXP_DBL MASKLOWSPREN, MASKHIGHSPREN;
+
+  FIXP_DBL MASKHIGH = (FIXP_DBL)0x30000000;               /* 1.5 in q29 */
+  FIXP_DBL MASKLOW = (FIXP_DBL)0x60000000;                /* 3.0 in q29 */
+  FIXP_DBL MASKLOWSPRENLONG = (FIXP_DBL)0x60000000;       /* 3.0 in q29 */
+  FIXP_DBL MASKHIGHSPRENLONG = (FIXP_DBL)0x40000000;      /* 2.0 in q29 */
+  FIXP_DBL MASKHIGHSPRENLONGLOWBR = (FIXP_DBL)0x30000000; /* 1.5 in q29 */
+  FIXP_DBL MASKLOWSPRENSHORT = (FIXP_DBL)0x40000000;      /* 2.0 in q29 */
+  FIXP_DBL MASKHIGHSPRENSHORT = (FIXP_DBL)0x30000000;     /* 1.5 in q29 */
+  FIXP_DBL TEN = (FIXP_DBL)0x50000000;                    /* 10.0 in q27 */
+
+  if (blockType != SHORT_WINDOW) {
+    MASKLOWSPREN = MASKLOWSPRENLONG;
+    MASKHIGHSPREN =
+        (bitrate > 20000) ? MASKHIGHSPRENLONG : MASKHIGHSPRENLONGLOWBR;
+  } else {
+    MASKLOWSPREN = MASKLOWSPRENSHORT;
+    MASKHIGHSPREN = MASKHIGHSPRENSHORT;
+  }
 
-    for(i=0; i<numPb; i++)
-    {
-        if (i > 0)
-        {
-            pbMaskHiFactor[i] = getMaskFactor(
-                    fMult(MASKHIGH, (pbBarcValue[i] - pbBarcValue[i-1])), 23,
-                    TEN, 27);
-
-            pbMaskLoFactor[i-1] = getMaskFactor(
-                    fMult(MASKLOW, (pbBarcValue[i] - pbBarcValue[i-1])), 23,
-                    TEN, 27);
-
-            pbMaskHiFactorSprEn[i] = getMaskFactor(
-                    fMult(MASKHIGHSPREN, (pbBarcValue[i] - pbBarcValue[i-1])), 23,
-                    TEN, 27);
-
-            pbMaskLoFactorSprEn[i-1] = getMaskFactor(
-                    fMult(MASKLOWSPREN, (pbBarcValue[i] - pbBarcValue[i-1])), 23,
-                    TEN, 27);
-        }
-        else
-        {
-            pbMaskHiFactor[i]            = (FIXP_DBL)0;
-            pbMaskLoFactor[numPb-1]      = (FIXP_DBL)0;
-            pbMaskHiFactorSprEn[i]       = (FIXP_DBL)0;
-            pbMaskLoFactorSprEn[numPb-1] = (FIXP_DBL)0;
-        }
+  for (i = 0; i < numPb; i++) {
+    if (i > 0) {
+      pbMaskHiFactor[i] = getMaskFactor(
+          fMult(MASKHIGH, (pbBarcValue[i] - pbBarcValue[i - 1])), 23, TEN, 27);
+
+      pbMaskLoFactor[i - 1] = getMaskFactor(
+          fMult(MASKLOW, (pbBarcValue[i] - pbBarcValue[i - 1])), 23, TEN, 27);
+
+      pbMaskHiFactorSprEn[i] = getMaskFactor(
+          fMult(MASKHIGHSPREN, (pbBarcValue[i] - pbBarcValue[i - 1])), 23, TEN,
+          27);
+
+      pbMaskLoFactorSprEn[i - 1] = getMaskFactor(
+          fMult(MASKLOWSPREN, (pbBarcValue[i] - pbBarcValue[i - 1])), 23, TEN,
+          27);
+    } else {
+      pbMaskHiFactor[i] = (FIXP_DBL)0;
+      pbMaskLoFactor[numPb - 1] = (FIXP_DBL)0;
+      pbMaskHiFactorSprEn[i] = (FIXP_DBL)0;
+      pbMaskLoFactorSprEn[numPb - 1] = (FIXP_DBL)0;
     }
+  }
 }
 
-static void FDKaacEnc_initBarcValues(INT numPb,
-                           INT *pbOffset,
-                           INT numLines,
-                           INT samplingFrequency,
-                           FIXP_DBL *pbBval)
-{
-    INT i;
-    FIXP_DBL MAX_BARC = (FIXP_DBL)0x30000000; /* 24.0 in q25 */
-
-    for(i=0; i<numPb; i++)
-    {
-        FIXP_DBL v1, v2, cur_bark;
-        v1 = FDKaacEnc_BarcLineValue(numLines, pbOffset[i], samplingFrequency);
-        v2 = FDKaacEnc_BarcLineValue(numLines, pbOffset[i+1], samplingFrequency);
-        cur_bark = (v1 >> 1) + (v2 >> 1);
-        pbBval[i] = fixMin(cur_bark, MAX_BARC);
-    }
+static void FDKaacEnc_initBarcValues(INT numPb, INT *pbOffset, INT numLines,
+                                     INT samplingFrequency, FIXP_DBL *pbBval) {
+  INT i;
+  FIXP_DBL MAX_BARC = (FIXP_DBL)0x30000000; /* 24.0 in q25 */
+
+  for (i = 0; i < numPb; i++) {
+    FIXP_DBL v1, v2, cur_bark;
+    v1 = FDKaacEnc_BarcLineValue(numLines, pbOffset[i], samplingFrequency);
+    v2 = FDKaacEnc_BarcLineValue(numLines, pbOffset[i + 1], samplingFrequency);
+    cur_bark = (v1 >> 1) + (v2 >> 1);
+    pbBval[i] = fixMin(cur_bark, MAX_BARC);
+  }
 }
 
-static void FDKaacEnc_initMinSnr(const LONG   bitrate,
-                      const LONG   samplerate,
-                      const INT    numLines,
-                      const INT   *sfbOffset,
-                      const INT    sfbActive,
-                      const INT    blockType,
-                      FIXP_DBL    *sfbMinSnrLdData)
-{
-    INT sfb;
-
-    /* Fix conversion variables */
-    INT qbfac, qperwin, qdiv, qpeprt_const, qpeprt;
-    INT qtmp, qsnr, sfbWidth;
-
-    FIXP_DBL MAX_BARC       = (FIXP_DBL)0x30000000; /* 24.0 in q25 */
-    FIXP_DBL MAX_BARCP1     = (FIXP_DBL)0x32000000; /* 25.0 in q25 */
-    FIXP_DBL BITS2PEFAC     = (FIXP_DBL)0x4b851eb8; /* 1.18 in q30 */
-    FIXP_DBL PERS2P4        = (FIXP_DBL)0x624dd2f2; /* 0.024 in q36 */
-    FIXP_DBL ONEP5          = (FIXP_DBL)0x60000000; /* 1.5 in q30 */
-    FIXP_DBL MAX_SNR        = (FIXP_DBL)0x33333333; /* 0.8 in q30 */
-    FIXP_DBL MIN_SNR        = (FIXP_DBL)0x003126e9; /* 0.003 in q30 */
-
-    FIXP_DBL barcFactor, pePerWindow, pePart, barcWidth;
-    FIXP_DBL pePart_const, tmp, snr, one_qsnr, one_point5;
-
-    /* relative number of active barks */
-    barcFactor = fDivNorm(fixMin(FDKaacEnc_BarcLineValue(numLines, sfbOffset[sfbActive], samplerate), MAX_BARC),
-        MAX_BARCP1, &qbfac);
-
-    qbfac = DFRACT_BITS-1-qbfac;
-
-    pePerWindow = fDivNorm(bitrate, samplerate, &qperwin);
-    qperwin = DFRACT_BITS-1-qperwin;
-    pePerWindow = fMult(pePerWindow, BITS2PEFAC);                   qperwin = qperwin + 30 - (DFRACT_BITS-1);
-    pePerWindow = fMult(pePerWindow, PERS2P4);                      qperwin = qperwin + 36 - (DFRACT_BITS-1);
-
-    switch (numLines) {
-      case 1024:
-        qperwin = qperwin - 10;
-        break;
-      case 128:
-        qperwin = qperwin - 7;
-        break;
-      case 512:
-        qperwin = qperwin - 9;
-        break;
-      case 480:
-        qperwin = qperwin - 9;
-        pePerWindow = fMult(pePerWindow, FL2FXCONST_DBL(480.f/512.f));
-        break;
-    }
+static void FDKaacEnc_initMinSnr(const LONG bitrate, const LONG samplerate,
+                                 const INT numLines, const INT *sfbOffset,
+                                 const INT sfbActive, const INT blockType,
+                                 FIXP_DBL *sfbMinSnrLdData) {
+  INT sfb;
+
+  /* Fix conversion variables */
+  INT qbfac, qperwin, qdiv, qpeprt_const, qpeprt;
+  INT qtmp, qsnr, sfbWidth;
+
+  FIXP_DBL MAX_BARC = (FIXP_DBL)0x30000000;   /* 24.0 in q25 */
+  FIXP_DBL MAX_BARCP1 = (FIXP_DBL)0x32000000; /* 25.0 in q25 */
+  FIXP_DBL BITS2PEFAC = (FIXP_DBL)0x4b851eb8; /* 1.18 in q30 */
+  FIXP_DBL PERS2P4 = (FIXP_DBL)0x624dd2f2;    /* 0.024 in q36 */
+  FIXP_DBL ONEP5 = (FIXP_DBL)0x60000000;      /* 1.5 in q30 */
+  FIXP_DBL MAX_SNR = (FIXP_DBL)0x33333333;    /* 0.8 in q30 */
+  FIXP_DBL MIN_SNR = (FIXP_DBL)0x003126e9;    /* 0.003 in q30 */
+
+  FIXP_DBL barcFactor, pePerWindow, pePart, barcWidth;
+  FIXP_DBL pePart_const, tmp, snr, one_qsnr, one_point5;
+
+  /* relative number of active barks */
+  barcFactor = fDivNorm(fixMin(FDKaacEnc_BarcLineValue(
+                                   numLines, sfbOffset[sfbActive], samplerate),
+                               MAX_BARC),
+                        MAX_BARCP1, &qbfac);
+
+  qbfac = DFRACT_BITS - 1 - qbfac;
+
+  pePerWindow = fDivNorm(bitrate, samplerate, &qperwin);
+  qperwin = DFRACT_BITS - 1 - qperwin;
+  pePerWindow = fMult(pePerWindow, BITS2PEFAC);
+  qperwin = qperwin + 30 - (DFRACT_BITS - 1);
+  pePerWindow = fMult(pePerWindow, PERS2P4);
+  qperwin = qperwin + 36 - (DFRACT_BITS - 1);
+
+  switch (numLines) {
+    case 1024:
+      qperwin = qperwin - 10;
+      break;
+    case 128:
+      qperwin = qperwin - 7;
+      break;
+    case 512:
+      qperwin = qperwin - 9;
+      break;
+    case 480:
+      qperwin = qperwin - 9;
+      pePerWindow = fMult(pePerWindow, FL2FXCONST_DBL(480.f / 512.f));
+      break;
+  }
 
-    /* for short blocks it is assumed that more bits are available */
-    if (blockType == SHORT_WINDOW)
-    {
-        pePerWindow = fMult(pePerWindow, ONEP5);
-        qperwin = qperwin + 30 - (DFRACT_BITS-1);
-    }
-    pePart_const = fDivNorm(pePerWindow, barcFactor, &qdiv);      qpeprt_const = qperwin - qbfac + DFRACT_BITS-1-qdiv;
+  /* for short blocks it is assumed that more bits are available */
+  if (blockType == SHORT_WINDOW) {
+    pePerWindow = fMult(pePerWindow, ONEP5);
+    qperwin = qperwin + 30 - (DFRACT_BITS - 1);
+  }
+  pePart_const = fDivNorm(pePerWindow, barcFactor, &qdiv);
+  qpeprt_const = qperwin - qbfac + DFRACT_BITS - 1 - qdiv;
 
-    for (sfb = 0; sfb < sfbActive; sfb++)
-    {
-        barcWidth = FDKaacEnc_BarcLineValue(numLines, sfbOffset[sfb+1], samplerate) -
-            FDKaacEnc_BarcLineValue(numLines, sfbOffset[sfb], samplerate);
+  for (sfb = 0; sfb < sfbActive; sfb++) {
+    barcWidth =
+        FDKaacEnc_BarcLineValue(numLines, sfbOffset[sfb + 1], samplerate) -
+        FDKaacEnc_BarcLineValue(numLines, sfbOffset[sfb], samplerate);
 
-        /* adapt to sfb bands */
-        pePart = fMult(pePart_const, barcWidth); qpeprt = qpeprt_const + 25 - (DFRACT_BITS-1);
+    /* adapt to sfb bands */
+    pePart = fMult(pePart_const, barcWidth);
+    qpeprt = qpeprt_const + 25 - (DFRACT_BITS - 1);
 
-        /* pe -> snr calculation */
-        sfbWidth = (sfbOffset[sfb+1] - sfbOffset[sfb]);
-        pePart = fDivNorm(pePart, sfbWidth, &qdiv); qpeprt += DFRACT_BITS-1-qdiv;
+    /* pe -> snr calculation */
+    sfbWidth = (sfbOffset[sfb + 1] - sfbOffset[sfb]);
+    pePart = fDivNorm(pePart, sfbWidth, &qdiv);
+    qpeprt += DFRACT_BITS - 1 - qdiv;
 
-        tmp = f2Pow(pePart, DFRACT_BITS-1-qpeprt, &qtmp);
-        qtmp = DFRACT_BITS-1-qtmp;
+    tmp = f2Pow(pePart, DFRACT_BITS - 1 - qpeprt, &qtmp);
+    qtmp = DFRACT_BITS - 1 - qtmp;
 
-        /* Subtract 1.5 */
-        qsnr = fixMin(qtmp, 30);
-        tmp = tmp >> (qtmp - qsnr);
+    /* Subtract 1.5 */
+    qsnr = fixMin(qtmp, 30);
+    tmp = tmp >> (qtmp - qsnr);
 
-        if((30+1-qsnr) > (DFRACT_BITS-1))
-            one_point5 = (FIXP_DBL)0;
-        else
-            one_point5 = (FIXP_DBL)(ONEP5 >> (30+1-qsnr));
+    if ((30 + 1 - qsnr) > (DFRACT_BITS - 1))
+      one_point5 = (FIXP_DBL)0;
+    else
+      one_point5 = (FIXP_DBL)(ONEP5 >> (30 + 1 - qsnr));
 
-        snr = (tmp>>1) - (one_point5); qsnr -= 1;
+    snr = (tmp >> 1) - (one_point5);
+    qsnr -= 1;
 
-        /* max(snr, 1.0) */
-        if(qsnr > 0)
-            one_qsnr = (FIXP_DBL)(1 << qsnr);
-        else
-            one_qsnr = (FIXP_DBL)0;
+    /* max(snr, 1.0) */
+    if (qsnr > 0)
+      one_qsnr = (FIXP_DBL)(1 << qsnr);
+    else
+      one_qsnr = (FIXP_DBL)0;
 
-        snr = fixMax(one_qsnr, snr);
+    snr = fixMax(one_qsnr, snr);
 
-        /* 1/snr */
-        snr = fDivNorm(one_qsnr, snr, &qsnr);
-        qsnr = DFRACT_BITS-1-qsnr;
-        snr = (qsnr > 30)? (snr>>(qsnr-30)):snr;
+    /* 1/snr */
+    snr = fDivNorm(one_qsnr, snr, &qsnr);
+    qsnr = DFRACT_BITS - 1 - qsnr;
+    snr = (qsnr > 30) ? (snr >> (qsnr - 30)) : snr;
 
-        /* upper limit is -1 dB */
-        snr = (snr > MAX_SNR) ? MAX_SNR : snr;
+    /* upper limit is -1 dB */
+    snr = (snr > MAX_SNR) ? MAX_SNR : snr;
 
-        /* lower limit is -25 dB */
-        snr = (snr < MIN_SNR) ? MIN_SNR : snr;
-        snr = snr << 1;
+    /* lower limit is -25 dB */
+    snr = (snr < MIN_SNR) ? MIN_SNR : snr;
+    snr = snr << 1;
 
-        sfbMinSnrLdData[sfb] = CalcLdData(snr);
-    }
+    sfbMinSnrLdData[sfb] = CalcLdData(snr);
+  }
 }
 
-AAC_ENCODER_ERROR FDKaacEnc_InitPsyConfiguration(INT   bitrate,
-                                                 INT   samplerate,
-                                                 INT   bandwidth,
-                                                 INT   blocktype,
-                                                 INT   granuleLength,
-                                                 INT   useIS,
+AAC_ENCODER_ERROR FDKaacEnc_InitPsyConfiguration(INT bitrate, INT samplerate,
+                                                 INT bandwidth, INT blocktype,
+                                                 INT granuleLength, INT useIS,
+                                                 INT useMS,
                                                  PSY_CONFIGURATION *psyConf,
-                                                 FB_TYPE filterbank)
-{
-    AAC_ENCODER_ERROR ErrorStatus;
-    INT      sfb;
-    FIXP_DBL sfbBarcVal[MAX_SFB];
-    const INT frameLengthLong = granuleLength;
-    const INT frameLengthShort = granuleLength/TRANS_FAC;
-
-    FDKmemclear(psyConf, sizeof(PSY_CONFIGURATION));
-    psyConf->granuleLength = granuleLength;
-    psyConf->filterbank = filterbank;
-
-    psyConf->allowIS       = (useIS) && ( (bitrate/bandwidth) < 5 );
-
-    /* init sfb table */
-    ErrorStatus = FDKaacEnc_initSfbTable(samplerate,blocktype,granuleLength,psyConf->sfbOffset,&psyConf->sfbCnt);
-    if (ErrorStatus != AAC_ENC_OK)
-      return ErrorStatus;
-
-    /* calculate barc values for each pb */
-    FDKaacEnc_initBarcValues(psyConf->sfbCnt,
-                   psyConf->sfbOffset,
-                   psyConf->sfbOffset[psyConf->sfbCnt],
-                   samplerate,
-                   sfbBarcVal);
-
-    FDKaacEnc_InitMinPCMResolution(psyConf->sfbCnt,
-                         psyConf->sfbOffset,
-                         psyConf->sfbPcmQuantThreshold);
-
-    /* calculate spreading function */
-    FDKaacEnc_initSpreading(psyConf->sfbCnt,
-                  sfbBarcVal,
-                  psyConf->sfbMaskLowFactor,
-                  psyConf->sfbMaskHighFactor,
-                  psyConf->sfbMaskLowFactorSprEn,
-                  psyConf->sfbMaskHighFactorSprEn,
-                  bitrate,
-                  blocktype);
-
-    /* init ratio */
-
-    psyConf->maxAllowedIncreaseFactor = 2;                                                 /* integer */
-    psyConf->minRemainingThresholdFactor = (FIXP_SGL)0x0148; /* FL2FXCONST_SGL(0.01f); */  /* fract   */
-
-    psyConf->clipEnergy = (FIXP_DBL)0x773593ff; /* FL2FXCONST_DBL(1.0e9*NORM_PCM_ENERGY); */
-
-    if (blocktype!=SHORT_WINDOW) {
-        psyConf->lowpassLine = (INT)((2*bandwidth*frameLengthLong)/samplerate);
-        psyConf->lowpassLineLFE = LFE_LOWPASS_LINE;
-    }
-    else {
-        psyConf->lowpassLine = (INT)((2*bandwidth*frameLengthShort)/samplerate);
-        psyConf->lowpassLineLFE = 0; /* LFE only in lonf blocks */
-        /* psyConf->clipEnergy /= (TRANS_FAC * TRANS_FAC); */
-        psyConf->clipEnergy >>= 6;
-    }
+                                                 FB_TYPE filterbank) {
+  AAC_ENCODER_ERROR ErrorStatus;
+  INT sfb;
+  FIXP_DBL sfbBarcVal[MAX_SFB];
+  const INT frameLengthLong = granuleLength;
+  const INT frameLengthShort = granuleLength / TRANS_FAC;
+  INT downscaleFactor = 1;
+
+  switch (granuleLength) {
+    case 256:
+    case 240:
+      downscaleFactor = 2;
+      break;
+    case 128:
+    case 120:
+      downscaleFactor = 4;
+      break;
+    default:
+      downscaleFactor = 1;
+      break;
+  }
 
-    for (sfb = 0; sfb < psyConf->sfbCnt; sfb++){
-        if (psyConf->sfbOffset[sfb] >= psyConf->lowpassLine)
-            break;
-    }
-    psyConf->sfbActive = FDKmax(sfb, 1);
+  FDKmemclear(psyConf, sizeof(PSY_CONFIGURATION));
+  psyConf->granuleLength = granuleLength;
+  psyConf->filterbank = filterbank;
+
+  psyConf->allowIS = (useIS) && ((bitrate / bandwidth) < 5);
+  psyConf->allowMS = useMS;
+
+  /* init sfb table */
+  ErrorStatus = FDKaacEnc_initSfbTable(samplerate * downscaleFactor, blocktype,
+                                       granuleLength * downscaleFactor,
+                                       psyConf->sfbOffset, &psyConf->sfbCnt);
+
+  if (ErrorStatus != AAC_ENC_OK) return ErrorStatus;
+
+  /* calculate barc values for each pb */
+  FDKaacEnc_initBarcValues(psyConf->sfbCnt, psyConf->sfbOffset,
+                           psyConf->sfbOffset[psyConf->sfbCnt], samplerate,
+                           sfbBarcVal);
+
+  FDKaacEnc_InitMinPCMResolution(psyConf->sfbCnt, psyConf->sfbOffset,
+                                 psyConf->sfbPcmQuantThreshold);
+
+  /* calculate spreading function */
+  FDKaacEnc_initSpreading(psyConf->sfbCnt, sfbBarcVal,
+                          psyConf->sfbMaskLowFactor, psyConf->sfbMaskHighFactor,
+                          psyConf->sfbMaskLowFactorSprEn,
+                          psyConf->sfbMaskHighFactorSprEn, bitrate, blocktype);
+
+  /* init ratio */
+
+  psyConf->maxAllowedIncreaseFactor = 2; /* integer */
+  psyConf->minRemainingThresholdFactor = (FIXP_SGL)0x0148;
+  /* FL2FXCONST_SGL(0.01f); */ /* fract   */
+
+  psyConf->clipEnergy =
+      (FIXP_DBL)0x773593ff; /* FL2FXCONST_DBL(1.0e9*NORM_PCM_ENERGY); */
+
+  if (blocktype != SHORT_WINDOW) {
+    psyConf->lowpassLine =
+        (INT)((2 * bandwidth * frameLengthLong) / samplerate);
+    psyConf->lowpassLineLFE = LFE_LOWPASS_LINE;
+  } else {
+    psyConf->lowpassLine =
+        (INT)((2 * bandwidth * frameLengthShort) / samplerate);
+    psyConf->lowpassLineLFE = 0; /* LFE only in lonf blocks */
+    /* psyConf->clipEnergy /= (TRANS_FAC * TRANS_FAC); */
+    psyConf->clipEnergy >>= 6;
+  }
 
-    for (sfb = 0; sfb < psyConf->sfbCnt; sfb++){
-        if (psyConf->sfbOffset[sfb] >= psyConf->lowpassLineLFE)
-            break;
-    }
-    psyConf->sfbActiveLFE = sfb;
-    psyConf->sfbActive = FDKmax(psyConf->sfbActive, psyConf->sfbActiveLFE);
-
-    /* calculate minSnr */
-    FDKaacEnc_initMinSnr(bitrate,
-               samplerate,
-               psyConf->sfbOffset[psyConf->sfbCnt],
-               psyConf->sfbOffset,
-               psyConf->sfbActive,
-               blocktype,
-               psyConf->sfbMinSnrLdData);
-
-    return AAC_ENC_OK;
-}
+  for (sfb = 0; sfb < psyConf->sfbCnt; sfb++) {
+    if (psyConf->sfbOffset[sfb] >= psyConf->lowpassLine) break;
+  }
+  psyConf->sfbActive = fMax(sfb, 1);
 
+  for (sfb = 0; sfb < psyConf->sfbCnt; sfb++) {
+    if (psyConf->sfbOffset[sfb] >= psyConf->lowpassLineLFE) break;
+  }
+  psyConf->sfbActiveLFE = sfb;
+  psyConf->sfbActive = fMax(psyConf->sfbActive, psyConf->sfbActiveLFE);
+
+  /* calculate minSnr */
+  FDKaacEnc_initMinSnr(bitrate, samplerate * downscaleFactor,
+                       psyConf->sfbOffset[psyConf->sfbCnt], psyConf->sfbOffset,
+                       psyConf->sfbActive, blocktype, psyConf->sfbMinSnrLdData);
+
+  return AAC_ENC_OK;
+}