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

diff --git a/libSBRdec/include/sbrdecoder.h b/libSBRdec/include/sbrdecoder.h
index 3bb9ba3..cc55572 100644
--- a/libSBRdec/include/sbrdecoder.h
+++ b/libSBRdec/include/sbrdecoder.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,25 +90,28 @@ Am Wolfsmantel 33
 
 www.iis.fraunhofer.de/amm
 amm-info@iis.fraunhofer.de
------------------------------------------------------------------------------------------------------------ */
+----------------------------------------------------------------------------- */
 
-/************************  Fraunhofer IIS SBR decoder library ******************
+/**************************** SBR decoder library ******************************
 
    Author(s):
+
    Description: SBR decoder front-end prototypes and definitions.
 
-******************************************************************************/
+*******************************************************************************/
 
-#ifndef __SBRDECODER_H
-#define __SBRDECODER_H
+#ifndef SBRDECODER_H
+#define SBRDECODER_H
 
 #include "common_fix.h"
 
 #include "FDK_bitstream.h"
 #include "FDK_audio.h"
 
+#include "FDK_qmf_domain.h"
 
-#define SBR_DEBUG_EXTHLP "\
+#define SBR_DEBUG_EXTHLP \
+  "\
 --- SBR ---\n\
     0x00000010 Ancillary data and SBR-Header\n\
     0x00000020 SBR-Side info\n\
@@ -110,64 +124,92 @@ amm-info@iis.fraunhofer.de
 "
 
 /* Capability flags */
