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, 303 insertions, 212 deletions

diff --git a/libSBRdec/src/env_extr.h b/libSBRdec/src/env_extr.h
index 0518ea9..38c04a3 100644
--- a/libSBRdec/src/env_extr.h
+++ b/libSBRdec/src/env_extr.h
@@ -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,15 +90,23 @@ Am Wolfsmantel 33
 
 www.iis.fraunhofer.de/amm
 amm-info@iis.fraunhofer.de
------------------------------------------------------------------------------------------------------------ */
+----------------------------------------------------------------------------- */
+
+/**************************** SBR decoder library ******************************
+
+   Author(s):
+
+   Description:
+
+*******************************************************************************/
 
 /*!
   \file
-  \brief  Envelope extraction prototypes  
+  \brief  Envelope extraction prototypes
 */
 
-#ifndef __ENVELOPE_EXTRACTION_H
-#define __ENVELOPE_EXTRACTION_H
+#ifndef ENV_EXTR_H
+#define ENV_EXTR_H
 
 #include "sbrdecoder.h"
 
@@ -95,6 +114,7 @@ amm-info@iis.fraunhofer.de
 #include "lpp_tran.h"
 
 #include "psdec.h"
+#include "pvc_dec.h"
 
 #define ENV_EXP_FRACT 0
 /*!< Shift raw envelope data to support fractional numbers.
@@ -104,208 +124,278 @@ amm-info@iis.fraunhofer.de
 */
 
 #define EXP_BITS 6
-/*!< Size of exponent-part of a pseudo float envelope value (should be at least 6).
-  The remaining bits in each word are used for the mantissa (should be at least 10).
-  This format is used in the arrays iEnvelope[] and sbrNoiseFloorLevel[]
-  in the FRAME_DATA struct which must fit in a certain part of the output buffer
-  (See buffer management in sbr_dec.cpp).
-  Exponents and mantissas could also be stored in separate arrays.
-  Accessing the exponent or the mantissa would be simplified and the masks #MASK_E
-  resp. #MASK_M would   no longer be required.
+/*!< Size of exponent-part of a pseudo float envelope value (should be at least
+  6). The remaining bits in each word are used for the mantissa (should be at
+  least 10). This format is used in the arrays iEnvelope[] and
+  sbrNoiseFloorLevel[] in the FRAME_DATA struct which must fit in a certain part
+  of the output buffer (See buffer management in sbr_dec.cpp). Exponents and
+  mantissas could also be stored in separate arrays. Accessing the exponent or
+  the mantissa would be simplified and the masks #MASK_E resp. #MASK_M would
+  no longer be required.
 */
 
-#define MASK_M (((1 << (FRACT_BITS - EXP_BITS)) - 1) << EXP_BITS)  /*!< Mask for extracting the mantissa of a pseudo float envelope value */
-#define MASK_E ((1 << EXP_BITS) - 1)           /*!< Mask for extracting the exponent of a pseudo float envelope value */
-
-#define SIGN_EXT ( ((SCHAR)-1) ^ MASK_E)        /*!< a CHAR-constant with all bits above our sign-bit set */
-#define ROUNDING ( (FIXP_SGL)(1<<(EXP_BITS-1)) ) /*!< 0.5-offset for rounding the mantissa of a pseudo-float envelope value */
-#define NRG_EXP_OFFSET  16                     /*!< Will be added to the reference energy's exponent to prevent negative numbers */
-#define NOISE_EXP_OFFSET  38                   /*!< Will be added to the noise level exponent to prevent negative numbers */
-
-typedef enum
-{
+#define MASK_M                                                          \
+  (((1 << (FRACT_BITS - EXP_BITS)) - 1)                                 \
+   << EXP_BITS) /*!< Mask for extracting the mantissa of a pseudo float \
+                   envelope value */
+#define MASK_E                                                            \
+  ((1 << EXP_BITS) - 1) /*!< Mask for extracting the exponent of a pseudo \
+                           float envelope value */
+
+#define SIGN_EXT \
+  (((SCHAR)-1) ^ \
+   MASK_E) /*!< a CHAR-constant with all bits above our sign-bit set */
+#define ROUNDING                                                           \
+  ((FIXP_SGL)(                                                             \
+      1 << (EXP_BITS - 1))) /*!< 0.5-offset for rounding the mantissa of a \
+                               pseudo-float envelope value */
+#define NRG_EXP_OFFSET                                                         \
+  16 /*!< Will be added to the reference energy's exponent to prevent negative \
+        numbers */
+#define NOISE_EXP_OFFSET                                                \
+  38 /*!< Will be added to the noise level exponent to prevent negative \
+        numbers */
+
+#define ADD_HARMONICS_FLAGS_SIZE 2 /* ceil(MAX_FREQ_COEFFS/32) */
+
+typedef enum {
   HEADER_NOT_PRESENT,
   HEADER_ERROR,
   HEADER_OK,
   HEADER_RESET
-}
-SBR_HEADER_STATUS;
+} SBR_HEADER_STATUS;
 
