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, 184 insertions, 181 deletions

diff --git a/libSBRdec/src/sbrdec_drc.cpp b/libSBRdec/src/sbrdec_drc.cpp
index a834c0b..2d73f32 100644
--- a/libSBRdec/src/sbrdec_drc.cpp
+++ b/libSBRdec/src/sbrdec_drc.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,23 +90,28 @@ Am Wolfsmantel 33
 
 www.iis.fraunhofer.de/amm
 amm-info@iis.fraunhofer.de
------------------------------------------------------------------------------------------------------------ */
+----------------------------------------------------------------------------- */
 
-/*****************************  MPEG-4 AAC Decoder  **************************
+/**************************** SBR decoder library ******************************
 
    Author(s):   Christian Griebel
+
    Description: Dynamic range control (DRC) decoder tool for SBR
 
-******************************************************************************/
+*******************************************************************************/
 
 #include "sbrdec_drc.h"
 
-
-/* DRC - Offset table for QMF interpolation. */
-static const int offsetTab[2][16] =
-{
-  { 0, 4, 8, 12, 16, 20, 24, 28, 0, 0, 0, 0, 0, 0, 0, 0 },  /* 1024 framing */
-  { 0, 4, 8, 12, 16, 19, 22, 26, 0, 0, 0, 0, 0, 0, 0, 0 }   /*  960 framing */
+/* DRC - Offset table for QMF interpolation. Shifted by one index position.
+   The table defines the (short) window borders rounded to the nearest QMF
+   timeslot. It has the size 16 because it is accessed with the
+   drcInterpolationScheme that is read from the bitstream with 4 bit. */
+static const UCHAR winBorderToColMappingTab[2][16] = {
+    /*-1, 0, 1, 2,  3,  4,  5,  6,  7,  8 */
+    {0, 0, 4, 8, 12, 16, 20, 24, 28, 32, 32, 32, 32, 32, 32,
+     32}, /* 1024 framing */
+    {0, 0, 4, 8, 11, 15, 19, 23, 26, 30, 30, 30, 30, 30, 30,
+     30} /*  960 framing */
 };
 
 /*!
@@ -105,9 +121,7 @@ static const int offsetTab[2][16] =
 
   \return none
 */
-void sbrDecoder_drcInitChannel (
-    HANDLE_SBR_DRC_CHANNEL  hDrcData )
-{
+void sbrDecoder_drcInitChannel(HANDLE_SBR_DRC_CHANNEL hDrcData) {
   int band;
 
   if (hDrcData == NULL) {
@@ -139,7 +153,6 @@ void sbrDecoder_drcInitChannel (
   hDrcData->enable = 0;
 }
 
-
 /*!
   \brief Swap DRC QMF scaling factors after they have been applied.
 
@@ -147,9 +160,7 @@ void sbrDecoder_drcInitChannel (
 
   \return none
 */
-void sbrDecoder_drcUpdateChannel (
-    HANDLE_SBR_DRC_CHANNEL  hDrcData )
-{
+void sbrDecoder_drcUpdateChannel(HANDLE_SBR_DRC_CHANNEL hDrcData) {
   if (hDrcData == NULL) {
     return;
   }
@@ -158,24 +169,21 @@ void sbrDecoder_drcUpdateChannel (
   }
 
   /* swap previous data */
-  FDKmemcpy( hDrcData->currFact_mag,
-             hDrcData->nextFact_mag,
-             SBRDEC_MAX_DRC_BANDS * sizeof(FIXP_DBL) );
+  FDKmemcpy(hDrcData->currFact_mag, hDrcData->nextFact_mag,
+            SBRDEC_MAX_DRC_BANDS * sizeof(FIXP_DBL));
 
   hDrcData->currFact_exp = hDrcData->nextFact_exp;
 
   hDrcData->numBandsCurr = hDrcData->numBandsNext;
 
-  FDKmemcpy( hDrcData->bandTopCurr,
-             hDrcData->bandTopNext,
-             SBRDEC_MAX_DRC_BANDS * sizeof(USHORT) );
+  FDKmemcpy(hDrcData->bandTopCurr, hDrcData->bandTopNext,
+            SBRDEC_MAX_DRC_BANDS * sizeof(USHORT));
 
   hDrcData->drcInterpolationSchemeCurr = hDrcData->drcInterpolationSchemeNext;
 
   hDrcData->winSequenceCurr = hDrcData->winSequenceNext;
 }
 
-
 /*!
   \brief Apply DRC factors slot based.
 
@@ -188,20 +196,15 @@ void sbrDecoder_drcUpdateChannel (
 
   \return None.
 */
-void sbrDecoder_drcApplySlot (
-    HANDLE_SBR_DRC_CHANNEL  hDrcData,
-    FIXP_DBL   *qmfRealSlot,
-    FIXP_DBL   *qmfImagSlot,
-    int  col,
-    int  numQmfSubSamples,
-    int  maxShift
-  )
-{
-  const int *offset;
+void sbrDecoder_drcApplySlot(HANDLE_SBR_DRC_CHANNEL hDrcData,
+                             FIXP_DBL *qmfRealSlot, FIXP_DBL *qmfImagSlot,
+                             int col, int numQmfSubSamples, int maxShift) {
+  const UCHAR *winBorderToColMap;
 
   int band, bottomMdct, topMdct, bin, useLP;
-  int indx = numQmfSubSamples - (numQmfSubSamples >> 1) - 10;   /* l_border */
+  int indx = numQmfSubSamples - (numQmfSubSamples >> 1) - 10; /* l_border */
   int frameLenFlag = (numQmfSubSamples == 30) ? 1 : 0;
+  int frameSize = (frameLenFlag == 1) ? 960 : 1024;
 
   const FIXP_DBL *fact_mag = NULL;
   INT fact_exp = 0;
@@ -218,31 +221,28 @@ void sbrDecoder_drcApplySlot (
     return;
   }
 
-  offset = offsetTab[frameLenFlag];
+  winBorderToColMap = winBorderToColMappingTab[frameLenFlag];
 
   useLP = (qmfImagSlot == NULL) ? 1 : 0;
 
   col += indx;
   bottomMdct = 0;
-  bin = 0;
 
   /* get respective data and calc interpolation factor */
-  if (col < (numQmfSubSamples>>1)) {  /* first half of current frame */
+  if (col < (numQmfSubSamples >> 1)) {    /* first half of current frame */
     if (hDrcData->winSequenceCurr != 2) { /* long window */
-      int j = col + (numQmfSubSamples>>1);
+      int j = col + (numQmfSubSamples >> 1);
 
       if (hDrcData->drcInterpolationSchemeCurr == 0) {
-        INT k = (frameLenFlag) ? 0x4444444 : 0x4000000;
+        INT k = (frameLenFlag) ? 0x4444445 : 0x4000000;
 
         alphaValue = (FIXP_DBL)(j * k);
-      }
-      else {
-        if (j >= offset[hDrcData->drcInterpolationSchemeCurr - 1]) {
+      } else {
+        if (j >= (int)winBorderToColMap[hDrcData->drcInterpolationSchemeCurr]) {
           alphaValue = (FIXP_DBL)MAXVAL_DBL;
         }
       }
-    }
-    else {  /* short windows */
+    } else { /* short windows */
       shortDrc = 1;
     }
 
@@ -250,18 +250,16 @@ void sbrDecoder_drcApplySlot (
     fact_exp = hDrcData->currFact_exp;
     numBands = hDrcData->numBandsCurr;
     bandTop = hDrcData->bandTopCurr;
-  }
-  else if (col < numQmfSubSamples) {  /* second half of current frame */
+  } else if (col < numQmfSubSamples) {    /* second half of current frame */
     if (hDrcData->winSequenceNext != 2) { /* next: long window */
-      int j = col - (numQmfSubSamples>>1);
+      int j = col - (numQmfSubSamples >> 1);
 
       if (hDrcData->drcInterpolationSchemeNext == 0) {
-        INT k = (frameLenFlag) ? 0x4444444 : 0x4000000;
+        INT k = (frameLenFlag) ? 0x4444445 : 0x4000000;
 
         alphaValue = (FIXP_DBL)(j * k);
-      }
-      else {
-        if (j >= offset[hDrcData->drcInterpolationSchemeNext - 1]) {
+      } else {
+        if (j >= (int)winBorderToColMap[hDrcData->drcInterpolationSchemeNext]) {
           alphaValue = (FIXP_DBL)MAXVAL_DBL;
         }
       }
@@ -270,17 +268,15 @@ void sbrDecoder_drcApplySlot (
       fact_exp = hDrcData->nextFact_exp;
       numBands = hDrcData->numBandsNext;
       bandTop = hDrcData->bandTopNext;
-    }
-    else {  /* next: short windows */
-      if (hDrcData->winSequenceCurr != 2) {  /* current: long window */
+    } else {                                /* next: short windows */
+      if (hDrcData->winSequenceCurr != 2) { /* current: long window */
         alphaValue = (FIXP_DBL)0;
 
         fact_mag = hDrcData->nextFact_mag;
         fact_exp = hDrcData->nextFact_exp;
         numBands = hDrcData->numBandsNext;
         bandTop = hDrcData->bandTopNext;
-      }
-      else {  /* current: short windows */
+      } else { /* current: short windows */
         shortDrc = 1;
 
         fact_mag = hDrcData->currFact_mag;
@@ -289,23 +285,20 @@ void sbrDecoder_drcApplySlot (
         bandTop = hDrcData->bandTopCurr;
       }
     }
-  }
-  else {  /* first half of next frame */
+  } else {                                /* first half of next frame */
     if (hDrcData->winSequenceNext != 2) { /* long window */
-      int j = col - (numQmfSubSamples>>1);
+      int j = col - (numQmfSubSamples >> 1);
 
       if (hDrcData->drcInterpolationSchemeNext == 0) {
-        INT k = (frameLenFlag) ? 0x4444444 : 0x4000000;
+        INT k = (frameLenFlag) ? 0x4444445 : 0x4000000;
 
         alphaValue = (FIXP_DBL)(j * k);
-      }
-      else {
-        if (j >= offset[hDrcData->drcInterpolationSchemeNext - 1]) {
+      } else {
+        if (j >= (int)winBorderToColMap[hDrcData->drcInterpolationSchemeNext]) {
           alphaValue = (FIXP_DBL)MAXVAL_DBL;
         }
       }
-    }
-    else {  /* short windows */
+    } else { /* short windows */
       shortDrc = 1;
     }
 
@@ -317,37 +310,33 @@ void sbrDecoder_drcApplySlot (
     col -= numQmfSubSamples;
   }
 
-
   /* process bands */
   for (band = 0; band < (int)numBands; band++) {
     int bottomQmf, topQmf;
 
     FIXP_DBL drcFact_mag = (FIXP_DBL)MAXVAL_DBL;
 
-    topMdct = (bandTop[band]+1) << 2;
+    topMdct = (bandTop[band] + 1) << 2;
 
-    if (!shortDrc) {  /* long window */
+    if (!shortDrc) { /* long window */
       if (frameLenFlag) {
         /* 960 framing */
-        bottomMdct = 30 * (bottomMdct / 30);
-        topMdct    = 30 * (topMdct / 30);
+        bottomQmf = fMultIfloor((FIXP_DBL)0x4444445, bottomMdct);
+        topQmf = fMultIfloor((FIXP_DBL)0x4444445, topMdct);
 
-        bottomQmf = fMultIfloor((FIXP_DBL)0x4444444, bottomMdct);
-        topQmf    = fMultIfloor((FIXP_DBL)0x4444444, topMdct);
-      }
-      else {
+        topMdct = 30 * topQmf;
+      } else {
         /* 1024 framing */
-        bottomMdct &= ~0x1f;
-        topMdct    &= ~0x1f;
+        topMdct &= ~0x1f;
 
         bottomQmf = bottomMdct >> 5;
-        topQmf    = topMdct >> 5;
+        topQmf = topMdct >> 5;
       }
 
-      if (band == ((int)numBands-1)) {
+      if (band == ((int)numBands - 1)) {
         topQmf = (64);
       }
-    
+
       for (bin = bottomQmf; bin < topQmf; bin++) {
         FIXP_DBL drcFact1_mag = hDrcData->prevFact_mag[bin];
         FIXP_DBL drcFact2_mag = fact_mag[band];
@@ -366,7 +355,9 @@ void sbrDecoder_drcApplySlot (
         } else if (alphaValue == (FIXP_DBL)MAXVAL_DBL) {
           drcFact_mag = drcFact2_mag;
         } else {
-          drcFact_mag = fMult(alphaValue, drcFact2_mag) + fMult(((FIXP_DBL)MAXVAL_DBL - alphaValue), drcFact1_mag);
+          drcFact_mag =
+              fMult(alphaValue, drcFact2_mag) +
+              fMult(((FIXP_DBL)MAXVAL_DBL - alphaValue), drcFact1_mag);
         }
 
         /* apply scaling */
@@ -376,53 +367,78 @@ void sbrDecoder_drcApplySlot (
         }
 
         /* save previous factors */
-        if (col == (numQmfSubSamples>>1)-1) {
+        if (col == (numQmfSubSamples >> 1) - 1) {
           hDrcData->prevFact_mag[bin] = fact_mag[band];
         }
       }
-    }
-    else {  /* short windows */
-      int startSample, stopSample;
-      FIXP_DBL invFrameSizeDiv8 = (frameLenFlag) ? (FIXP_DBL)0x1111111 : (FIXP_DBL)0x1000000;
+    } else { /* short windows */
+      unsigned startWinIdx, stopWinIdx;
+      int startCol, stopCol;
+      FIXP_DBL invFrameSizeDiv8 =
+          (frameLenFlag) ? (FIXP_DBL)0x1111112 : (FIXP_DBL)0x1000000;
+
+      /* limit top at the frame borders */
+      if (topMdct < 0) {
+        topMdct = 0;
+      }
+      if (topMdct >= frameSize) {
+        topMdct = frameSize - 1;
+      }
 
       if (frameLenFlag) {
         /*  960 framing */
-        bottomMdct = 30/8 * (bottomMdct*8/30);
-        topMdct    = 30/8 * (topMdct*8/30);
-      }
-      else {
+        topMdct = fMultIfloor((FIXP_DBL)0x78000000,
+                              fMultIfloor((FIXP_DBL)0x22222223, topMdct) << 2);
+
+        startWinIdx = fMultIfloor(invFrameSizeDiv8, bottomMdct) +
+                      1; /* winBorderToColMap table has offset of 1 */
+        stopWinIdx = fMultIceil(invFrameSizeDiv8 - (FIXP_DBL)1, topMdct) + 1;
+      } else {
         /* 1024 framing */
-        bottomMdct &= ~0x03;
-        topMdct    &= ~0x03;
+        topMdct &= ~0x03;
+
+        startWinIdx = fMultIfloor(invFrameSizeDiv8, bottomMdct) + 1;
+        stopWinIdx = fMultIceil(invFrameSizeDiv8, topMdct) + 1;
       }
 
-      /* startSample is truncated to the nearest corresponding start subsample in
+      /* startCol is truncated to the nearest corresponding start subsample in
          the QMF of the short window bottom is present in:*/
-      startSample  = ((fMultIfloor( invFrameSizeDiv8, bottomMdct ) & 0x7) * numQmfSubSamples) >> 3;
+      startCol = (int)winBorderToColMap[startWinIdx];
 
-      /* stopSample is rounded upwards to the nearest corresponding stop subsample
+      /* stopCol is rounded upwards to the nearest corresponding stop subsample
          in the QMF of the short window top is present in. */
-      stopSample  = ((fMultIceil( invFrameSizeDiv8, topMdct ) & 0xf) * numQmfSubSamples) >> 3;
+      stopCol = (int)winBorderToColMap[stopWinIdx];
 
-      bottomQmf = fMultIfloor( invFrameSizeDiv8, ((bottomMdct%(numQmfSubSamples<<2)) << 5) );
-      topQmf    = fMultIfloor( invFrameSizeDiv8, ((topMdct%(numQmfSubSamples<<2)) << 5) );
+      bottomQmf = fMultIfloor(invFrameSizeDiv8,
+                              ((bottomMdct % (numQmfSubSamples << 2)) << 5));
+      topQmf = fMultIfloor(invFrameSizeDiv8,
+                           ((topMdct % (numQmfSubSamples << 2)) << 5));
 
       /* extend last band */
-      if (band == ((int)numBands-1)) {
+      if (band == ((int)numBands - 1)) {
         topQmf = (64);
-        stopSample = numQmfSubSamples;
+        stopCol = numQmfSubSamples;
+        stopWinIdx = 10;
       }
 
       if (topQmf == 0) {
+        if (frameLenFlag) {
+          FIXP_DBL rem = fMult(invFrameSizeDiv8,
+                               (FIXP_DBL)(topMdct << (DFRACT_BITS - 12)));
+          if ((LONG)rem & (LONG)0x1F) {
+            stopWinIdx -= 1;
+            stopCol = (int)winBorderToColMap[stopWinIdx];
+          }
+        }
         topQmf = (64);
       }
 
       /* save previous factors */
-      if (stopSample == numQmfSubSamples) {
+      if (stopCol == numQmfSubSamples) {
         int tmpBottom = bottomQmf;
 
-        if (((numQmfSubSamples-1) & ~0x03) > startSample) {
-            tmpBottom = 0;    /* band starts in previous short window */
+        if ((int)winBorderToColMap[8] > startCol) {
+          tmpBottom = 0; /* band starts in previous short window */
         }
 
         for (bin = tmpBottom; bin < topQmf; bin++) {
@@ -431,12 +447,12 @@ void sbrDecoder_drcApplySlot (
       }
 
       /* apply */
-      if ((col >= startSample) && (col < stopSample)) {
-        if ((col & ~0x03) > startSample) {
-            bottomQmf = 0;    /* band starts in previous short window */
+      if ((col >= startCol) && (col < stopCol)) {
+        if (col >= (int)winBorderToColMap[startWinIdx + 1]) {
+          bottomQmf = 0; /* band starts in previous short window */
         }
-        if (col < ((stopSample-1) & ~0x03)) {
-            topQmf = (64);   /* band ends in next short window */
+        if (col < (int)winBorderToColMap[stopWinIdx - 1]) {
+          topQmf = (64); /* band ends in next short window */
         }
 
         drcFact_mag = fact_mag[band];
@@ -457,14 +473,13 @@ void sbrDecoder_drcApplySlot (
     }
 
     bottomMdct = topMdct;
-  }   /* end of bands loop */
+  } /* end of bands loop */
 
-  if (col == (numQmfSubSamples>>1)-1) {
+  if (col == (numQmfSubSamples >> 1) - 1) {
     hDrcData->prevFact_exp = fact_exp;
   }
 }
 
-
 /*!
   \brief Apply DRC factors frame based.
 
@@ -476,14 +491,9 @@ void sbrDecoder_drcApplySlot (
 
   \return None.
 */
-void sbrDecoder_drcApply (
-    HANDLE_SBR_DRC_CHANNEL  hDrcData,
-    FIXP_DBL **QmfBufferReal,
-    FIXP_DBL **QmfBufferImag,
-    int  numQmfSubSamples,
-    int *scaleFactor
-  )
-{
+void sbrDecoder_drcApply(HANDLE_SBR_DRC_CHANNEL hDrcData,
+                         FIXP_DBL **QmfBufferReal, FIXP_DBL **QmfBufferImag,
+                         int numQmfSubSamples, int *scaleFactor) {
   int col;
   int maxShift = 0;
 
@@ -491,7 +501,8 @@ void sbrDecoder_drcApply (
     return;
   }
   if (hDrcData->enable == 0) {
-    return;  /* Avoid changing the scaleFactor even though the processing is disabled. */
+    return; /* Avoid changing the scaleFactor even though the processing is
+               disabled. */
   }
 
   /* get max scale factor */
@@ -505,21 +516,13 @@ void sbrDecoder_drcApply (
     maxShift = hDrcData->nextFact_exp;
   }
 
-  for (col = 0; col < numQmfSubSamples; col++)
-  {
+  for (col = 0; col < numQmfSubSamples; col++) {
     FIXP_DBL *qmfSlotReal = QmfBufferReal[col];
     FIXP_DBL *qmfSlotImag = (QmfBufferImag == NULL) ? NULL : QmfBufferImag[col];
 
-    sbrDecoder_drcApplySlot (
-      hDrcData,
-      qmfSlotReal,
-      qmfSlotImag,
-      col,
-      numQmfSubSamples,
-      maxShift
-    );
+    sbrDecoder_drcApplySlot(hDrcData, qmfSlotReal, qmfSlotImag, col,
+                            numQmfSubSamples, maxShift);
   }
 
   *scaleFactor += maxShift;
 }
-