-#define CAPF_SBR_LP          0x00000001   /*!< Flag indicating library's capability of Low Power mode.            */
-#define CAPF_SBR_HQ          0x00000002   /*!< Flag indicating library's capability of High Quality mode.         */
-#define CAPF_SBR_DRM_BS      0x00000004   /*!< Flag indicating library's capability to decode DRM SBR data.       */
-#define CAPF_SBR_CONCEALMENT 0x00000008   /*!< Flag indicating library's capability to conceal erroneous frames.  */
-#define CAPF_SBR_DRC         0x00000010   /*!< Flag indicating library's capability for Dynamic Range Control.    */
-#define CAPF_SBR_PS_MPEG     0x00000020   /*!< Flag indicating library's capability to do MPEG Parametric Stereo. */
-#define CAPF_SBR_PS_DRM      0x00000040   /*!< Flag indicating library's capability to do DRM Parametric Stereo.  */
-
-typedef enum
-{
-  SBRDEC_OK = 0,                       /*!< All fine.                                                       */
-  /* SBRDEC_CONCEAL,                                                                                        */
-  /* SBRDEC_NOSYNCH,                                                                                        */
-  /* SBRDEC_ILLEGAL_PROGRAM,                                                                                */
-  /* SBRDEC_ILLEGAL_TAG,                                                                                    */
-  /* SBRDEC_ILLEGAL_CHN_CONFIG,                                                                             */
-  /* SBRDEC_ILLEGAL_SECTION,                                                                                */
-  /* SBRDEC_ILLEGAL_SCFACTORS,                                                                              */
-  /* SBRDEC_ILLEGAL_PULSE_DATA,                                                                             */
-  /* SBRDEC_MAIN_PROFILE_NOT_IMPLEMENTED,                                                                   */
-  /* SBRDEC_GC_NOT_IMPLEMENTED,                                                                             */
-  /* SBRDEC_ILLEGAL_PLUS_ELE_ID,                                                                            */
-  SBRDEC_CREATE_ERROR,                 /*!<                                                                 */
-  SBRDEC_NOT_INITIALIZED,              /*!<                                                                 */
-  SBRDEC_MEM_ALLOC_FAILED,             /*!< Memory allocation failed. Probably not enough memory available. */
-  SBRDEC_PARSE_ERROR,                  /*!<                                                                 */
-  SBRDEC_UNSUPPORTED_CONFIG,           /*!<                                                                 */
-  SBRDEC_SET_PARAM_FAIL                /*!<                                                                 */
+#define CAPF_SBR_LP \
+  0x00000001 /*!< Flag indicating library's capability of Low Power mode. */
+#define CAPF_SBR_HQ                                                          \
+  0x00000002 /*!< Flag indicating library's capability of High Quality mode. \
+              */
+#define CAPF_SBR_DRM_BS                                                        \
+  0x00000004 /*!< Flag indicating library's capability to decode DRM SBR data. \
+              */
+#define CAPF_SBR_CONCEALMENT                                                \
+  0x00000008 /*!< Flag indicating library's capability to conceal erroneous \
+                frames.          */
+#define CAPF_SBR_DRC                                                     \
+  0x00000010 /*!< Flag indicating library's capability for Dynamic Range \
+                Control.            */
+#define CAPF_SBR_PS_MPEG                                                     \
+  0x00000020 /*!< Flag indicating library's capability to do MPEG Parametric \
+                Stereo.         */
+#define CAPF_SBR_PS_DRM                                                     \
+  0x00000040 /*!< Flag indicating library's capability to do DRM Parametric \
+                Stereo.          */
+#define CAPF_SBR_ELD_DOWNSCALE                                               \
+  0x00000080 /*!< Flag indicating library's capability to do ELD decoding in \
+                downscaled mode */
+#define CAPF_SBR_HBEHQ                                                   \
+  0x00000100 /*!< Flag indicating library's capability to do HQ Harmonic \
+                transposing         */
+
+typedef enum {
+  SBRDEC_OK = 0, /*!< All fine. */
+  /* SBRDEC_CONCEAL, */
+  /* SBRDEC_NOSYNCH, */
+  /* SBRDEC_ILLEGAL_PROGRAM, */
+  /* SBRDEC_ILLEGAL_TAG, */
+  /* SBRDEC_ILLEGAL_CHN_CONFIG, */
+  /* SBRDEC_ILLEGAL_SECTION, */
+  /* SBRDEC_ILLEGAL_SCFACTORS, */
+  /* SBRDEC_ILLEGAL_PULSE_DATA, */
+  /* SBRDEC_MAIN_PROFILE_NOT_IMPLEMENTED, */
+  /* SBRDEC_GC_NOT_IMPLEMENTED, */
+  /* SBRDEC_ILLEGAL_PLUS_ELE_ID, */
+  SBRDEC_INVALID_ARGUMENT,   /*!<   */
+  SBRDEC_CREATE_ERROR,       /*!<       */
+  SBRDEC_NOT_INITIALIZED,    /*!<    */
+  SBRDEC_MEM_ALLOC_FAILED,   /*!< Memory allocation failed. Probably not enough
+                                memory available. */
+  SBRDEC_PARSE_ERROR,        /*!<        */
+  SBRDEC_UNSUPPORTED_CONFIG, /*!< */
+  SBRDEC_SET_PARAM_FAIL,     /*!<     */
+  SBRDEC_OUTPUT_BUFFER_TOO_SMALL /*!< */
 } SBR_ERROR;
 
-typedef enum
-{
-  SBR_SYSTEM_BITSTREAM_DELAY,          /*!< System: Switch to enable an additional SBR bitstream delay of one frame. */
-  SBR_QMF_MODE,                        /*!< Set QMF mode, either complex or low power. */
-  SBR_LD_QMF_TIME_ALIGN,               /*!< Set QMF type, either LD-MPS or CLDFB. Relevant for ELD streams only. */
-  SBR_FLUSH_DATA,                      /*!< Set internal state to flush the decoder with the next process call. */
-  SBR_CLEAR_HISTORY,                   /*!< Clear all internal states (delay lines, QMF states, ...). */
-  SBR_BS_INTERRUPTION                  /*!< Signal bit stream interruption. Value is ignored. */
+typedef enum {
+  SBR_SYSTEM_BITSTREAM_DELAY, /*!< System: Switch to enable an additional SBR
+                                 bitstream delay of one frame. */
+  SBR_QMF_MODE,               /*!< Set QMF mode, either complex or low power. */
+  SBR_LD_QMF_TIME_ALIGN, /*!< Set QMF type, either LD-MPS or CLDFB. Relevant for
+                            ELD streams only. */
+  SBR_FLUSH_DATA,     /*!< Set internal state to flush the decoder with the next
+                         process call. */
+  SBR_CLEAR_HISTORY,  /*!< Clear all internal states (delay lines, QMF states,
+                         ...). */
+  SBR_BS_INTERRUPTION /*!< Signal bit stream interruption. Value is ignored. */
+  ,
+  SBR_SKIP_QMF /*!< Enable skipping of QMF step: 1 skip analysis, 2 skip
+                  synthesis */
 } SBRDEC_PARAM;
 
 typedef struct SBR_DECODER_INSTANCE *HANDLE_SBRDECODER;
 
-
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
-
 /**
- * \brief        Allocates and initializes one SBR decoder instance.
- * \param pSelf  Pointer to where a SBR decoder handle is copied into.
- * \return       Error code.
+ * \brief             Allocates and initializes one SBR decoder instance.
+ * \param pSelf       Pointer to where a SBR decoder handle is copied into.
+ * \param pQmfDomain  Pointer to QMF domain data structure.
+ *
+ * \return            Error code.
  */
-SBR_ERROR sbrDecoder_Open ( HANDLE_SBRDECODER *pSelf );
+SBR_ERROR sbrDecoder_Open(HANDLE_SBRDECODER *pSelf,
+                          HANDLE_FDK_QMF_DOMAIN pQmfDomain);
 
 /**
- * \brief  Initialize a SBR decoder runtime instance. Must be called before decoding starts.
+ * \brief  Initialize a SBR decoder runtime instance. Must be called before
+ * decoding starts.
  *
  * \param self             Handle to a SBR decoder instance.
  * \param sampleRateIn     Input samplerate of the SBR decoder instance.
@@ -175,40 +217,52 @@ SBR_ERROR sbrDecoder_Open ( HANDLE_SBRDECODER *pSelf );
  * \param samplesPerFrame  Number of samples per frames.
  * \param coreCodec        Audio Object Type (AOT) of the core codec.
  * \param elementID        Table with MPEG-4 element Ids in canonical order.
- * \param forceReset       Flag that enforces a complete decoder reset.
+ * \param elementIndex     SBR element index
+ * \param harmonicSBR
+ * \param stereoConfigIndex
+ * \param downscaleFactor  ELD downscale factor
+ * \param configMode       Table with MPEG-4 element Ids in canonical order.
+ * \param configChanged    Flag that enforces a complete decoder reset.
  *
  * \return  Error code.
  */
-SBR_ERROR sbrDecoder_InitElement (
-        HANDLE_SBRDECODER       self,
-        const int               sampleRateIn,
-        const int               sampleRateOut,
-        const int               samplesPerFrame,
-        const AUDIO_OBJECT_TYPE coreCodec,
-        const MP4_ELEMENT_ID    elementID,
-        const int               elementIndex
-        );
+SBR_ERROR sbrDecoder_InitElement(
+    HANDLE_SBRDECODER self, const int sampleRateIn, const int sampleRateOut,
+    const int samplesPerFrame, const AUDIO_OBJECT_TYPE coreCodec,
+    const MP4_ELEMENT_ID elementID, const int elementIndex,
+    const UCHAR harmonicSBR, const UCHAR stereoConfigIndex,
+    const UCHAR configMode, UCHAR *configChanged, const INT downscaleFactor);
+
+/**
+ * \brief Free config dependent SBR memory.
+ * \param self SBR decoder instance handle
+ */
+SBR_ERROR sbrDecoder_FreeMem(HANDLE_SBRDECODER *self);
 
 /**
  * \brief pass out of band SBR header to SBR decoder
  *
  * \param self         Handle to a SBR decoder instance.
  * \param hBs          bit stream handle data source.
+ * \param sampleRateIn SBR input sampling rate
+ * \param sampleRateOut SBR output sampling rate
+ * \param samplesPerFrame frame length
  * \param elementID    SBR element ID.
  * \param elementIndex SBR element index.
+ * \param harmonicSBR
+ * \param stereoConfigIndex
+ * \param downscaleFactor  ELD downscale factor
  *
  * \return  Error code.
  */
-INT sbrDecoder_Header (
-        HANDLE_SBRDECODER       self,
-        HANDLE_FDK_BITSTREAM    hBs,
-        const INT sampleRateIn,
-        const INT sampleRateOut,
-        const INT samplesPerFrame,
-        const AUDIO_OBJECT_TYPE coreCodec,
-        const MP4_ELEMENT_ID    elementID,
-        const INT               elementIndex
-        );
+INT sbrDecoder_Header(HANDLE_SBRDECODER self, HANDLE_FDK_BITSTREAM hBs,
+                      const INT sampleRateIn, const INT sampleRateOut,
+                      const INT samplesPerFrame,
+                      const AUDIO_OBJECT_TYPE coreCodec,
+                      const MP4_ELEMENT_ID elementID, const INT elementIndex,
+                      const UCHAR harmonicSBR, const UCHAR stereoConfigIndex,
+                      const UCHAR configMode, UCHAR *configChanged,
+                      const INT downscaleFactor);
 
 /**
  * \brief        Set a parameter of the SBR decoder runtime instance.
@@ -217,32 +271,32 @@ INT sbrDecoder_Header (
  * \param value  New parameter value.
  * \return       Error code.
  */
-SBR_ERROR sbrDecoder_SetParam ( HANDLE_SBRDECODER   self,
-                                const SBRDEC_PARAM  param,
-                                const INT           value );
+SBR_ERROR sbrDecoder_SetParam(HANDLE_SBRDECODER self, const SBRDEC_PARAM param,
+                              const INT value);
 
 /**
  * \brief  Feed DRC channel data into a SBR decoder runtime instance.
  *
  * \param self                    SBR decoder handle.
- * \param ch                      Channel number to which the DRC data is associated to.
+ * \param ch                      Channel number to which the DRC data is
+ * associated to.
  * \param numBands                Number of DRC bands.
- * \param pNextFact_mag           Pointer to a table with the DRC factor magnitudes.
+ * \param pNextFact_mag           Pointer to a table with the DRC factor
+ * magnitudes.
  * \param nextFact_exp            Exponent for all DRC factors.
  * \param drcInterpolationScheme  DRC interpolation scheme.
- * \param winSequence             Window sequence from core coder (eight short or one long window).
- * \param pBandTop                Pointer to a table with the top borders for all DRC bands.
+ * \param winSequence             Window sequence from core coder (eight short
+ * or one long window).
+ * \param pBandTop                Pointer to a table with the top borders for
+ * all DRC bands.
  *
  * \return  Error code.
  */
-SBR_ERROR sbrDecoder_drcFeedChannel ( HANDLE_SBRDECODER  self,
-                                      INT                ch,
-                                      UINT               numBands,
-                                      FIXP_DBL          *pNextFact_mag,
-                                      INT                nextFact_exp,
-                                      SHORT              drcInterpolationScheme,
-                                      UCHAR              winSequence,
-                                      USHORT            *pBandTop );
+SBR_ERROR sbrDecoder_drcFeedChannel(HANDLE_SBRDECODER self, INT ch,
+                                    UINT numBands, FIXP_DBL *pNextFact_mag,
+                                    INT nextFact_exp,
+                                    SHORT drcInterpolationScheme,
+                                    UCHAR winSequence, USHORT *pBandTop);
 
 /**
  * \brief  Disable SBR DRC for a certain channel.
@@ -252,42 +306,41 @@ SBR_ERROR sbrDecoder_drcFeedChannel ( HANDLE_SBRDECODER  self,
  *
  * \return  None.
  */
-void sbrDecoder_drcDisable ( HANDLE_SBRDECODER  self,
-                             INT                ch );
-
+void sbrDecoder_drcDisable(HANDLE_SBRDECODER self, INT ch);
 
 /**
- * \brief  Parse one SBR element data extension data block. The bit stream position will
- *         be placed at the end of the SBR payload block. The remaining bits will be returned
- *         into *count if a payload length is given (byPayLen > 0). If no SBR payload length is
- *         given (bsPayLen < 0) then the bit stream position on return will be random after this
- *         function call in case of errors, and any further decoding will be completely pointless.
- *         This function accepts either normal ordered SBR data or reverse ordered DRM SBR data.
+ * \brief  Parse one SBR element data extension data block. The bit stream
+ * position will be placed at the end of the SBR payload block. The remaining
+ * bits will be returned into *count if a payload length is given
+ * (byPayLen > 0). If no SBR payload length is given (bsPayLen < 0) then
+ * the bit stream position on return will be random after this function
+ * call in case of errors, and any further decoding will be completely
+ * pointless. This function accepts either normal ordered SBR data or reverse
+ * ordered DRM SBR data.
  *
  * \param self           SBR decoder handle.
  * \param hBs            Bit stream handle as data source.
- * \param count          Pointer to an integer where the amount of parsed SBR payload bits is stored into.
- * \param bsPayLen       If > 0 this value is the SBR payload length. If < 0, the SBR payload length is unknown.
+ * \param count          Pointer to an integer where the amount of parsed SBR
+ * payload bits is stored into.
+ * \param bsPayLen       If > 0 this value is the SBR payload length. If < 0,
+ * the SBR payload length is unknown.
  * \param flags          CRC flag (0: EXT_SBR_DATA; 1: EXT_SBR_DATA_CRC)
  * \param prev_element   Previous MPEG-4 element ID.
  * \param element_index  Index of the current element.
+ * \param acFlags        Audio codec flags
  *
  * \return  Error code.
  */
-SBR_ERROR sbrDecoder_Parse (
-        HANDLE_SBRDECODER  self,
-        HANDLE_FDK_BITSTREAM hBs,
-        int *count,
-        int  bsPayLen,
-        int  crcFlag,
-        MP4_ELEMENT_ID prev_element,
-        int element_index,
-        int fGlobalIndependencyFlag
-        );
+SBR_ERROR sbrDecoder_Parse(HANDLE_SBRDECODER self, HANDLE_FDK_BITSTREAM hBs,
+                           UCHAR *pDrmBsBuffer, USHORT drmBsBufferSize,
+                           int *count, int bsPayLen, int crcFlag,
+                           MP4_ELEMENT_ID prev_element, int element_index,
+                           UINT acFlags, UINT acElFlags[]);
 
 /**
- * \brief  This function decodes the given SBR bitstreams and applies SBR to the given time data.
- * 
+ * \brief  This function decodes the given SBR bitstreams and applies SBR to the
+ * given time data.
+ *
  * SBR-processing works InPlace. I.e. the calling function has to provide
  * a time domain buffer timeData which can hold the completely decoded
  * result.
@@ -297,48 +350,49 @@ SBR_ERROR sbrDecoder_Parse (
  *
  * \param self            Handle of an open SBR decoder instance.
  * \param hSbrBs          SBR Bitstream handle.
- * \param timeData        Pointer to input and finally upsampled output data.
- * \param numChannels     Pointer to a buffer holding the number of channels in time data buffer.
+ * \param input           Pointer to input data.
+ * \param timeData        Pointer to upsampled output data.
+ * \param timeDataSize    Size of timeData.
+ * \param numChannels     Pointer to a buffer holding the number of channels in
+ * time data buffer.
  * \param sampleRate      Output samplerate.
  * \param channelMapping  Channel mapping indices.
- * \param interleaved     Flag indicating if time data is stored interleaved (1: Interleaved time data, 0: non-interleaved timedata).
- * \param coreDecodedOk   Flag indicating if the core decoder did not find any error (0: core decoder found errors, 1: no errors).
- * \param psDecoded       Pointer to a buffer holding a flag. Input: PS is possible, Output: PS has been rendered.
+ * \param coreDecodedOk   Flag indicating if the core decoder did not find any
+ * error (0: core decoder found errors, 1: no errors).
+ * \param psDecoded       Pointer to a buffer holding a flag. Input: PS is
+ * possible, Output: PS has been rendered.
  *
  * \return  Error code.
  */
-SBR_ERROR sbrDecoder_Apply ( HANDLE_SBRDECODER    self,
-                             INT_PCM             *timeData,
-                             int                 *numChannels,
-                             int                 *sampleRate,
-                             const UCHAR          channelMapping[(8)],
-                             const int            interleaved,
-                             const int            coreDecodedOk,
-                             UCHAR               *psDecoded );
-
+SBR_ERROR sbrDecoder_Apply(HANDLE_SBRDECODER self, INT_PCM *input,
+                           INT_PCM *timeData, const int timeDataSize,
+                           int *numChannels, int *sampleRate,
+                           const FDK_channelMapDescr *const mapDescr,
+                           const int mapIdx, const int coreDecodedOk,
+                           UCHAR *psDecoded);
 
 /**
  * \brief       Close SBR decoder instance and free memory.
  * \param self  SBR decoder handle.
  * \return      Error Code.
  */
-SBR_ERROR sbrDecoder_Close ( HANDLE_SBRDECODER *self );
-
+SBR_ERROR sbrDecoder_Close(HANDLE_SBRDECODER *self);
 
 /**
  * \brief       Get SBR decoder library information.
- * \param info  Pointer to a LIB_INFO struct, where library information is written to.
- * \return      0 on success, -1 if invalid handle or if no free element is available to write information to.
+ * \param info  Pointer to a LIB_INFO struct, where library information is
+ * written to.
+ * \return      0 on success, -1 if invalid handle or if no free element is
+ * available to write information to.
  */
-INT sbrDecoder_GetLibInfo( LIB_INFO *info );    
+INT sbrDecoder_GetLibInfo(LIB_INFO *info);
 
 /**
  * \brief       Determine the modules output signal delay in samples.
  * \param self  SBR decoder handle.
  * \return      The number of samples signal delay added by the module.
  */
-UINT sbrDecoder_GetDelay( const HANDLE_SBRDECODER self );
-
+UINT sbrDecoder_GetDelay(const HANDLE_SBRDECODER self);
 
 #ifdef __cplusplus
 }