-typedef enum
-{
+typedef enum {
   SBR_NOT_INITIALIZED = 0,
   UPSAMPLING = 1,
   SBR_HEADER = 2,
   SBR_ACTIVE = 3
-}
-SBR_SYNC_STATE;
-
-
-typedef enum
-{
-  COUPLING_OFF = 0,
-  COUPLING_LEVEL,
-  COUPLING_BAL
-}
-COUPLING_MODE;
-
-typedef struct
-{
-  UCHAR nSfb[2];           /*!< Number of SBR-bands for low and high freq-resolution */
-  UCHAR nNfb;              /*!< Actual number of noise bands to read from the bitstream*/
-  UCHAR numMaster;         /*!< Number of SBR-bands in v_k_master */
-  UCHAR lowSubband;        /*!< QMF-band where SBR frequency range starts */
-  UCHAR highSubband;       /*!< QMF-band where SBR frequency range ends */
-  UCHAR limiterBandTable[MAX_NUM_LIMITERS+1]; /*!< Limiter band table. */
-  UCHAR noLimiterBands;    /*!< Number of limiter bands. */
-  UCHAR nInvfBands;        /*!< Number of bands for inverse filtering */
-  UCHAR *freqBandTable[2]; /*!< Pointers to freqBandTableLo and freqBandTableHi */
-  UCHAR freqBandTableLo[MAX_FREQ_COEFFS/2+1];
-                                   /*!< Mapping of SBR bands to QMF bands for low frequency resolution */
-  UCHAR freqBandTableHi[MAX_FREQ_COEFFS+1];
-                                   /*!< Mapping of SBR bands to QMF bands for high frequency resolution */
-  UCHAR freqBandTableNoise[MAX_NOISE_COEFFS+1];
-                                   /*!< Mapping of SBR noise bands to QMF bands */
-  UCHAR v_k_master[MAX_FREQ_COEFFS+1];
-                                   /*!< Master BandTable which freqBandTable is derived from */
-}
-FREQ_BAND_DATA;
+} SBR_SYNC_STATE;
+
+typedef enum { COUPLING_OFF = 0, COUPLING_LEVEL, COUPLING_BAL } COUPLING_MODE;
+
+typedef struct {
+  UCHAR nSfb[2]; /*!< Number of SBR-bands for low and high freq-resolution */
+  UCHAR nNfb;    /*!< Actual number of noise bands to read from the bitstream*/
+  UCHAR numMaster;      /*!< Number of SBR-bands in v_k_master */
+  UCHAR lowSubband;     /*!< QMF-band where SBR frequency range starts */
+  UCHAR highSubband;    /*!< QMF-band where SBR frequency range ends */
+  UCHAR ov_highSubband; /*!< if headerchange applies this value holds the old
+                           highband value -> highband value of overlap area;
+                             required for overlap in usac when headerchange
+                           occurs between XVAR and VARX frame */
+  UCHAR limiterBandTable[MAX_NUM_LIMITERS + 1]; /*!< Limiter band table. */
+  UCHAR noLimiterBands;                         /*!< Number of limiter bands. */
+  UCHAR nInvfBands; /*!< Number of bands for inverse filtering */
+  UCHAR
+  *freqBandTable[2]; /*!< Pointers to freqBandTableLo and freqBandTableHi */
+  UCHAR freqBandTableLo[MAX_FREQ_COEFFS / 2 + 1];
+  /*!< Mapping of SBR bands to QMF bands for low frequency resolution */
+  UCHAR freqBandTableHi[MAX_FREQ_COEFFS + 1];
+  /*!< Mapping of SBR bands to QMF bands for high frequency resolution */
+  UCHAR freqBandTableNoise[MAX_NOISE_COEFFS + 1];
+  /*!< Mapping of SBR noise bands to QMF bands */
+  UCHAR v_k_master[MAX_FREQ_COEFFS + 1];
+  /*!< Master BandTable which freqBandTable is derived from */
+} FREQ_BAND_DATA;
 
 typedef FREQ_BAND_DATA *HANDLE_FREQ_BAND_DATA;
 
