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, 395 insertions, 325 deletions

diff --git a/libFDK/include/FDK_bitstream.h b/libFDK/include/FDK_bitstream.h
index fc8d7de..49eeeaf 100644
--- a/libFDK/include/FDK_bitstream.h
+++ b/libFDK/include/FDK_bitstream.h
@@ -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,19 +90,18 @@ Am Wolfsmantel 33
 
 www.iis.fraunhofer.de/amm
 amm-info@iis.fraunhofer.de
------------------------------------------------------------------------------------------------------------ */
+----------------------------------------------------------------------------- */
 
-/***************************  Fraunhofer IIS FDK Tools  ***********************
+/******************* Library for basic calculation routines ********************
 
    Author(s):   M. Lohwasser
-   Description: bitstream interface to bitbuffer routines
 
-******************************************************************************/
-
-#ifndef __FDK_BITSTREAM_H__
-#define __FDK_BITSTREAM_H__
+   Description: bitstream interface to bitbuffer routines
 
+*******************************************************************************/
 
+#ifndef FDK_BITSTREAM_H
+#define FDK_BITSTREAM_H
 
 #include "FDK_bitbuffer.h"
 #include "machine_type.h"
@@ -100,21 +110,18 @@ amm-info@iis.fraunhofer.de
 
 #define CACHE_BITS 32
 
-typedef enum {
-    BS_READER,
-    BS_WRITER
-} FDK_BS_CFG;
+#define BUFSIZE_DUMMY_VALUE MAX_BUFSIZE_BYTES
 
+typedef enum { BS_READER, BS_WRITER } FDK_BS_CFG;
 