-#define SBRDEC_ELD_GRID        1
-#define SBRDEC_SYNTAX_SCAL     2
-#define SBRDEC_SYNTAX_USAC     4
-#define SBRDEC_SYNTAX_RSVD50   8
-#define SBRDEC_LOW_POWER      16  /* Flag indicating that Low Power QMF mode shall be used. */
-#define SBRDEC_PS_DECODED     32  /* Flag indicating that PS was decoded and rendered. */
-#define SBRDEC_LD_MPS_QMF    512  /* Flag indicating that the LD-MPS QMF shall be used. */
-#define SBRDEC_SYNTAX_DRM   2048  /* Flag indicating that DRM30/DRM+ reverse syntax is being used. */
-#define SBRDEC_DOWNSAMPLE   8192  /* Flag indicating that the downsampling mode is used. */
-#define SBRDEC_FLUSH       16384  /* Flag is used to flush all elements in use. */
-#define SBRDEC_FORCE_RESET 32768  /* Flag is used to force a reset of all elements in use. */
-
-#define SBRDEC_HDR_STAT_RESET  1
+#define SBRDEC_ELD_GRID 1
+#define SBRDEC_SYNTAX_SCAL 2
+#define SBRDEC_SYNTAX_USAC 4
+#define SBRDEC_SYNTAX_RSVD50 8
+#define SBRDEC_USAC_INDEP \
+  16 /* Flag indicating that USAC global independency flag is active. */
+#define SBRDEC_LOW_POWER \
+  32 /* Flag indicating that Low Power QMF mode shall be used. */
+#define SBRDEC_PS_DECODED \
+  64 /* Flag indicating that PS was decoded and rendered. */
+#define SBRDEC_QUAD_RATE                              \
+  128 /* Flag indicating that USAC SBR 4:1 is active. \
+       */
+#define SBRDEC_USAC_HARMONICSBR \
+  256 /* Flag indicating that USAC HBE tool is active. */
+#define SBRDEC_LD_MPS_QMF \
+  512 /* Flag indicating that the LD-MPS QMF shall be used. */
+#define SBRDEC_USAC_ITES \
+  1024 /* Flag indicating that USAC inter TES tool is active. */
+#define SBRDEC_SYNTAX_DRM \
+  2048 /* Flag indicating that DRM30/DRM+ reverse syntax is being used. */
+#define SBRDEC_ELD_DOWNSCALE \
+  4096 /* Flag indicating that ELD downscaled mode decoding is used */
+#define SBRDEC_DOWNSAMPLE \
+  8192 /* Flag indicating that the downsampling mode is used. */
+#define SBRDEC_FLUSH 16384 /* Flag is used to flush all elements in use. */
+#define SBRDEC_FORCE_RESET \
+  32768 /* Flag is used to force a reset of all elements in use. */
+#define SBRDEC_SKIP_QMF_ANA                                               \
+  (1 << 21) /* Flag indicating that the input data is provided in the QMF \
+               domain. */
+#define SBRDEC_SKIP_QMF_SYN                                                \
+  (1 << 22) /* Flag indicating that the output data is exported in the QMF \
+               domain. */
+
+#define SBRDEC_HDR_STAT_RESET 1
 #define SBRDEC_HDR_STAT_UPDATE 2
 
 typedef struct {
-  UCHAR ampResolution;       /*!< Amplitude resolution of envelope values (0: 1.5dB, 1: 3dB) */
-  UCHAR xover_band;          /*!< Start index in #v_k_master[] used for dynamic crossover frequency */
-  UCHAR sbr_preprocessing;   /*!< SBR prewhitening flag. */
+  UCHAR ampResolution; /*!< Amplitude resolution of envelope values (0: 1.5dB,
+                          1: 3dB) */
+  UCHAR
+  xover_band; /*!< Start index in #v_k_master[] used for dynamic crossover
+                 frequency */
+  UCHAR sbr_preprocessing; /*!< SBR prewhitening flag. */
+  UCHAR pvc_mode;          /*!< Predictive vector coding mode */
 } SBR_HEADER_DATA_BS_INFO;
 
 typedef struct {
   /* Changes in these variables causes a reset of the decoder */
-  UCHAR startFreq;           /*!< Index for SBR start frequency */
-  UCHAR stopFreq;            /*!< Index for SBR highest frequency */
-  UCHAR freqScale;           /*!< 0: linear scale,  1-3 logarithmic scales */
-  UCHAR alterScale;          /*!< Flag for coarser frequency resolution */
-  UCHAR noise_bands;         /*!< Noise bands per octave, read from bitstream*/
+  UCHAR startFreq;   /*!< Index for SBR start frequency */
+  UCHAR stopFreq;    /*!< Index for SBR highest frequency */
+  UCHAR freqScale;   /*!< 0: linear scale,  1-3 logarithmic scales */
+  UCHAR alterScale;  /*!< Flag for coarser frequency resolution */
+  UCHAR noise_bands; /*!< Noise bands per octave, read from bitstream*/
 
   /* don't require reset */
-  UCHAR limiterBands;        /*!< Index for number of limiter bands per octave */
-  UCHAR limiterGains;        /*!< Index to select gain limit */
-  UCHAR interpolFreq;        /*!< Select gain calculation method (1: per QMF channel, 0: per SBR band) */
-  UCHAR smoothingLength;     /*!< Smoothing of gains over time (0: on  1: off) */
+  UCHAR limiterBands; /*!< Index for number of limiter bands per octave */
+  UCHAR limiterGains; /*!< Index to select gain limit */
+  UCHAR interpolFreq; /*!< Select gain calculation method (1: per QMF channel,
+                         0: per SBR band) */
+  UCHAR smoothingLength; /*!< Smoothing of gains over time (0: on  1: off) */
 
 } SBR_HEADER_DATA_BS;
 
-typedef struct
-{
-  SBR_SYNC_STATE syncState;    /*!< The current initialization status of the header */
-
-  UCHAR status;                /*!< Flags field used for signaling a reset right before the processing starts and an update from config (e.g. ASC). */
-  UCHAR frameErrorFlag;        /*!< Frame data valid flag. CAUTION: This variable will be overwritten by the flag stored in the element structure.
-                                    This is necessary because of the frame delay. There it might happen that different slots use the same header. */
+typedef struct {
+  SBR_SYNC_STATE
+  syncState; /*!< The current initialization status of the header */
+
+  UCHAR status; /*!< Flags field used for signaling a reset right before the
+                   processing starts and an update from config (e.g. ASC). */
+  UCHAR
+  frameErrorFlag; /*!< Frame data valid flag. CAUTION: This variable will be
+                     overwritten by the flag stored in the element
+                     structure. This is necessary because of the frame
+                     delay. There it might happen that different slots use
+                     the same header. */
   UCHAR numberTimeSlots;       /*!< AAC: 16,15 */
   UCHAR numberOfAnalysisBands; /*!< Number of QMF analysis bands */
   UCHAR timeStep;              /*!< Time resolution of SBR in QMF-slots */
-  UINT  sbrProcSmplRate;       /*!< SBR processing sampling frequency (!= OutputSamplingRate)
-                                     (always: CoreSamplingRate * UpSamplingFactor; even in single rate mode) */
+  UINT
+      sbrProcSmplRate; /*!< SBR processing sampling frequency (!=
+                          OutputSamplingRate)        (always: CoreSamplingRate *
+                          UpSamplingFactor; even in single rate mode) */
 
-  SBR_HEADER_DATA_BS      bs_data;  /*!< current SBR header. */
-  SBR_HEADER_DATA_BS_INFO bs_info;  /*!< SBR info. */
+  SBR_HEADER_DATA_BS bs_data;      /*!< current SBR header. */
+  SBR_HEADER_DATA_BS bs_dflt;      /*!< Default sbr header. */
+  SBR_HEADER_DATA_BS_INFO bs_info; /*!< SBR info. */
 
-  FREQ_BAND_DATA freqBandData;  /*!< Pointer to struct #FREQ_BAND_DATA */
-}
-SBR_HEADER_DATA;
+  FREQ_BAND_DATA freqBandData; /*!< Pointer to struct #FREQ_BAND_DATA */
+  UCHAR pvcIDprev;
+} SBR_HEADER_DATA;
 
 typedef SBR_HEADER_DATA *HANDLE_SBR_HEADER_DATA;
 