-typedef struct
-{
-  UINT       CacheWord ;
-  UINT       BitsInCache ;
+typedef struct {
+  UINT CacheWord;
+  UINT BitsInCache;
   FDK_BITBUF hBitBuf;
-  UINT       ConfigCache ;
+  UINT ConfigCache;
 } FDK_BITSTREAM;
 
-typedef FDK_BITSTREAM* HANDLE_FDK_BITSTREAM;
+typedef FDK_BITSTREAM *HANDLE_FDK_BITSTREAM;
 
 /**
  * \brief CreateBitStream Function.
@@ -122,50 +129,48 @@ typedef FDK_BITSTREAM* HANDLE_FDK_BITSTREAM;
  * Create and initialize bitstream with extern allocated buffer.
  *
  * \param pBuffer  Pointer to BitBuffer array.
- * \param bufSize  Length of BitBuffer array. (awaits size 2^n)
+ * \param bufSize  Length of BitBuffer array. (awaits size 2^n and <=
+ * MAX_BUFSIZE_BYTES)
  * \param config   Initialize BitStream as Reader or Writer.
  */
 FDK_INLINE
-HANDLE_FDK_BITSTREAM FDKcreateBitStream (UCHAR *pBuffer,
-                                      UINT bufSize,
-                                      FDK_BS_CFG config = BS_READER)
-{
-  HANDLE_FDK_BITSTREAM hBitStream = (HANDLE_FDK_BITSTREAM) FDKcalloc(1, sizeof(FDK_BITSTREAM));
-  FDK_InitBitBuffer(&hBitStream->hBitBuf, pBuffer, bufSize, 0) ;
+HANDLE_FDK_BITSTREAM FDKcreateBitStream(UCHAR *pBuffer, UINT bufSize,
+                                        FDK_BS_CFG config = BS_READER) {
+  HANDLE_FDK_BITSTREAM hBitStream =
+      (HANDLE_FDK_BITSTREAM)FDKcalloc(1, sizeof(FDK_BITSTREAM));
+  if (hBitStream == NULL) return NULL;
+  FDK_InitBitBuffer(&hBitStream->hBitBuf, pBuffer, bufSize, 0);
 
   /* init cache */
-  hBitStream->CacheWord = hBitStream->BitsInCache = 0 ;
-  hBitStream->ConfigCache = config ;
+  hBitStream->CacheWord = hBitStream->BitsInCache = 0;
+  hBitStream->ConfigCache = config;
 
-  return hBitStream ;
+  return hBitStream;
 }
 
-
 /**
- * \brief Initialize BistreamBuffer. BitBuffer can point to filled BitBuffer array .
+ * \brief Initialize BistreamBuffer. BitBuffer can point to filled BitBuffer
+ * array .
  *
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
  * \param pBuffer    Pointer to BitBuffer array.
- * \param bufSize    Length of BitBuffer array. (awaits size 2^n)
+ * \param bufSize    Length of BitBuffer array in bytes. (awaits size 2^n and <=
+ * MAX_BUFSIZE_BYTES)
  * \param validBits  Number of valid BitBuffer filled Bits.
  * \param config     Initialize BitStream as Reader or Writer.
  * \return void
  */
 FDK_INLINE
-void FDKinitBitStream (HANDLE_FDK_BITSTREAM hBitStream,
-                       UCHAR *pBuffer,
-                       UINT bufSize,
-                       UINT validBits,
-                       FDK_BS_CFG config = BS_READER)
-{
-  FDK_InitBitBuffer(&hBitStream->hBitBuf, pBuffer, bufSize, validBits) ;
+void FDKinitBitStream(HANDLE_FDK_BITSTREAM hBitStream, UCHAR *pBuffer,
+                      UINT bufSize, UINT validBits,
+                      FDK_BS_CFG config = BS_READER) {
+  FDK_InitBitBuffer(&hBitStream->hBitBuf, pBuffer, bufSize, validBits);
 
   /* init cache */
-  hBitStream->CacheWord = hBitStream->BitsInCache = 0 ;
-  hBitStream->ConfigCache = config ;
+  hBitStream->CacheWord = hBitStream->BitsInCache = 0;
+  hBitStream->ConfigCache = config;
 }
 
-
 /**
  * \brief ResetBitbuffer Function. Reset states in BitBuffer and Cache.
  *
@@ -173,183 +178,206 @@ void FDKinitBitStream (HANDLE_FDK_BITSTREAM hBitStream,
  * \param config     Initialize BitStream as Reader or Writer.
  * \return void
  */
-FDK_INLINE void FDKresetBitbuffer( HANDLE_FDK_BITSTREAM hBitStream, FDK_BS_CFG config = BS_READER)
-{
-  FDK_ResetBitBuffer( &hBitStream->hBitBuf ) ;
+FDK_INLINE void FDKresetBitbuffer(HANDLE_FDK_BITSTREAM hBitStream,
+                                  FDK_BS_CFG config = BS_READER) {
+  FDK_ResetBitBuffer(&hBitStream->hBitBuf);
 
   /* init cache */
-  hBitStream->CacheWord = hBitStream->BitsInCache = 0 ;
-  hBitStream->ConfigCache = config ;
+  hBitStream->CacheWord = hBitStream->BitsInCache = 0;
+  hBitStream->ConfigCache = config;
 }
 
-
 /** DeleteBitStream.
 
     Deletes the in Create Bitstream allocated BitStream and BitBuffer.
 */
-FDK_INLINE void FDKdeleteBitStream (HANDLE_FDK_BITSTREAM hBitStream)
-{
-  FDK_DeleteBitBuffer(&hBitStream->hBitBuf) ;
-  FDKfree(hBitStream) ;
+FDK_INLINE void FDKdeleteBitStream(HANDLE_FDK_BITSTREAM hBitStream) {
+  FDK_DeleteBitBuffer(&hBitStream->hBitBuf);
+  FDKfree(hBitStream);
 }
 
-
 /**
- * \brief ReadBits Function (forward). This function returns a number of sequential
- *        bits from the input bitstream.
+ * \brief ReadBits Function (forward). This function returns a number of
+ * sequential bits from the input bitstream.
  *
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
- * \param numberOfBits  The number of bits to be retrieved.
+ * \param numberOfBits  The number of bits to be retrieved. ( (0),1 <=
+ * numberOfBits <= 32)
  * \return the requested bits, right aligned
  * \return
  */
-#define OPTIMIZE_FDKREADBITS
 
 FDK_INLINE UINT FDKreadBits(HANDLE_FDK_BITSTREAM hBitStream,
-                        const UINT numberOfBits)
-{
-#ifdef noOPTIMIZE_FDKREADBITS
-  INT missingBits = numberOfBits - hBitStream->BitsInCache;
-  if (missingBits > 0)
-  {
-    UINT bits = hBitStream->CacheWord << missingBits;
-    hBitStream->CacheWord = FDK_get32 (&hBitStream->hBitBuf) ;
-    hBitStream->BitsInCache = CACHE_BITS - missingBits;
-    return ( bits | (hBitStream->CacheWord >> hBitStream->BitsInCache)) & BitMask[numberOfBits];
+                            const UINT numberOfBits) {
+  UINT bits = 0;
+  INT missingBits = (INT)numberOfBits - (INT)hBitStream->BitsInCache;
+
+  FDK_ASSERT(numberOfBits <= 32);
+  if (missingBits > 0) {
+    if (missingBits != 32) bits = hBitStream->CacheWord << missingBits;
+    hBitStream->CacheWord = FDK_get32(&hBitStream->hBitBuf);
+    hBitStream->BitsInCache += CACHE_BITS;
   }
 
   hBitStream->BitsInCache -= numberOfBits;
-  return ( hBitStream->CacheWord >> hBitStream->BitsInCache) & BitMask[numberOfBits];
-
-#else
-  const UINT validMask = BitMask [numberOfBits] ;
-
-  if (hBitStream->BitsInCache <= numberOfBits)
-  {
-    const INT freeBits = (CACHE_BITS-1) - hBitStream->BitsInCache ;
-
-    hBitStream->CacheWord = (hBitStream->CacheWord << freeBits) | FDK_get (&hBitStream->hBitBuf,freeBits) ;
-    hBitStream->BitsInCache += freeBits ;
-  }
-
-  hBitStream->BitsInCache -= numberOfBits ;
 
-  return (hBitStream->CacheWord >> hBitStream->BitsInCache) & validMask ;
-#endif
+  return (bits | (hBitStream->CacheWord >> hBitStream->BitsInCache)) &
+         BitMask[numberOfBits];
 }
 
-FDK_INLINE UINT FDKreadBit(HANDLE_FDK_BITSTREAM hBitStream)
-{
-#ifdef OPTIMIZE_FDKREADBITS
-  if (!hBitStream->BitsInCache)
-  {
-    hBitStream->CacheWord = FDK_get32 (&hBitStream->hBitBuf);
-    hBitStream->BitsInCache = CACHE_BITS;
+FDK_INLINE UINT FDKreadBit(HANDLE_FDK_BITSTREAM hBitStream) {
+  if (!hBitStream->BitsInCache) {
+    hBitStream->CacheWord = FDK_get32(&hBitStream->hBitBuf);
+    hBitStream->BitsInCache = CACHE_BITS - 1;
+    return hBitStream->CacheWord >> 31;
   }
   hBitStream->BitsInCache--;
 
   return (hBitStream->CacheWord >> hBitStream->BitsInCache) & 1;
-#else
- return FDKreadBits(hBitStream,1);
-#endif
 }
 
 /**
- * \brief Read2Bits Function (forward). This function 2 sequential
+ * \brief Read2Bits Function (forward). This function reads 2 sequential
  *        bits from the input bitstream. It is the optimized version
-          of FDKreadBits() for readign 2 bits.
+          of FDKreadBits() for reading 2 bits.
  *
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
  * \return the requested bits, right aligned
  * \return
  */
-inline UINT FDKread2Bits(HANDLE_FDK_BITSTREAM hBitStream)
-{
-  UINT BitsInCache = hBitStream->BitsInCache;
-  if (BitsInCache < 2)  /* Comparison changed from 'less-equal' to 'less' */
-  {
-    const INT freeBits = (CACHE_BITS-1) - BitsInCache ;
-
-    hBitStream->CacheWord = (hBitStream->CacheWord << freeBits) | FDK_get (&hBitStream->hBitBuf,freeBits) ;
-    BitsInCache += freeBits;
+FDK_INLINE UINT FDKread2Bits(HANDLE_FDK_BITSTREAM hBitStream) {
+  /*
+  ** Version corresponds to optimized FDKreadBits implementation
+  ** calling FDK_get32, that keeps read pointer aligned.
+  */
+  UINT bits = 0;
+  INT missingBits = 2 - (INT)hBitStream->BitsInCache;
+  if (missingBits > 0) {
+    bits = hBitStream->CacheWord << missingBits;
+    hBitStream->CacheWord = FDK_get32(&hBitStream->hBitBuf);
+    hBitStream->BitsInCache += CACHE_BITS;
   }
-  hBitStream->BitsInCache = BitsInCache - 2;
-  return (hBitStream->CacheWord >> hBitStream->BitsInCache) & 0x3;
+
+  hBitStream->BitsInCache -= 2;
+
+  return (bits | (hBitStream->CacheWord >> hBitStream->BitsInCache)) & 0x3;
 }
 
 /**
- * \brief ReadBits Function (backward). This function returns a number of sequential bits
- *        from the input bitstream.
+ * \brief ReadBits Function (backward). This function returns a number of
+ * sequential bits from the input bitstream.
  *
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
  * \param numberOfBits  The number of bits to be retrieved.
  * \return the requested bits, right aligned
  */
 FDK_INLINE UINT FDKreadBitsBwd(HANDLE_FDK_BITSTREAM hBitStream,
-                           const UINT numberOfBits)
-{
-  const UINT validMask = BitMask [numberOfBits] ;
+                               const UINT numberOfBits) {
+  const UINT validMask = BitMask[numberOfBits];
 
-  if (hBitStream->BitsInCache <= numberOfBits)
-  {
-    const INT freeBits = (CACHE_BITS-1) - hBitStream->BitsInCache ;
+  if (hBitStream->BitsInCache <= numberOfBits) {
+    const INT freeBits = (CACHE_BITS - 1) - hBitStream->BitsInCache;
 
-    hBitStream->CacheWord = (hBitStream->CacheWord << freeBits) | FDK_getBwd (&hBitStream->hBitBuf,freeBits) ;
-    hBitStream->BitsInCache += freeBits ;
+    hBitStream->CacheWord = (hBitStream->CacheWord << freeBits) |
+                            FDK_getBwd(&hBitStream->hBitBuf, freeBits);
+    hBitStream->BitsInCache += freeBits;
   }
 
-  hBitStream->BitsInCache -= numberOfBits ;
+  hBitStream->BitsInCache -= numberOfBits;
 
-  return (hBitStream->CacheWord >> hBitStream->BitsInCache) & validMask ;
+  return (hBitStream->CacheWord >> hBitStream->BitsInCache) & validMask;
 }
 
+/**
+ * \brief read an integer value using a varying number of bits from the
+ * bitstream
+ *
+ *        q.v. ISO/IEC FDIS 23003-3  Table 16
+ *
+ * \param hBitStream HANDLE_FDK_BITSTREAM handle
+ * \param nBits1  number of bits to read for a small integer value or escape
+ * value
+ * \param nBits2  number of bits to read for a medium sized integer value or
+ * escape value
+ * \param nBits3  number of bits to read for a large integer value
+ * \return integer value read from bitstream
+ */
+FDK_INLINE UINT escapedValue(HANDLE_FDK_BITSTREAM hBitStream, int nBits1,
+                             int nBits2, int nBits3) {
+  UINT value = FDKreadBits(hBitStream, nBits1);
+
+  if (value == (UINT)(1 << nBits1) - 1) {
+    UINT valueAdd = FDKreadBits(hBitStream, nBits2);
+    value += valueAdd;
+    if (valueAdd == (UINT)(1 << nBits2) - 1) {
+      value += FDKreadBits(hBitStream, nBits3);
+    }
+  }
+
+  return value;
+}
 
 /**
  * \brief return a number of bits from the bitBuffer.
- *        You have to know what you do! Cache has to be synchronized before using this
- *        function.
+ *        You have to know what you do! Cache has to be synchronized before
+ * using this function.
  *
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
  * \param numBits The number of bits to be retrieved.
  * \return the requested bits, right aligned
  */
-FDK_INLINE UINT FDKgetBits (HANDLE_FDK_BITSTREAM hBitStream, UINT numBits)
-{
-    return FDK_get (&hBitStream->hBitBuf, numBits) ;
+FDK_INLINE UINT FDKgetBits(HANDLE_FDK_BITSTREAM hBitStream, UINT numBits) {
+  return FDK_get(&hBitStream->hBitBuf, numBits);
 }
 
-
 /**
- * \brief WriteBits Function. This function writes numberOfBits of value into bitstream.
+ * \brief WriteBits Function. This function writes numberOfBits of value into
+ * bitstream.
  *
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
- * \param value         Variable holds data to be written.
- * \param numberOfBits  The number of bits to be written.
- * \return number of bits written
+ * \param value         The data to be written
+ * \param numberOfBits  The number of bits to be written
+ * \return              Number of bits written
  */
 FDK_INLINE UCHAR FDKwriteBits(HANDLE_FDK_BITSTREAM hBitStream, UINT value,
-                     const UINT numberOfBits)
-{
-  const UINT validMask = BitMask [numberOfBits] ;
-
-  if ((hBitStream->BitsInCache+numberOfBits) < CACHE_BITS)
-  {
-    hBitStream->BitsInCache += numberOfBits ;
-    hBitStream->CacheWord   =  (hBitStream->CacheWord << numberOfBits) | (value & validMask);
+                              const UINT numberOfBits) {
+  const UINT validMask = BitMask[numberOfBits];
+
+  if (hBitStream == NULL) {
+    return numberOfBits;
   }
-  else
-  {
-    FDK_put(&hBitStream->hBitBuf, hBitStream->CacheWord, hBitStream->BitsInCache) ;
-    hBitStream->BitsInCache = numberOfBits ;
-    hBitStream->CacheWord   = (value & validMask) ;
+
+  if ((hBitStream->BitsInCache + numberOfBits) < CACHE_BITS) {
+    hBitStream->BitsInCache += numberOfBits;
+    hBitStream->CacheWord =
+        (hBitStream->CacheWord << numberOfBits) | (value & validMask);
+  } else {
+    /* Put always 32 bits into memory             */
+    /* - fill cache's LSBits with MSBits of value */
+    /* - store 32 bits in memory using subroutine */
+    /* - fill remaining bits into cache's LSBits  */
+    /* - upper bits in cache are don't care       */
+
+    /* Compute number of bits to be filled into cache */
+    int missing_bits = CACHE_BITS - hBitStream->BitsInCache;
+    int remaining_bits = numberOfBits - missing_bits;
+    value = value & validMask;
+    /* Avoid shift left by 32 positions */
+    UINT CacheWord =
+        (missing_bits == 32) ? 0 : (hBitStream->CacheWord << missing_bits);
+    CacheWord |= (value >> (remaining_bits));
+    FDK_put(&hBitStream->hBitBuf, CacheWord, 32);
+
+    hBitStream->CacheWord = value;
+    hBitStream->BitsInCache = remaining_bits;
   }
 
- return numberOfBits;
+  return numberOfBits;
 }
 
-
 /**
- * \brief WriteBits Function (backward). This function writes numberOfBits of value into bitstream.
+ * \brief WriteBits Function (backward). This function writes numberOfBits of
+ * value into bitstream.
  *
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
  * \param value         Variable holds data to be written.
@@ -357,25 +385,63 @@ FDK_INLINE UCHAR FDKwriteBits(HANDLE_FDK_BITSTREAM hBitStream, UINT value,
  * \return number of bits written
  */
 FDK_INLINE UCHAR FDKwriteBitsBwd(HANDLE_FDK_BITSTREAM hBitStream, UINT value,
-                                 const UINT numberOfBits)
-{
-  const UINT validMask = BitMask [numberOfBits] ;
-
-  if ((hBitStream->BitsInCache+numberOfBits) <= CACHE_BITS)
-  {
-    hBitStream->BitsInCache += numberOfBits ;
-    hBitStream->CacheWord   =  (hBitStream->CacheWord << numberOfBits) | (value & validMask);
-  }
-  else
-  {
-    FDK_putBwd(&hBitStream->hBitBuf, hBitStream->CacheWord, hBitStream->BitsInCache) ;
-    hBitStream->BitsInCache = numberOfBits ;
-    hBitStream->CacheWord   = (value & validMask) ;
+                                 const UINT numberOfBits) {
+  const UINT validMask = BitMask[numberOfBits];
+
+  if ((hBitStream->BitsInCache + numberOfBits) <= CACHE_BITS) {
+    hBitStream->BitsInCache += numberOfBits;
+    hBitStream->CacheWord =
+        (hBitStream->CacheWord << numberOfBits) | (value & validMask);
+  } else {
+    FDK_putBwd(&hBitStream->hBitBuf, hBitStream->CacheWord,
+               hBitStream->BitsInCache);
+    hBitStream->BitsInCache = numberOfBits;
+    hBitStream->CacheWord = (value & validMask);
   }
 
- return numberOfBits;
+  return numberOfBits;
 }
 
+/**
+ * \brief write an integer value using a varying number of bits from the
+ * bitstream
+ *
+ *        q.v. ISO/IEC FDIS 23003-3  Table 16
+ *
+ * \param hBitStream HANDLE_FDK_BITSTREAM handle
+ * \param value   the data to be written
+ * \param nBits1  number of bits to write for a small integer value or escape
+ * value
+ * \param nBits2  number of bits to write for a medium sized integer value or
+ * escape value
+ * \param nBits3  number of bits to write for a large integer value
+ * \return number of bits written
+ */
+FDK_INLINE UCHAR FDKwriteEscapedValue(HANDLE_FDK_BITSTREAM hBitStream,
+                                      UINT value, UINT nBits1, UINT nBits2,
+                                      UINT nBits3) {
+  UCHAR nbits = 0;
+  UINT tmp = (1 << nBits1) - 1;
+
+  if (value < tmp) {
+    nbits += FDKwriteBits(hBitStream, value, nBits1);
+  } else {
+    nbits += FDKwriteBits(hBitStream, tmp, nBits1);
+    value -= tmp;
+    tmp = (1 << nBits2) - 1;
+
+    if (value < tmp) {
+      nbits += FDKwriteBits(hBitStream, value, nBits2);
+    } else {
+      nbits += FDKwriteBits(hBitStream, tmp, nBits2);
+      value -= tmp;
+
+      nbits += FDKwriteBits(hBitStream, value, nBits3);
+    }
+  }
+
+  return nbits;
+}
 
 /**
  * \brief SyncCache Function. Clear cache after read forward.
@@ -383,152 +449,158 @@ FDK_INLINE UCHAR FDKwriteBitsBwd(HANDLE_FDK_BITSTREAM hBitStream, UINT value,
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
  * \return void
  */
-FDK_INLINE void FDKsyncCache (HANDLE_FDK_BITSTREAM hBitStream)
-{
+FDK_INLINE void FDKsyncCache(HANDLE_FDK_BITSTREAM hBitStream) {
   if (hBitStream->ConfigCache == BS_READER)
-    FDK_pushBack (&hBitStream->hBitBuf,hBitStream->BitsInCache,hBitStream->ConfigCache) ;
-  else                        /* BS_WRITER */
-    FDK_put(&hBitStream->hBitBuf, hBitStream->CacheWord, hBitStream->BitsInCache) ;
-
-  hBitStream->BitsInCache = 0 ;
-  hBitStream->CacheWord   = 0 ;
+    FDK_pushBack(&hBitStream->hBitBuf, hBitStream->BitsInCache,
+                 hBitStream->ConfigCache);
+  else if (hBitStream->BitsInCache) /* BS_WRITER */
+    FDK_put(&hBitStream->hBitBuf, hBitStream->CacheWord,
+            hBitStream->BitsInCache);
+
+  hBitStream->BitsInCache = 0;
+  hBitStream->CacheWord = 0;
 }
 
-
 /**
  * \brief SyncCache Function. Clear cache after read backwards.
  *
  * \param  hBitStream HANDLE_FDK_BITSTREAM handle
  * \return void
  */
-FDK_INLINE void FDKsyncCacheBwd (HANDLE_FDK_BITSTREAM hBitStream)
-{
+FDK_INLINE void FDKsyncCacheBwd(HANDLE_FDK_BITSTREAM hBitStream) {
   if (hBitStream->ConfigCache == BS_READER) {
-    FDK_pushForward (&hBitStream->hBitBuf,hBitStream->BitsInCache,hBitStream->ConfigCache) ;
-  } else {                      /* BS_WRITER */
-    FDK_putBwd (&hBitStream->hBitBuf, hBitStream->CacheWord, hBitStream->BitsInCache) ;
+    FDK_pushForward(&hBitStream->hBitBuf, hBitStream->BitsInCache,
+                    hBitStream->ConfigCache);
+  } else { /* BS_WRITER */
+    FDK_putBwd(&hBitStream->hBitBuf, hBitStream->CacheWord,
+               hBitStream->BitsInCache);
   }
 
-  hBitStream->BitsInCache = 0 ;
-  hBitStream->CacheWord   = 0 ;
+  hBitStream->BitsInCache = 0;
+  hBitStream->CacheWord = 0;
 }
 
-
 /**
  * \brief Byte Alignment Function.
- *        This function performs the byte_alignment() syntactic function on the input stream,
- *        i.e. some bits will be discarded/padded so that the next bits to be read/written will
- *        be aligned on a byte boundary with respect to the bit position 0.
+ *        This function performs the byte_alignment() syntactic function on the
+ * input stream, i.e. some bits will be discarded/padded so that the next bits
+ * to be read/written will be aligned on a byte boundary with respect to
+ * the bit position 0.
  *
  * \param  hBitStream HANDLE_FDK_BITSTREAM handle
  * \return void
  */
-FDK_INLINE void FDKbyteAlign (HANDLE_FDK_BITSTREAM hBitStream)
-{
-  FDKsyncCache (hBitStream) ;
-  FDK_byteAlign (&hBitStream->hBitBuf, (UCHAR)hBitStream->ConfigCache) ;
+FDK_INLINE void FDKbyteAlign(HANDLE_FDK_BITSTREAM hBitStream) {
+  FDKsyncCache(hBitStream);
+  FDK_byteAlign(&hBitStream->hBitBuf, (UCHAR)hBitStream->ConfigCache);
 }
 
-
 /**
  * \brief Byte Alignment Function with anchor
- *        This function performs the byte_alignment() syntactic function on the input stream,
- *        i.e. some bits will be discarded so that the next bits to be read/written would be aligned
- *        on a byte boundary with respect to the given alignment anchor.
+ *        This function performs the byte_alignment() syntactic function on the
+ * input stream, i.e. some bits will be discarded so that the next bits to be
+ * read/written would be aligned on a byte boundary with respect to the
+ * given alignment anchor.
  *
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
- * \param alignmentAnchor bit position to be considered as origin for byte alignment
+ * \param alignmentAnchor bit position to be considered as origin for byte
+ * alignment
  * \return void
  */
-FDK_INLINE void FDKbyteAlign (HANDLE_FDK_BITSTREAM hBitStream, UINT alignmentAnchor)
-{
-  FDKsyncCache (hBitStream) ;
+FDK_INLINE void FDKbyteAlign(HANDLE_FDK_BITSTREAM hBitStream,
+                             UINT alignmentAnchor) {
+  FDKsyncCache(hBitStream);
   if (hBitStream->ConfigCache == BS_READER) {
-    FDK_pushForward (&hBitStream->hBitBuf,
-                     (8 - ((alignmentAnchor - FDK_getValidBits(&hBitStream->hBitBuf)) & 0x07)) & 0x07,
-                     hBitStream->ConfigCache) ;
-  }
-  else {
-    FDK_put (&hBitStream->hBitBuf,
-             0,
-             (8 - ((FDK_getValidBits(&hBitStream->hBitBuf)-alignmentAnchor) & 0x07)) & 0x07 );
+    FDK_pushForward(
+        &hBitStream->hBitBuf,
+        (UINT)((INT)8 - (((INT)alignmentAnchor -
+                          (INT)FDK_getValidBits(&hBitStream->hBitBuf)) &
+                         0x07)) &
+            0x07,
+        hBitStream->ConfigCache);
+  } else {
+    FDK_put(&hBitStream->hBitBuf, 0,
+            (8 - ((FDK_getValidBits(&hBitStream->hBitBuf) - alignmentAnchor) &
+                  0x07)) &
+                0x07);
   }
 }
 
-
 /**
  * \brief Push Back(Cache) / For / BiDirectional Function.
- *        PushBackCache function ungets a number of bits erroneously read/written by the last Get() call.
- *       NB: The number of bits to be stuffed back into the stream may never exceed the
- *       number of bits returned by the immediately preceding Get() call.
+ *        PushBackCache function ungets a number of bits erroneously
+ * read/written by the last Get() call. NB: The number of bits to be stuffed
+ * back into the stream may never exceed the number of bits returned by
+ * the immediately preceding Get() call.
  *
- *       PushBack function ungets a number of bits (combines cache and bitbuffer indices)
- *       PushFor  function gets a number of bits (combines cache and bitbuffer indices)
- *       PushBiDirectional gets/ungets number of bits as defined in PusBack/For function
- *       NB: The sign of bits is not known, so the function checks direction and calls
- *        appropriate function. (positive sign pushFor, negative sign pushBack )
+ *       PushBack function ungets a number of bits (combines cache and bitbuffer
+ * indices) PushFor  function gets a number of bits (combines cache and
+ * bitbuffer indices) PushBiDirectional gets/ungets number of bits as
+ * defined in PusBack/For function NB: The sign of bits is not known, so
+ * the function checks direction and calls appropriate function. (positive
+ * sign pushFor, negative sign pushBack )
  *
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
  * \param numberOfBits  The number of bits to be pushed back/for.
  * \return void
  */
-FDK_INLINE void FDKpushBackCache (HANDLE_FDK_BITSTREAM hBitStream, const UINT numberOfBits)
-{
-  FDK_ASSERT ((hBitStream->BitsInCache+numberOfBits)<=CACHE_BITS);
-  hBitStream->BitsInCache += numberOfBits ;
+FDK_INLINE void FDKpushBackCache(HANDLE_FDK_BITSTREAM hBitStream,
+                                 const UINT numberOfBits) {
+  FDK_ASSERT((hBitStream->BitsInCache + numberOfBits) <= CACHE_BITS);
+  hBitStream->BitsInCache += numberOfBits;
 }
 
-FDK_INLINE void FDKpushBack (HANDLE_FDK_BITSTREAM hBitStream, const UINT numberOfBits)
-{
-  if ((hBitStream->BitsInCache+numberOfBits)<CACHE_BITS && (hBitStream->ConfigCache == BS_READER) ) {
-    hBitStream->BitsInCache += numberOfBits ;
-    FDKsyncCache(hBitStream) ; /* sync cache to avoid invalid cache */
-  }
-  else {
-    FDKsyncCache(hBitStream) ;
-    FDK_pushBack(&hBitStream->hBitBuf,numberOfBits,hBitStream->ConfigCache);
+FDK_INLINE void FDKpushBack(HANDLE_FDK_BITSTREAM hBitStream,
+                            const UINT numberOfBits) {
+  if ((hBitStream->BitsInCache + numberOfBits) < CACHE_BITS &&
+      (hBitStream->ConfigCache == BS_READER)) {
+    hBitStream->BitsInCache += numberOfBits;
+    FDKsyncCache(hBitStream); /* sync cache to avoid invalid cache */
+  } else {
+    FDKsyncCache(hBitStream);
+    FDK_pushBack(&hBitStream->hBitBuf, numberOfBits, hBitStream->ConfigCache);
   }
 }
 
-FDK_INLINE void FDKpushFor (HANDLE_FDK_BITSTREAM hBitStream, const UINT numberOfBits)
-{
-  if ( (hBitStream->BitsInCache>numberOfBits) && (hBitStream->ConfigCache == BS_READER) ) {
+FDK_INLINE void FDKpushFor(HANDLE_FDK_BITSTREAM hBitStream,
+                           const UINT numberOfBits) {
+  if ((hBitStream->BitsInCache > numberOfBits) &&
+      (hBitStream->ConfigCache == BS_READER)) {
     hBitStream->BitsInCache -= numberOfBits;
-  }
-  else {
-    FDKsyncCache(hBitStream) ;
-    FDK_pushForward(&hBitStream->hBitBuf,numberOfBits,hBitStream->ConfigCache);
+  } else {
+    FDKsyncCache(hBitStream);
+    FDK_pushForward(&hBitStream->hBitBuf, numberOfBits,
+                    hBitStream->ConfigCache);
   }
 }
 
-FDK_INLINE void FDKpushBiDirectional (HANDLE_FDK_BITSTREAM hBitStream, const INT numberOfBits)
-{
-  if(numberOfBits>=0)  FDKpushFor(hBitStream, numberOfBits) ;
-  else                 FDKpushBack(hBitStream, -numberOfBits) ;
+FDK_INLINE void FDKpushBiDirectional(HANDLE_FDK_BITSTREAM hBitStream,
+                                     const INT numberOfBits) {
+  if (numberOfBits >= 0)
+    FDKpushFor(hBitStream, numberOfBits);
+  else
+    FDKpushBack(hBitStream, -numberOfBits);
 }
 
-
 /**
- * \brief GetValidBits Function.  Clear cache and return valid Bits from Bitbuffer.
+ * \brief GetValidBits Function.  Clear cache and return valid Bits from
+ * Bitbuffer.
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
  * \return amount of valid bits that still can be read or were already written.
  *
  */
-FDK_INLINE UINT FDKgetValidBits (HANDLE_FDK_BITSTREAM hBitStream)
-{
-  FDKsyncCache(hBitStream) ;
-  return FDK_getValidBits(&hBitStream->hBitBuf) ;
+FDK_INLINE UINT FDKgetValidBits(HANDLE_FDK_BITSTREAM hBitStream) {
+  FDKsyncCache(hBitStream);
+  return FDK_getValidBits(&hBitStream->hBitBuf);
 }
 
-
 /**
  * \brief return amount of unused Bits from Bitbuffer.
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
  * \return amount of free bits that still can be written into the bitstream
  */
-FDK_INLINE INT FDKgetFreeBits (HANDLE_FDK_BITSTREAM hBitStream)
-{
-   return FDK_getFreeBits (&hBitStream->hBitBuf) ;
+FDK_INLINE INT FDKgetFreeBits(HANDLE_FDK_BITSTREAM hBitStream) {
+  return FDK_getFreeBits(&hBitStream->hBitBuf);
 }
 
 /**
@@ -536,10 +608,9 @@ FDK_INLINE INT FDKgetFreeBits (HANDLE_FDK_BITSTREAM hBitStream)
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
  * \return void
  */
-FDK_INLINE void FDKresetBitCnt (HANDLE_FDK_BITSTREAM hBitStream)
-{
-    FDKsyncCache (hBitStream) ;
-    FDK_setBitCnt (&hBitStream->hBitBuf, 0) ;
+FDK_INLINE void FDKresetBitCnt(HANDLE_FDK_BITSTREAM hBitStream) {
+  FDKsyncCache(hBitStream);
+  FDK_setBitCnt(&hBitStream->hBitBuf, 0);
 }
 
 /**
@@ -548,10 +619,9 @@ FDK_INLINE void FDKresetBitCnt (HANDLE_FDK_BITSTREAM hBitStream)
  * \param value new value to be assigned to the bit counter
  * \return void
  */
-FDK_INLINE void FDKsetBitCnt (HANDLE_FDK_BITSTREAM hBitStream, UINT value)
-{
-    FDKsyncCache (hBitStream) ;
-    FDK_setBitCnt (&hBitStream->hBitBuf, value) ;
+FDK_INLINE void FDKsetBitCnt(HANDLE_FDK_BITSTREAM hBitStream, UINT value) {
+  FDKsyncCache(hBitStream);
+  FDK_setBitCnt(&hBitStream->hBitBuf, value);
 }
 
 /**
@@ -559,60 +629,60 @@ FDK_INLINE void FDKsetBitCnt (HANDLE_FDK_BITSTREAM hBitStream, UINT value)
  * \param hBitStream HANDLE_FDK_BITSTREAM handle
  * \return current bit counter value
  */
-FDK_INLINE INT  FDKgetBitCnt (HANDLE_FDK_BITSTREAM hBitStream)
-{
-    FDKsyncCache(hBitStream) ;
-    return FDK_getBitCnt(&hBitStream->hBitBuf) ;
+FDK_INLINE INT FDKgetBitCnt(HANDLE_FDK_BITSTREAM hBitStream) {
+  FDKsyncCache(hBitStream);
+  return FDK_getBitCnt(&hBitStream->hBitBuf);
 }
 
-
 /**
  * \brief Fill the BitBuffer with a number of input bytes from  external source.
- *        The bytesValid variable returns the number of ramaining valid bytes in extern inputBuffer.
+ *        The bytesValid variable returns the number of ramaining valid bytes in
+ * extern inputBuffer.
  *
  * \param hBitStream  HANDLE_FDK_BITSTREAM handle
  * \param inputBuffer Pointer to input buffer with bitstream data.
  * \param bufferSize  Total size of inputBuffer array.
- * \param bytesValid  Input: number of valid bytes in inputBuffer. Output: bytes still left unread in inputBuffer.
+ * \param bytesValid  Input: number of valid bytes in inputBuffer. Output: bytes
+ * still left unread in inputBuffer.
  * \return void
  */
-FDK_INLINE void FDKfeedBuffer (HANDLE_FDK_BITSTREAM hBitStream, const UCHAR inputBuffer [], const UINT bufferSize, UINT *bytesValid)
-{
-  FDKsyncCache (hBitStream) ;
-  FDK_Feed(&hBitStream->hBitBuf, (UCHAR*)inputBuffer, bufferSize, bytesValid  ) ;
+FDK_INLINE void FDKfeedBuffer(HANDLE_FDK_BITSTREAM hBitStream,
+                              const UCHAR inputBuffer[], const UINT bufferSize,
+                              UINT *bytesValid) {
+  FDKsyncCache(hBitStream);
+  FDK_Feed(&hBitStream->hBitBuf, inputBuffer, bufferSize, bytesValid);
 }
 
-
 /**
- * \brief fill destination BitBuffer with a number of bytes from source BitBuffer. The
- *        bytesValid variable returns the number of ramaining valid bytes in source BitBuffer.
+ * \brief fill destination BitBuffer with a number of bytes from source
+ * BitBuffer. The bytesValid variable returns the number of ramaining valid
+ * bytes in source BitBuffer.
  *
  * \param hBSDst            HANDLE_FDK_BITSTREAM handle to write data into
  * \param hBSSrc            HANDLE_FDK_BITSTREAM handle to read data from
- * \param bytesValid        Input: number of valid bytes in inputBuffer. Output: bytes still left unread in inputBuffer.
+ * \param bytesValid        Input: number of valid bytes in inputBuffer. Output:
+ * bytes still left unread in inputBuffer.
  * \return void
  */
-FDK_INLINE void FDKcopyBuffer (HANDLE_FDK_BITSTREAM hBSDst, HANDLE_FDK_BITSTREAM hBSSrc, UINT *bytesValid)
-{
-  FDKsyncCache (hBSSrc) ;
-  FDK_Copy (&hBSDst->hBitBuf, &hBSSrc->hBitBuf, bytesValid) ;
+FDK_INLINE void FDKcopyBuffer(HANDLE_FDK_BITSTREAM hBSDst,
+                              HANDLE_FDK_BITSTREAM hBSSrc, UINT *bytesValid) {
+  FDKsyncCache(hBSSrc);
+  FDK_Copy(&hBSDst->hBitBuf, &hBSSrc->hBitBuf, bytesValid);
 }
 
-
 /**
- * \brief fill the outputBuffer with all valid bytes hold in BitBuffer. The WriteBytes
- *        variable returns the number of written Bytes.
+ * \brief fill the outputBuffer with all valid bytes hold in BitBuffer. The
+ * WriteBytes variable returns the number of written Bytes.
  *
  * \param hBitStream    HANDLE_FDK_BITSTREAM handle
  * \param outputBuffer  Pointer to output buffer.
  * \param writeBytes    Number of bytes write to output buffer.
  * \return void
  */
-FDK_INLINE void FDKfetchBuffer(HANDLE_FDK_BITSTREAM hBitStream, UCHAR *outputBuffer, UINT *writeBytes)
-{
-  FDKsyncCache (hBitStream) ;
+FDK_INLINE void FDKfetchBuffer(HANDLE_FDK_BITSTREAM hBitStream,
+                               UCHAR *outputBuffer, UINT *writeBytes) {
+  FDKsyncCache(hBitStream);
   FDK_Fetch(&hBitStream->hBitBuf, outputBuffer, writeBytes);
 }
 
-
 #endif