+typedef struct {
+  UCHAR frameClass;                 /*!< Select grid type */
+  UCHAR nEnvelopes;                 /*!< Number of envelopes */
+  UCHAR borders[MAX_ENVELOPES + 1]; /*!< Envelope borders (in SBR-timeslots,
+                                       e.g. mp3PRO: 0..11) */
+  UCHAR freqRes[MAX_ENVELOPES];     /*!< Frequency resolution for each envelope
+                                       (0=low, 1=high) */
+  SCHAR tranEnv;                    /*!< Transient envelope, -1 if none */
+  UCHAR nNoiseEnvelopes;            /*!< Number of noise envelopes */
+  UCHAR
+  bordersNoise[MAX_NOISE_ENVELOPES + 1]; /*!< borders of noise envelopes */
+  UCHAR pvcBorders[MAX_PVC_ENVELOPES + 1];
+  UCHAR noisePosition;
+  UCHAR varLength;
+} FRAME_INFO;
 
-typedef struct
-{
-  UCHAR frameClass;               /*!< Select grid type */
-  UCHAR nEnvelopes;               /*!< Number of envelopes */
-  UCHAR borders[MAX_ENVELOPES+1]; /*!< Envelope borders (in SBR-timeslots, e.g. mp3PRO: 0..11) */
-  UCHAR freqRes[MAX_ENVELOPES];   /*!< Frequency resolution for each envelope (0=low, 1=high) */
-  SCHAR  tranEnv;                 /*!< Transient envelope, -1 if none */
-  UCHAR nNoiseEnvelopes;          /*!< Number of noise envelopes */
-  UCHAR bordersNoise[MAX_NOISE_ENVELOPES+1];/*!< borders of noise envelopes */
-}
-FRAME_INFO;
-
-
-typedef struct
-{
-  FIXP_SGL sfb_nrg_prev[MAX_FREQ_COEFFS];    /*!< Previous envelope (required for differential-coded values) */
-  FIXP_SGL prevNoiseLevel[MAX_NOISE_COEFFS]; /*!< Previous noise envelope (required for differential-coded values) */
-  COUPLING_MODE coupling;                    /*!< Stereo-mode of previous frame */
-  INVF_MODE sbr_invf_mode[MAX_INVF_BANDS];   /*!< Previous strength of filtering in transposer */
-  UCHAR ampRes;                              /*!< Previous amplitude resolution (0: 1.5dB, 1: 3dB) */
-  UCHAR stopPos;                             /*!< Position in time where last envelope ended */
-  UCHAR frameErrorFlag;                      /*!< Previous frame status */
-}
-SBR_PREV_FRAME_DATA;
+typedef struct {
+  FIXP_SGL sfb_nrg_prev[MAX_FREQ_COEFFS]; /*!< Previous envelope (required for
+                                             differential-coded values) */
+  FIXP_SGL
+  prevNoiseLevel[MAX_NOISE_COEFFS]; /*!< Previous noise envelope (required
+                                       for differential-coded values) */
+  COUPLING_MODE coupling;           /*!< Stereo-mode of previous frame */
+  INVF_MODE sbr_invf_mode[MAX_INVF_BANDS]; /*!< Previous strength of filtering
+                                              in transposer */
+  UCHAR ampRes;         /*!< Previous amplitude resolution (0: 1.5dB, 1: 3dB) */
+  UCHAR stopPos;        /*!< Position in time where last envelope ended */
+  UCHAR frameErrorFlag; /*!< Previous frame status */
+  UCHAR prevSbrPitchInBins; /*!< Previous frame pitchInBins */
+  FRAME_INFO prevFrameInfo;
+} SBR_PREV_FRAME_DATA;
 
 typedef SBR_PREV_FRAME_DATA *HANDLE_SBR_PREV_FRAME_DATA;
 
+typedef struct {
+  int nScaleFactors; /*!< total number of scalefactors in frame */
 
-typedef struct
-{
-  int nScaleFactors;                    /*!< total number of scalefactors in frame */
-
-  FRAME_INFO frameInfo;                 /*!< time grid for current frame */
-  UCHAR domain_vec[MAX_ENVELOPES];      /*!< Bitfield containing direction of delta-coding for each envelope (0:frequency, 1:time) */
-  UCHAR domain_vec_noise[MAX_NOISE_ENVELOPES]; /*!< Same as above, but for noise envelopes */
+  FRAME_INFO frameInfo;            /*!< time grid for current frame */
+  UCHAR domain_vec[MAX_ENVELOPES]; /*!< Bitfield containing direction of
+                                      delta-coding for each envelope
+                                      (0:frequency, 1:time) */
+  UCHAR domain_vec_noise
+      [MAX_NOISE_ENVELOPES]; /*!< Same as above, but for noise envelopes */
 
-  INVF_MODE sbr_invf_mode[MAX_INVF_BANDS]; /*!< Strength of filtering in transposer */
-  COUPLING_MODE coupling;                  /*!< Stereo-mode */
-  int ampResolutionCurrentFrame;           /*!< Amplitude resolution of envelope values (0: 1.5dB, 1: 3dB) */
+  INVF_MODE
+  sbr_invf_mode[MAX_INVF_BANDS]; /*!< Strength of filtering in transposer */
+  COUPLING_MODE coupling;        /*!< Stereo-mode */
+  int ampResolutionCurrentFrame; /*!< Amplitude resolution of envelope values
+                                    (0: 1.5dB, 1: 3dB) */
 
-  UCHAR addHarmonics[MAX_FREQ_COEFFS];     /*!< Flags for synthetic sine addition */
+  ULONG addHarmonics[ADD_HARMONICS_FLAGS_SIZE]; /*!< Flags for synthetic sine
+                                                   addition (aligned to MSB) */
 
   FIXP_SGL iEnvelope[MAX_NUM_ENVELOPE_VALUES];       /*!< Envelope data */
   FIXP_SGL sbrNoiseFloorLevel[MAX_NUM_NOISE_VALUES]; /*!< Noise envelope data */
-}
-SBR_FRAME_DATA;
+  UCHAR iTESactive; /*!< One flag for each envelope to enable USAC inter-TES */
+  UCHAR
+  interTempShapeMode[MAX_ENVELOPES]; /*!< USAC inter-TES:
+                                        bs_inter_temp_shape_mode[ch][env]
+                                        value */
+  UCHAR pvcID[PVC_NTIMESLOT];        /*!< One PVC ID value for each time slot */
+  UCHAR ns;
+  UCHAR sinusoidal_position;
+
+  UCHAR sbrPatchingMode;
+  UCHAR sbrOversamplingFlag;
+  UCHAR sbrPitchInBins;
+} SBR_FRAME_DATA;
 
 typedef SBR_FRAME_DATA *HANDLE_SBR_FRAME_DATA;
 
-void initSbrPrevFrameData (HANDLE_SBR_PREV_FRAME_DATA h_prev_data,
-                           int timeSlots);
+/*!
+\brief   Maps sampling frequencies to frequencies for which setup tables are
+available
 
+Maps arbitary sampling frequency to nearest neighbors for which setup tables
+are available (e.g. 25600 -> 24000).
+Used for startFreq calculation.
+The mapping is defined in 14496-3 (4.6.18.2.6), fs(SBR), and table 4.82
 
-int sbrGetSingleChannelElement (HANDLE_SBR_HEADER_DATA hHeaderData,
-                                HANDLE_SBR_FRAME_DATA  hFrameData,
-                                HANDLE_FDK_BITSTREAM   hBitBuf,
-                                HANDLE_PS_DEC hParametricStereoDec,
-                                const UINT             flags,
-                                const int              overlap
-                               );
+\return  mapped sampling frequency
+*/
+UINT sbrdec_mapToStdSampleRate(UINT fs,
+                               UINT isUsac); /*!< Output sampling frequency */
 
-int sbrGetChannelPairElement (HANDLE_SBR_HEADER_DATA hHeaderData,
-                              HANDLE_SBR_FRAME_DATA  hFrameDataLeft,
-                              HANDLE_SBR_FRAME_DATA  hFrameDataRight,
-                              HANDLE_FDK_BITSTREAM   hBitBuf,
-                              const UINT             flags,
-                              const int              overlap);
+void initSbrPrevFrameData(HANDLE_SBR_PREV_FRAME_DATA h_prev_data,
+                          int timeSlots);
+
+int sbrGetChannelElement(HANDLE_SBR_HEADER_DATA hHeaderData,
+                         HANDLE_SBR_FRAME_DATA hFrameDataLeft,
+                         HANDLE_SBR_FRAME_DATA hFrameDataRight,
+                         HANDLE_SBR_PREV_FRAME_DATA hFrameDataLeftPrev,
+                         UCHAR pvc_mode_last, HANDLE_FDK_BITSTREAM hBitBuf,
+                         HANDLE_PS_DEC hParametricStereoDec, const UINT flags,
+                         const int overlap);
 
 SBR_HEADER_STATUS
-sbrGetHeaderData (HANDLE_SBR_HEADER_DATA headerData,
-                  HANDLE_FDK_BITSTREAM   hBitBuf,
-                  const UINT             flags,
-                  const int              fIsSbrData);
+sbrGetHeaderData(HANDLE_SBR_HEADER_DATA headerData,
+                 HANDLE_FDK_BITSTREAM hBitBuf, const UINT flags,
+                 const int fIsSbrData, const UCHAR configMode);
 
 /*!
   \brief     Initialize SBR header data
@@ -314,11 +404,12 @@ sbrGetHeaderData (HANDLE_SBR_HEADER_DATA headerData,
   depending on the core codec.
 */
 SBR_ERROR
-initHeaderData (
-        HANDLE_SBR_HEADER_DATA  hHeaderData,
-        const int               sampleRateIn,
-        const int               sampleRateOut,
-        const int               samplesPerFrame,
-        const UINT              flags
-        );
+initHeaderData(HANDLE_SBR_HEADER_DATA hHeaderData, const int sampleRateIn,
+               const int sampleRateOut, const INT downscaleFactor,
+               const int samplesPerFrame, const UINT flags,
+               const int setDefaultHdr);
 #endif
+
+/* Convert headroom bits to exponent */
+#define SCALE2EXP(s) (15 - (s))
+#define EXP2SCALE(e) (15 - (e))