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, 771 insertions, 943 deletions

diff --git a/libAACenc/src/bit_cnt.cpp b/libAACenc/src/bit_cnt.cpp
index 926ee49..579df8c 100644
--- a/libAACenc/src/bit_cnt.cpp
+++ b/libAACenc/src/bit_cnt.cpp
@@ -1,74 +1,85 @@
-
-/* -----------------------------------------------------------------------------------------------------------
+/* -----------------------------------------------------------------------------
 Software License for The Fraunhofer FDK AAC Codec Library for Android
 
-© Copyright  1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
-  All rights reserved.
+© Copyright  1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten
+Forschung e.V. All rights reserved.
 
  1.    INTRODUCTION
-The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software that implements
-the MPEG Advanced Audio Coding ("AAC") encoding and decoding scheme for digital audio.
-This FDK AAC Codec software is intended to be used on a wide variety of Android devices.
-
-AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient general perceptual
-audio codecs. AAC-ELD is considered the best-performing full-bandwidth communications codec by
-independent studies and is widely deployed. AAC has been standardized by ISO and IEC as part
-of the MPEG specifications.
-
-Patent licenses for necessary patent claims for the FDK AAC Codec (including those of Fraunhofer)
-may be obtained through Via Licensing (www.vialicensing.com) or through the respective patent owners
-individually for the purpose of encoding or decoding bit streams in products that are compliant with
-the ISO/IEC MPEG audio standards. Please note that most manufacturers of Android devices already license
-these patent claims through Via Licensing or directly from the patent owners, and therefore FDK AAC Codec
-software may already be covered under those patent licenses when it is used for those licensed purposes only.
-
-Commercially-licensed AAC software libraries, including floating-point versions with enhanced sound quality,
-are also available from Fraunhofer. Users are encouraged to check the Fraunhofer website for additional
-applications information and documentation.
+The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software
+that implements the MPEG Advanced Audio Coding ("AAC") encoding and decoding
+scheme for digital audio. This FDK AAC Codec software is intended to be used on
+a wide variety of Android devices.
+
+AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient
+general perceptual audio codecs. AAC-ELD is considered the best-performing
+full-bandwidth communications codec by independent studies and is widely
+deployed. AAC has been standardized by ISO and IEC as part of the MPEG
+specifications.
+
+Patent licenses for necessary patent claims for the FDK AAC Codec (including
+those of Fraunhofer) may be obtained through Via Licensing
+(www.vialicensing.com) or through the respective patent owners individually for
+the purpose of encoding or decoding bit streams in products that are compliant
+with the ISO/IEC MPEG audio standards. Please note that most manufacturers of
+Android devices already license these patent claims through Via Licensing or
+directly from the patent owners, and therefore FDK AAC Codec software may
+already be covered under those patent licenses when it is used for those
+licensed purposes only.
+
+Commercially-licensed AAC software libraries, including floating-point versions
+with enhanced sound quality, are also available from Fraunhofer. Users are
+encouraged to check the Fraunhofer website for additional applications
+information and documentation.
 
 2.    COPYRIGHT LICENSE
 
-Redistribution and use in source and binary forms, with or without modification, are permitted without
-payment of copyright license fees provided that you satisfy the following conditions:
+Redistribution and use in source and binary forms, with or without modification,
+are permitted without payment of copyright license fees provided that you
+satisfy the following conditions:
 
-You must retain the complete text of this software license in redistributions of the FDK AAC Codec or
-your modifications thereto in source code form.
+You must retain the complete text of this software license in redistributions of
+the FDK AAC Codec or your modifications thereto in source code form.
 
-You must retain the complete text of this software license in the documentation and/or other materials
-provided with redistributions of the FDK AAC Codec or your modifications thereto in binary form.
-You must make available free of charge copies of the complete source code of the FDK AAC Codec and your
+You must retain the complete text of this software license in the documentation
+and/or other materials provided with redistributions of the FDK AAC Codec or
+your modifications thereto in binary form. You must make available free of
+charge copies of the complete source code of the FDK AAC Codec and your
 modifications thereto to recipients of copies in binary form.
 
-The name of Fraunhofer may not be used to endorse or promote products derived from this library without
-prior written permission.
+The name of Fraunhofer may not be used to endorse or promote products derived
+from this library without prior written permission.
 
-You may not charge copyright license fees for anyone to use, copy or distribute the FDK AAC Codec
-software or your modifications thereto.
+You may not charge copyright license fees for anyone to use, copy or distribute
+the FDK AAC Codec software or your modifications thereto.
 
-Your modified versions of the FDK AAC Codec must carry prominent notices stating that you changed the software
-and the date of any change. For modified versions of the FDK AAC Codec, the term
-"Fraunhofer FDK AAC Codec Library for Android" must be replaced by the term
-"Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android."
+Your modified versions of the FDK AAC Codec must carry prominent notices stating
+that you changed the software and the date of any change. For modified versions
+of the FDK AAC Codec, the term "Fraunhofer FDK AAC Codec Library for Android"
+must be replaced by the term "Third-Party Modified Version of the Fraunhofer FDK
+AAC Codec Library for Android."
 
 3.    NO PATENT LICENSE
 
-NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without limitation the patents of Fraunhofer,
-ARE GRANTED BY THIS SOFTWARE LICENSE. Fraunhofer provides no warranty of patent non-infringement with
-respect to this software.
+NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without
+limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE.
+Fraunhofer provides no warranty of patent non-infringement with respect to this
+software.
 
-You may use this FDK AAC Codec software or modifications thereto only for purposes that are authorized
-by appropriate patent licenses.
+You may use this FDK AAC Codec software or modifications thereto only for
+purposes that are authorized by appropriate patent licenses.
 
 4.    DISCLAIMER
 
-This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright holders and contributors
-"AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, including but not limited to the implied warranties
-of merchantability and fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, or consequential damages,
-including but not limited to procurement of substitute goods or services; loss of use, data, or profits,
-or business interruption, however caused and on any theory of liability, whether in contract, strict
-liability, or tort (including negligence), arising in any way out of the use of this software, even if
-advised of the possibility of such damage.
+This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright
+holders and contributors "AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
+including but not limited to the implied warranties of merchantability and
+fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary,
+or consequential damages, including but not limited to procurement of substitute
+goods or services; loss of use, data, or profits, or business interruption,
+however caused and on any theory of liability, whether in contract, strict
+liability, or tort (including negligence), arising in any way out of the use of
+this software, even if advised of the possibility of such damage.
 
 5.    CONTACT INFORMATION
 
@@ -79,20 +90,21 @@ Am Wolfsmantel 33
 
 www.iis.fraunhofer.de/amm
 amm-info@iis.fraunhofer.de
------------------------------------------------------------------------------------------------------------ */
+----------------------------------------------------------------------------- */
+
+/**************************** AAC encoder library ******************************
 
-/******************************** MPEG Audio Encoder **************************
+   Author(s):   M.Werner
 
-   Initial author:       M.Werner
-   contents/description: Huffman Bitcounter & coder
+   Description: Huffman Bitcounter & coder
 
-******************************************************************************/
+*******************************************************************************/
 
 #include "bit_cnt.h"
 
 #include "aacEnc_ram.h"
 
-#define HI_LTAB(a) (a>>16)
+#define HI_LTAB(a) (a >> 16)
 #define LO_LTAB(a) (a & 0xffff)
 
 /*****************************************************************************
@@ -106,72 +118,62 @@ amm-info@iis.fraunhofer.de
 
 *****************************************************************************/
 
-static void FDKaacEnc_count1_2_3_4_5_6_7_8_9_10_11(const SHORT *RESTRICT values,
-                                         const INT  width,
-                                         INT       *bitCount)
-{
-
+static void FDKaacEnc_count1_2_3_4_5_6_7_8_9_10_11(const SHORT *const values,
+                                                   const INT width,
+                                                   INT *RESTRICT bitCount) {
   INT i;
-  INT bc1_2,bc3_4,bc5_6,bc7_8,bc9_10,bc11,sc;
-  INT t0,t1,t2,t3;
-  bc1_2=0;
-  bc3_4=0;
-  bc5_6=0;
-  bc7_8=0;
-  bc9_10=0;
-  bc11=0;
-  sc=0;
-
-  for(i=0;i<width;i+=4){
-
-    t0= values[i+0];
-    t1= values[i+1];
-    t2= values[i+2];
-    t3= values[i+3];
-
-    /* 1,2 */
-
-    bc1_2+=FDKaacEnc_huff_ltab1_2[t0+1][t1+1][t2+1][t3+1];
-
-    /* 5,6 */
-    bc5_6+=FDKaacEnc_huff_ltab5_6[t0+4][t1+4];
-    bc5_6+=FDKaacEnc_huff_ltab5_6[t2+4][t3+4];
-
-    t0=fixp_abs(t0);
-    t1=fixp_abs(t1);
-    t2=fixp_abs(t2);
-    t3=fixp_abs(t3);
-
-
-    bc3_4+= FDKaacEnc_huff_ltab3_4[t0][t1][t2][t3];
-
-    bc7_8+=FDKaacEnc_huff_ltab7_8[t0][t1];
-    bc7_8+=FDKaacEnc_huff_ltab7_8[t2][t3];
-
-    bc9_10+=FDKaacEnc_huff_ltab9_10[t0][t1];
-    bc9_10+=FDKaacEnc_huff_ltab9_10[t2][t3];
-
-    bc11+= (INT) FDKaacEnc_huff_ltab11[t0][t1];
-    bc11+= (INT) FDKaacEnc_huff_ltab11[t2][t3];
-
-    sc+=(t0>0)+(t1>0)+(t2>0)+(t3>0);
+  INT bc1_2, bc3_4, bc5_6, bc7_8, bc9_10, bc11, sc;
+  INT t0, t1, t2, t3;
+  bc1_2 = 0;
+  bc3_4 = 0;
+  bc5_6 = 0;
+  bc7_8 = 0;
+  bc9_10 = 0;
+  bc11 = 0;
+  sc = 0;
+
+  DWORD_ALIGNED(values);
+
+  for (i = 0; i < width; i += 4) {
+    t0 = values[i + 0];
+    t1 = values[i + 1];
+    t2 = values[i + 2];
+    t3 = values[i + 3];
+
+    bc1_2 += (INT)FDKaacEnc_huff_ltab1_2[t0 + 1][t1 + 1][t2 + 1][t3 + 1];
+    bc5_6 += (INT)FDKaacEnc_huff_ltab5_6[t0 + 4][t1 + 4] +
+             (INT)FDKaacEnc_huff_ltab5_6[t2 + 4][t3 + 4];
+
+    t0 = fixp_abs(t0);
+    sc += (t0 > 0);
+    t1 = fixp_abs(t1);
+    sc += (t1 > 0);
+    t2 = fixp_abs(t2);
+    sc += (t2 > 0);
+    t3 = fixp_abs(t3);
+    sc += (t3 > 0);
+
+    bc3_4 += (INT)FDKaacEnc_huff_ltab3_4[t0][t1][t2][t3];
+    bc7_8 += (INT)FDKaacEnc_huff_ltab7_8[t0][t1] +
+             (INT)FDKaacEnc_huff_ltab7_8[t2][t3];
+    bc9_10 += (INT)FDKaacEnc_huff_ltab9_10[t0][t1] +
+              (INT)FDKaacEnc_huff_ltab9_10[t2][t3];
+    bc11 +=
+        (INT)FDKaacEnc_huff_ltab11[t0][t1] + (INT)FDKaacEnc_huff_ltab11[t2][t3];
   }
-
-  bitCount[1]=HI_LTAB(bc1_2);
-  bitCount[2]=LO_LTAB(bc1_2);
-  bitCount[3]=HI_LTAB(bc3_4)+sc;
-  bitCount[4]=LO_LTAB(bc3_4)+sc;
-  bitCount[5]=HI_LTAB(bc5_6);
-  bitCount[6]=LO_LTAB(bc5_6);
-  bitCount[7]=HI_LTAB(bc7_8)+sc;
-  bitCount[8]=LO_LTAB(bc7_8)+sc;
-  bitCount[9]=HI_LTAB(bc9_10)+sc;
-  bitCount[10]=LO_LTAB(bc9_10)+sc;
-  bitCount[11]=bc11+sc;
-
+  bitCount[1] = HI_LTAB(bc1_2);
+  bitCount[2] = LO_LTAB(bc1_2);
+  bitCount[3] = HI_LTAB(bc3_4) + sc;
+  bitCount[4] = LO_LTAB(bc3_4) + sc;
+  bitCount[5] = HI_LTAB(bc5_6);
+  bitCount[6] = LO_LTAB(bc5_6);
+  bitCount[7] = HI_LTAB(bc7_8) + sc;
+  bitCount[8] = LO_LTAB(bc7_8) + sc;
+  bitCount[9] = HI_LTAB(bc9_10) + sc;
+  bitCount[10] = LO_LTAB(bc9_10) + sc;
+  bitCount[11] = bc11 + sc;
 }
 
-
 /*****************************************************************************
 
     functionname: FDKaacEnc_count3_4_5_6_7_8_9_10_11
@@ -182,66 +184,62 @@ static void FDKaacEnc_count1_2_3_4_5_6_7_8_9_10_11(const SHORT *RESTRICT values,
 
 *****************************************************************************/
 
-static void FDKaacEnc_count3_4_5_6_7_8_9_10_11(const SHORT *RESTRICT values,
-                                     const INT  width,
-                                     INT       *bitCount)
-{
-
+static void FDKaacEnc_count3_4_5_6_7_8_9_10_11(const SHORT *const values,
+                                               const INT width,
+                                               INT *RESTRICT bitCount) {
   INT i;
-  INT bc3_4,bc5_6,bc7_8,bc9_10,bc11,sc;
-  INT t0,t1,t2,t3;
-
-  bc3_4=0;
-  bc5_6=0;
-  bc7_8=0;
-  bc9_10=0;
-  bc11=0;
-  sc=0;
-
-  for(i=0;i<width;i+=4){
-
-    t0= values[i+0];
-    t1= values[i+1];
-    t2= values[i+2];
-    t3= values[i+3];
-
-    bc5_6+=FDKaacEnc_huff_ltab5_6[t0+4][t1+4];
-    bc5_6+=FDKaacEnc_huff_ltab5_6[t2+4][t3+4];
-
-    t0=fixp_abs(t0);
-    t1=fixp_abs(t1);
-    t2=fixp_abs(t2);
-    t3=fixp_abs(t3);
-
-    bc3_4+= FDKaacEnc_huff_ltab3_4[t0][t1][t2][t3];
-
-    bc7_8+=FDKaacEnc_huff_ltab7_8[t0][t1];
-    bc7_8+=FDKaacEnc_huff_ltab7_8[t2][t3];
-
-    bc9_10+=FDKaacEnc_huff_ltab9_10[t0][t1];
-    bc9_10+=FDKaacEnc_huff_ltab9_10[t2][t3];
-
-    bc11+= (INT) FDKaacEnc_huff_ltab11[t0][t1];
-    bc11+= (INT) FDKaacEnc_huff_ltab11[t2][t3];
-
-    sc+=(t0>0)+(t1>0)+(t2>0)+(t3>0);
+  INT bc3_4, bc5_6, bc7_8, bc9_10, bc11, sc;
+  INT t0, t1, t2, t3;
+
+  bc3_4 = 0;
+  bc5_6 = 0;
+  bc7_8 = 0;
+  bc9_10 = 0;
+  bc11 = 0;
+  sc = 0;
+
+  DWORD_ALIGNED(values);
+
+  for (i = 0; i < width; i += 4) {
+    t0 = values[i + 0];
+    t1 = values[i + 1];
+    t2 = values[i + 2];
+    t3 = values[i + 3];
+
+    bc5_6 += (INT)FDKaacEnc_huff_ltab5_6[t0 + 4][t1 + 4] +
+             (INT)FDKaacEnc_huff_ltab5_6[t2 + 4][t3 + 4];
+
+    t0 = fixp_abs(t0);
+    sc += (t0 > 0);
+    t1 = fixp_abs(t1);
+    sc += (t1 > 0);
+    t2 = fixp_abs(t2);
+    sc += (t2 > 0);
+    t3 = fixp_abs(t3);
+    sc += (t3 > 0);
+
+    bc3_4 += (INT)FDKaacEnc_huff_ltab3_4[t0][t1][t2][t3];
+    bc7_8 += (INT)FDKaacEnc_huff_ltab7_8[t0][t1] +
+             (INT)FDKaacEnc_huff_ltab7_8[t2][t3];
+    bc9_10 += (INT)FDKaacEnc_huff_ltab9_10[t0][t1] +
+              (INT)FDKaacEnc_huff_ltab9_10[t2][t3];
+    bc11 +=
+        (INT)FDKaacEnc_huff_ltab11[t0][t1] + (INT)FDKaacEnc_huff_ltab11[t2][t3];
   }
 
-  bitCount[1]=INVALID_BITCOUNT;
-  bitCount[2]=INVALID_BITCOUNT;
-  bitCount[3]=HI_LTAB(bc3_4)+sc;
-  bitCount[4]=LO_LTAB(bc3_4)+sc;
-  bitCount[5]=HI_LTAB(bc5_6);
-  bitCount[6]=LO_LTAB(bc5_6);
-  bitCount[7]=HI_LTAB(bc7_8)+sc;
-  bitCount[8]=LO_LTAB(bc7_8)+sc;
-  bitCount[9]=HI_LTAB(bc9_10)+sc;
-  bitCount[10]=LO_LTAB(bc9_10)+sc;
-  bitCount[11]=bc11+sc;
+  bitCount[1] = INVALID_BITCOUNT;
+  bitCount[2] = INVALID_BITCOUNT;
+  bitCount[3] = HI_LTAB(bc3_4) + sc;
+  bitCount[4] = LO_LTAB(bc3_4) + sc;
+  bitCount[5] = HI_LTAB(bc5_6);
+  bitCount[6] = LO_LTAB(bc5_6);
+  bitCount[7] = HI_LTAB(bc7_8) + sc;
+  bitCount[8] = LO_LTAB(bc7_8) + sc;
+  bitCount[9] = HI_LTAB(bc9_10) + sc;
+  bitCount[10] = LO_LTAB(bc9_10) + sc;
+  bitCount[11] = bc11 + sc;
 }
 
-
-
 /*****************************************************************************
 
     functionname: FDKaacEnc_count5_6_7_8_9_10_11
@@ -252,52 +250,58 @@ static void FDKaacEnc_count3_4_5_6_7_8_9_10_11(const SHORT *RESTRICT values,
 
 *****************************************************************************/
 
-
-static void FDKaacEnc_count5_6_7_8_9_10_11(const SHORT *RESTRICT values,
-                                 const INT  width,
-                                 INT       *bitCount)
-{
-
+static void FDKaacEnc_count5_6_7_8_9_10_11(const SHORT *const values,
+                                           const INT width,
+                                           INT *RESTRICT bitCount) {
   INT i;
-  INT bc5_6,bc7_8,bc9_10,bc11,sc;
-  INT t0,t1;
-  bc5_6=0;
-  bc7_8=0;
-  bc9_10=0;
-  bc11=0;
-  sc=0;
-
-  for(i=0;i<width;i+=2){
-
-    t0 = values[i+0];
-    t1 = values[i+1];
-
-    bc5_6+=FDKaacEnc_huff_ltab5_6[t0+4][t1+4];
-
-    t0=fixp_abs(t0);
-    t1=fixp_abs(t1);
-
-    bc7_8+=FDKaacEnc_huff_ltab7_8[t0][t1];
-    bc9_10+=FDKaacEnc_huff_ltab9_10[t0][t1];
-    bc11+= (INT) FDKaacEnc_huff_ltab11[t0][t1];
-
-    sc+=(t0>0)+(t1>0);
+  INT bc5_6, bc7_8, bc9_10, bc11, sc;
+  INT t0, t1, t2, t3;
+  bc5_6 = 0;
+  bc7_8 = 0;
+  bc9_10 = 0;
+  bc11 = 0;
+  sc = 0;
+
+  DWORD_ALIGNED(values);
+
+  for (i = 0; i < width; i += 4) {
+    t0 = values[i + 0];
+    t1 = values[i + 1];
+    t2 = values[i + 2];
+    t3 = values[i + 3];
+
+    bc5_6 += (INT)FDKaacEnc_huff_ltab5_6[t0 + 4][t1 + 4] +
+             (INT)FDKaacEnc_huff_ltab5_6[t2 + 4][t3 + 4];
+
+    t0 = fixp_abs(t0);
+    sc += (t0 > 0);
+    t1 = fixp_abs(t1);
+    sc += (t1 > 0);
+    t2 = fixp_abs(t2);
+    sc += (t2 > 0);
+    t3 = fixp_abs(t3);
+    sc += (t3 > 0);
+
+    bc7_8 += (INT)FDKaacEnc_huff_ltab7_8[t0][t1] +
+             (INT)FDKaacEnc_huff_ltab7_8[t2][t3];
+    bc9_10 += (INT)FDKaacEnc_huff_ltab9_10[t0][t1] +
+              (INT)FDKaacEnc_huff_ltab9_10[t2][t3];
+    bc11 +=
+        (INT)FDKaacEnc_huff_ltab11[t0][t1] + (INT)FDKaacEnc_huff_ltab11[t2][t3];
   }
-  bitCount[1]=INVALID_BITCOUNT;
-  bitCount[2]=INVALID_BITCOUNT;
-  bitCount[3]=INVALID_BITCOUNT;
-  bitCount[4]=INVALID_BITCOUNT;
-  bitCount[5]=HI_LTAB(bc5_6);
-  bitCount[6]=LO_LTAB(bc5_6);
-  bitCount[7]=HI_LTAB(bc7_8)+sc;
-  bitCount[8]=LO_LTAB(bc7_8)+sc;
-  bitCount[9]=HI_LTAB(bc9_10)+sc;
-  bitCount[10]=LO_LTAB(bc9_10)+sc;
-  bitCount[11]=bc11+sc;
-
+  bitCount[1] = INVALID_BITCOUNT;
+  bitCount[2] = INVALID_BITCOUNT;
+  bitCount[3] = INVALID_BITCOUNT;
+  bitCount[4] = INVALID_BITCOUNT;
+  bitCount[5] = HI_LTAB(bc5_6);
+  bitCount[6] = LO_LTAB(bc5_6);
+  bitCount[7] = HI_LTAB(bc7_8) + sc;
+  bitCount[8] = LO_LTAB(bc7_8) + sc;
+  bitCount[9] = HI_LTAB(bc9_10) + sc;
+  bitCount[10] = LO_LTAB(bc9_10) + sc;
+  bitCount[11] = bc11 + sc;
 }
 
-
 /*****************************************************************************
 
     functionname: FDKaacEnc_count7_8_9_10_11
@@ -308,42 +312,54 @@ static void FDKaacEnc_count5_6_7_8_9_10_11(const SHORT *RESTRICT values,
 
 *****************************************************************************/
 
-static void FDKaacEnc_count7_8_9_10_11(const SHORT *RESTRICT values,
-                             const INT  width,
-                             INT       *bitCount)
-{
-
+static void FDKaacEnc_count7_8_9_10_11(const SHORT *const values,
+                                       const INT width,
+                                       INT *RESTRICT bitCount) {
   INT i;
-  INT bc7_8,bc9_10,bc11,sc;
-  INT t0,t1;
-
-  bc7_8=0;
-  bc9_10=0;
-  bc11=0;
-  sc=0;
-
-  for(i=0;i<width;i+=2){
-    t0=fixp_abs(values[i+0]);
-    t1=fixp_abs(values[i+1]);
-
-    bc7_8+=FDKaacEnc_huff_ltab7_8[t0][t1];
-    bc9_10+=FDKaacEnc_huff_ltab9_10[t0][t1];
-    bc11+= (INT) FDKaacEnc_huff_ltab11[t0][t1];
-    sc+=(t0>0)+(t1>0);
+  INT bc7_8, bc9_10, bc11, sc;
+  INT t0, t1, t2, t3;
+
+  bc7_8 = 0;
+  bc9_10 = 0;
+  bc11 = 0;
+  sc = 0;
+
+  DWORD_ALIGNED(values);
+
+  for (i = 0; i < width; i += 4) {
+    t0 = values[i + 0];
+    t1 = values[i + 1];
+    t2 = values[i + 2];
+    t3 = values[i + 3];
+
+    t0 = fixp_abs(t0);
+    sc += (t0 > 0);
+    t1 = fixp_abs(t1);
+    sc += (t1 > 0);
+    t2 = fixp_abs(t2);
+    sc += (t2 > 0);
+    t3 = fixp_abs(t3);
+    sc += (t3 > 0);
+
+    bc7_8 += (INT)FDKaacEnc_huff_ltab7_8[t0][t1] +
+             (INT)FDKaacEnc_huff_ltab7_8[t2][t3];
+    bc9_10 += (INT)FDKaacEnc_huff_ltab9_10[t0][t1] +
+              (INT)FDKaacEnc_huff_ltab9_10[t2][t3];
+    bc11 +=
+        (INT)FDKaacEnc_huff_ltab11[t0][t1] + (INT)FDKaacEnc_huff_ltab11[t2][t3];
   }
 
-  bitCount[1]=INVALID_BITCOUNT;
-  bitCount[2]=INVALID_BITCOUNT;
-  bitCount[3]=INVALID_BITCOUNT;
-  bitCount[4]=INVALID_BITCOUNT;
-  bitCount[5]=INVALID_BITCOUNT;
-  bitCount[6]=INVALID_BITCOUNT;
-  bitCount[7]=HI_LTAB(bc7_8)+sc;
-  bitCount[8]=LO_LTAB(bc7_8)+sc;
-  bitCount[9]=HI_LTAB(bc9_10)+sc;
-  bitCount[10]=LO_LTAB(bc9_10)+sc;
-  bitCount[11]=bc11+sc;
-
+  bitCount[1] = INVALID_BITCOUNT;
+  bitCount[2] = INVALID_BITCOUNT;
+  bitCount[3] = INVALID_BITCOUNT;
+  bitCount[4] = INVALID_BITCOUNT;
+  bitCount[5] = INVALID_BITCOUNT;
+  bitCount[6] = INVALID_BITCOUNT;
+  bitCount[7] = HI_LTAB(bc7_8) + sc;
+  bitCount[8] = LO_LTAB(bc7_8) + sc;
+  bitCount[9] = HI_LTAB(bc9_10) + sc;
+  bitCount[10] = LO_LTAB(bc9_10) + sc;
+  bitCount[11] = bc11 + sc;
 }
 
 /*****************************************************************************
@@ -356,43 +372,50 @@ static void FDKaacEnc_count7_8_9_10_11(const SHORT *RESTRICT values,
 
 *****************************************************************************/
 
-
-
-static void FDKaacEnc_count9_10_11(const SHORT *RESTRICT values,
-                         const INT  width,
-                         INT       *bitCount)
-{
-
+static void FDKaacEnc_count9_10_11(const SHORT *const values, const INT width,
+                                   INT *RESTRICT bitCount) {
   INT i;
-  INT bc9_10,bc11,sc;
-  INT t0,t1;
-
-  bc9_10=0;
-  bc11=0;
-  sc=0;
-
-  for(i=0;i<width;i+=2){
-    t0=fixp_abs(values[i+0]);
-    t1=fixp_abs(values[i+1]);
-
-    bc9_10+=FDKaacEnc_huff_ltab9_10[t0][t1];
-    bc11+= (INT) FDKaacEnc_huff_ltab11[t0][t1];
-
-    sc+=(t0>0)+(t1>0);
+  INT bc9_10, bc11, sc;
+  INT t0, t1, t2, t3;
+
+  bc9_10 = 0;
+  bc11 = 0;
+  sc = 0;
+
+  DWORD_ALIGNED(values);
+
+  for (i = 0; i < width; i += 4) {
+    t0 = values[i + 0];
+    t1 = values[i + 1];
+    t2 = values[i + 2];
+    t3 = values[i + 3];
+
+    t0 = fixp_abs(t0);
+    sc += (t0 > 0);
+    t1 = fixp_abs(t1);
+    sc += (t1 > 0);
+    t2 = fixp_abs(t2);
+    sc += (t2 > 0);
+    t3 = fixp_abs(t3);
+    sc += (t3 > 0);
+
+    bc9_10 += (INT)FDKaacEnc_huff_ltab9_10[t0][t1] +
+              (INT)FDKaacEnc_huff_ltab9_10[t2][t3];
+    bc11 +=
+        (INT)FDKaacEnc_huff_ltab11[t0][t1] + (INT)FDKaacEnc_huff_ltab11[t2][t3];
   }
 
-  bitCount[1]=INVALID_BITCOUNT;
-  bitCount[2]=INVALID_BITCOUNT;
-  bitCount[3]=INVALID_BITCOUNT;
-  bitCount[4]=INVALID_BITCOUNT;
-  bitCount[5]=INVALID_BITCOUNT;
-  bitCount[6]=INVALID_BITCOUNT;
-  bitCount[7]=INVALID_BITCOUNT;
-  bitCount[8]=INVALID_BITCOUNT;
-  bitCount[9]=HI_LTAB(bc9_10)+sc;
-  bitCount[10]=LO_LTAB(bc9_10)+sc;
-  bitCount[11]=bc11+sc;
-
+  bitCount[1] = INVALID_BITCOUNT;
+  bitCount[2] = INVALID_BITCOUNT;
+  bitCount[3] = INVALID_BITCOUNT;
+  bitCount[4] = INVALID_BITCOUNT;
+  bitCount[5] = INVALID_BITCOUNT;
+  bitCount[6] = INVALID_BITCOUNT;
+  bitCount[7] = INVALID_BITCOUNT;
+  bitCount[8] = INVALID_BITCOUNT;
+  bitCount[9] = HI_LTAB(bc9_10) + sc;
+  bitCount[10] = LO_LTAB(bc9_10) + sc;
+  bitCount[11] = bc11 + sc;
 }
 
 /*****************************************************************************
@@ -405,35 +428,47 @@ static void FDKaacEnc_count9_10_11(const SHORT *RESTRICT values,
 
 *****************************************************************************/
 
-static void FDKaacEnc_count11(const SHORT *RESTRICT values,
-                    const INT  width,
-                    INT        *bitCount)
-{
-
+static void FDKaacEnc_count11(const SHORT *const values, const INT width,
+                              INT *RESTRICT bitCount) {
   INT i;
-  INT bc11,sc;
-  INT t0,t1;
-
-  bc11=0;
-  sc=0;
-  for(i=0;i<width;i+=2){
-    t0=fixp_abs(values[i+0]);
-    t1=fixp_abs(values[i+1]);
-    bc11+= (INT) FDKaacEnc_huff_ltab11[t0][t1];
-    sc+=(t0>0)+(t1>0);
+  INT bc11, sc;
+  INT t0, t1, t2, t3;
+
+  bc11 = 0;
+  sc = 0;
+
+  DWORD_ALIGNED(values);
+
+  for (i = 0; i < width; i += 4) {
+    t0 = values[i + 0];
+    t1 = values[i + 1];
+    t2 = values[i + 2];
+    t3 = values[i + 3];
+
+    t0 = fixp_abs(t0);
+    sc += (t0 > 0);
+    t1 = fixp_abs(t1);
+    sc += (t1 > 0);
+    t2 = fixp_abs(t2);
+    sc += (t2 > 0);
+    t3 = fixp_abs(t3);
+    sc += (t3 > 0);
+
+    bc11 +=
+        (INT)FDKaacEnc_huff_ltab11[t0][t1] + (INT)FDKaacEnc_huff_ltab11[t2][t3];
   }
 
-  bitCount[1]=INVALID_BITCOUNT;
-  bitCount[2]=INVALID_BITCOUNT;
-  bitCount[3]=INVALID_BITCOUNT;
-  bitCount[4]=INVALID_BITCOUNT;
-  bitCount[5]=INVALID_BITCOUNT;
-  bitCount[6]=INVALID_BITCOUNT;
-  bitCount[7]=INVALID_BITCOUNT;
-  bitCount[8]=INVALID_BITCOUNT;
-  bitCount[9]=INVALID_BITCOUNT;
-  bitCount[10]=INVALID_BITCOUNT;
-  bitCount[11]=bc11+sc;
+  bitCount[1] = INVALID_BITCOUNT;
+  bitCount[2] = INVALID_BITCOUNT;
+  bitCount[3] = INVALID_BITCOUNT;
+  bitCount[4] = INVALID_BITCOUNT;
+  bitCount[5] = INVALID_BITCOUNT;
+  bitCount[6] = INVALID_BITCOUNT;
+  bitCount[7] = INVALID_BITCOUNT;
+  bitCount[8] = INVALID_BITCOUNT;
+  bitCount[9] = INVALID_BITCOUNT;
+  bitCount[10] = INVALID_BITCOUNT;
+  bitCount[11] = bc11 + sc;
 }
 
 /*****************************************************************************
@@ -446,677 +481,470 @@ static void FDKaacEnc_count11(const SHORT *RESTRICT values,
 
 *****************************************************************************/
 
-static void FDKaacEnc_countEsc(const SHORT *RESTRICT values,
-                     const INT  width,
-                     INT       *RESTRICT bitCount)
-{
-
+static void FDKaacEnc_countEsc(const SHORT *const values, const INT width,
+                               INT *RESTRICT bitCount) {
   INT i;
-  INT bc11,ec,sc;
-  INT t0,t1,t00,t01;
-
-  bc11=0;
-  sc=0;
-  ec=0;
-  for(i=0;i<width;i+=2){
-    t0=fixp_abs(values[i+0]);
-    t1=fixp_abs(values[i+1]);
-
-    sc+=(t0>0)+(t1>0);
-
-    t00 = fixMin(t0,16);
-    t01 = fixMin(t1,16);
-    bc11+= (INT) FDKaacEnc_huff_ltab11[t00][t01];
-
-    if(t0>=16){
-      ec+=5;
-      while((t0>>=1) >= 16)
-        ec+=2;
+  INT bc11, ec, sc;
+  INT t0, t1, t00, t01;
+
+  bc11 = 0;
+  sc = 0;
+  ec = 0;
+  for (i = 0; i < width; i += 2) {
+    t0 = fixp_abs(values[i + 0]);
+    t1 = fixp_abs(values[i + 1]);
+
+    sc += (t0 > 0) + (t1 > 0);
+
+    t00 = fixMin(t0, 16);
+    t01 = fixMin(t1, 16);
+    bc11 += (INT)FDKaacEnc_huff_ltab11[t00][t01];
+
+    if (t0 >= 16) {
+      ec += 5;
+      while ((t0 >>= 1) >= 16) ec += 2;
     }
 
-    if(t1>=16){
-      ec+=5;
-      while((t1>>=1) >= 16)
-        ec+=2;
+    if (t1 >= 16) {
+      ec += 5;
+      while ((t1 >>= 1) >= 16) ec += 2;
     }
   }
 
-  for (i=0; i<11; i++)
-    bitCount[i]=INVALID_BITCOUNT;
+  for (i = 0; i < 11; i++) bitCount[i] = INVALID_BITCOUNT;
 
-  bitCount[11]=bc11+sc+ec;
+  bitCount[11] = bc11 + sc + ec;
 }
 
-
-typedef void (*COUNT_FUNCTION)(const SHORT *RESTRICT values,
-                               const INT  width,
-                               INT       *RESTRICT bitCount);
-
-static const COUNT_FUNCTION countFuncTable[CODE_BOOK_ESC_LAV+1] =
-{
-
- FDKaacEnc_count1_2_3_4_5_6_7_8_9_10_11,  /* 0  */
- FDKaacEnc_count1_2_3_4_5_6_7_8_9_10_11,  /* 1  */
- FDKaacEnc_count3_4_5_6_7_8_9_10_11,      /* 2  */
- FDKaacEnc_count5_6_7_8_9_10_11,          /* 3  */
- FDKaacEnc_count5_6_7_8_9_10_11,          /* 4  */
- FDKaacEnc_count7_8_9_10_11,              /* 5  */
- FDKaacEnc_count7_8_9_10_11,              /* 6  */
- FDKaacEnc_count7_8_9_10_11,              /* 7  */
- FDKaacEnc_count9_10_11,                  /* 8  */
- FDKaacEnc_count9_10_11,                  /* 9  */
- FDKaacEnc_count9_10_11,                  /* 10 */
- FDKaacEnc_count9_10_11,                  /* 11 */
- FDKaacEnc_count9_10_11,                  /* 12 */
- FDKaacEnc_count11,                       /* 13 */
- FDKaacEnc_count11,                       /* 14 */
- FDKaacEnc_count11,                       /* 15 */
- FDKaacEnc_countEsc                       /* 16 */
+typedef void (*COUNT_FUNCTION)(const SHORT *const values, const INT width,
+                               INT *RESTRICT bitCount);
+
+static const COUNT_FUNCTION countFuncTable[CODE_BOOK_ESC_LAV + 1] = {
+
+    FDKaacEnc_count1_2_3_4_5_6_7_8_9_10_11, /* 0  */
+    FDKaacEnc_count1_2_3_4_5_6_7_8_9_10_11, /* 1  */
+    FDKaacEnc_count3_4_5_6_7_8_9_10_11,     /* 2  */
+    FDKaacEnc_count5_6_7_8_9_10_11,         /* 3  */
+    FDKaacEnc_count5_6_7_8_9_10_11,         /* 4  */
+    FDKaacEnc_count7_8_9_10_11,             /* 5  */
+    FDKaacEnc_count7_8_9_10_11,             /* 6  */
+    FDKaacEnc_count7_8_9_10_11,             /* 7  */
+    FDKaacEnc_count9_10_11,                 /* 8  */
+    FDKaacEnc_count9_10_11,                 /* 9  */
+    FDKaacEnc_count9_10_11,                 /* 10 */
+    FDKaacEnc_count9_10_11,                 /* 11 */
+    FDKaacEnc_count9_10_11,                 /* 12 */
+    FDKaacEnc_count11,                      /* 13 */
+    FDKaacEnc_count11,                      /* 14 */
+    FDKaacEnc_count11,                      /* 15 */
+    FDKaacEnc_countEsc                      /* 16 */
 };
 
-
-
-INT    FDKaacEnc_bitCount(const SHORT *values,
-                          const INT   width,
-                          INT         maxVal,
-                          INT        *bitCount)
-{
-
+INT FDKaacEnc_bitCount(const SHORT *const values, const INT width,
+                       const INT maxVal, INT *const RESTRICT bitCount) {
   /*
     check if we can use codebook 0
   */
 
-  if(maxVal == 0)
-    bitCount[0] = 0;
-  else
-    bitCount[0] = INVALID_BITCOUNT;
-
-  maxVal = fixMin(maxVal,(INT)CODE_BOOK_ESC_LAV);
-  countFuncTable[maxVal](values,width,bitCount);
-  return(0);
-}
-
+  bitCount[0] = (maxVal == 0) ? 0 : INVALID_BITCOUNT;
 
+  countFuncTable[fixMin(maxVal, (INT)CODE_BOOK_ESC_LAV)](values, width,
+                                                         bitCount);
 
+  return (0);
+}
 
 /*
   count difference between actual and zeroed lines
 */
-INT FDKaacEnc_countValues(SHORT *RESTRICT values, INT width, INT codeBook)
-{
-
-  INT i,t0,t1,t2,t3,t00,t01;
-  INT codeLength;
-  INT signLength;
-  INT bitCnt=0;
-
-  switch(codeBook){
-  case CODE_BOOK_ZERO_NO:
-    break;
-
-  case CODE_BOOK_1_NO:
-    for(i=0; i<width; i+=4) {
-      t0         = values[i+0];
-      t1         = values[i+1];
-      t2         = values[i+2];
-      t3         = values[i+3];
-      codeLength = HI_LTAB(FDKaacEnc_huff_ltab1_2[t0+1][t1+1][t2+1][t3+1]);
-      bitCnt+= codeLength;
-    }
-    break;
-
-  case CODE_BOOK_2_NO:
-    for(i=0; i<width; i+=4) {
-      t0         = values[i+0];
-      t1         = values[i+1];
-      t2         = values[i+2];
-      t3         = values[i+3];
-      codeLength = LO_LTAB(FDKaacEnc_huff_ltab1_2[t0+1][t1+1][t2+1][t3+1]);
-      bitCnt+= codeLength;
-    }
-    break;
-
-  case CODE_BOOK_3_NO:
-    for(i=0; i<width; i+=4) {
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        t0=fixp_abs(t0);
-      }
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        t1=fixp_abs(t1);
-      }
-      t2 = values[i+2];
-      if(t2 != 0){
-        signLength++;
-        t2=fixp_abs(t2);
-      }
-      t3 = values[i+3];
-      if(t3 != 0){
-        signLength++;
-        t3=fixp_abs(t3);
-      }
-
-      codeLength = HI_LTAB(FDKaacEnc_huff_ltab3_4[t0][t1][t2][t3]);
-      bitCnt+=codeLength+signLength;
-    }
-    break;
-
-  case CODE_BOOK_4_NO:
-    for(i=0; i<width; i+=4) {
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        t0=fixp_abs(t0);
-      }
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        t1=fixp_abs(t1);
-      }
-      t2 = values[i+2];
-      if(t2 != 0){
-        signLength++;
-        t2=fixp_abs(t2);
-      }
-      t3 = values[i+3];
-      if(t3 != 0){
-        signLength++;
-        t3=fixp_abs(t3);
-      }
-      codeLength = LO_LTAB(FDKaacEnc_huff_ltab3_4[t0][t1][t2][t3]);
-      bitCnt+=codeLength+signLength;
-    }
-    break;
-
-  case CODE_BOOK_5_NO:
-    for(i=0; i<width; i+=2) {
-      t0         = values[i+0];
-      t1         = values[i+1];
-      codeLength = HI_LTAB(FDKaacEnc_huff_ltab5_6[t0+4][t1+4]);
-      bitCnt+=codeLength;
-    }
-    break;
-
-  case CODE_BOOK_6_NO:
-    for(i=0; i<width; i+=2) {
-      t0         = values[i+0];
-      t1         = values[i+1];
-      codeLength = LO_LTAB(FDKaacEnc_huff_ltab5_6[t0+4][t1+4]);
-      bitCnt+=codeLength;
-    }
-    break;
-
-  case CODE_BOOK_7_NO:
-    for(i=0; i<width; i+=2){
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        t0=fixp_abs(t0);
-      }
-
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        t1=fixp_abs(t1);
-      }
-      codeLength = HI_LTAB(FDKaacEnc_huff_ltab7_8[t0][t1]);
-      bitCnt+=codeLength +signLength;
-    }
-    break;
-
-  case CODE_BOOK_8_NO:
-    for(i=0; i<width; i+=2) {
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        t0=fixp_abs(t0);
-      }
-
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        t1=fixp_abs(t1);
-      }
-      codeLength = LO_LTAB(FDKaacEnc_huff_ltab7_8[t0][t1]);
-      bitCnt+=codeLength +signLength;
-    }
-    break;
-
-  case CODE_BOOK_9_NO:
-    for(i=0; i<width; i+=2) {
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        t0=fixp_abs(t0);
-      }
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        t1=fixp_abs(t1);
-      }
-      codeLength = HI_LTAB(FDKaacEnc_huff_ltab9_10[t0][t1]);
-      bitCnt+=codeLength +signLength;
-    }
-    break;
-
-  case CODE_BOOK_10_NO:
-    for(i=0; i<width; i+=2) {
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        t0=fixp_abs(t0);
-      }
-
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        t1=fixp_abs(t1);
-      }
-      codeLength = LO_LTAB(FDKaacEnc_huff_ltab9_10[t0][t1]);
-      bitCnt+=codeLength +signLength;
-    }
-    break;
-
-  case CODE_BOOK_ESC_NO:
-    for(i=0; i<width; i+=2) {
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        t0=fixp_abs(t0);
-      }
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        t1=fixp_abs(t1);
-      }
-      t00 = fixMin(t0,16);
-      t01 = fixMin(t1,16);
-
-      codeLength = (INT) FDKaacEnc_huff_ltab11[t00][t01];
-      bitCnt+=codeLength +signLength;
-      if(t0 >=16){
-        INT n,p;
-        n=0;
-        p=t0;
-        while((p>>=1) >=16){
-          bitCnt++;
-          n++;
+INT FDKaacEnc_countValues(SHORT *RESTRICT values, INT width, INT codeBook) {
+  INT i, t0, t1, t2, t3;
+  INT bitCnt = 0;
+
+  switch (codeBook) {
+    case CODE_BOOK_ZERO_NO:
+      break;
+
+    case CODE_BOOK_1_NO:
+      for (i = 0; i < width; i += 4) {
+        t0 = values[i + 0];
+        t1 = values[i + 1];
+        t2 = values[i + 2];
+        t3 = values[i + 3];
+        bitCnt +=
+            HI_LTAB(FDKaacEnc_huff_ltab1_2[t0 + 1][t1 + 1][t2 + 1][t3 + 1]);
+      }
+      break;
+
+    case CODE_BOOK_2_NO:
+      for (i = 0; i < width; i += 4) {
+        t0 = values[i + 0];
+        t1 = values[i + 1];
+        t2 = values[i + 2];
+        t3 = values[i + 3];
+        bitCnt +=
+            LO_LTAB(FDKaacEnc_huff_ltab1_2[t0 + 1][t1 + 1][t2 + 1][t3 + 1]);
+      }
+      break;
+
+    case CODE_BOOK_3_NO:
+      for (i = 0; i < width; i += 4) {
+        t0 = fixp_abs(values[i + 0]);
+        bitCnt += (t0 > 0);
+        t1 = fixp_abs(values[i + 1]);
+        bitCnt += (t1 > 0);
+        t2 = fixp_abs(values[i + 2]);
+        bitCnt += (t2 > 0);
+        t3 = fixp_abs(values[i + 3]);
+        bitCnt += (t3 > 0);
+        bitCnt += HI_LTAB(FDKaacEnc_huff_ltab3_4[t0][t1][t2][t3]);
+      }
+      break;
+
+    case CODE_BOOK_4_NO:
+      for (i = 0; i < width; i += 4) {
+        t0 = fixp_abs(values[i + 0]);
+        bitCnt += (t0 > 0);
+        t1 = fixp_abs(values[i + 1]);
+        bitCnt += (t1 > 0);
+        t2 = fixp_abs(values[i + 2]);
+        bitCnt += (t2 > 0);
+        t3 = fixp_abs(values[i + 3]);
+        bitCnt += (t3 > 0);
+        bitCnt += LO_LTAB(FDKaacEnc_huff_ltab3_4[t0][t1][t2][t3]);
+      }
+      break;
+
+    case CODE_BOOK_5_NO:
+      for (i = 0; i < width; i += 4) {
+        t0 = values[i + 0];
+        t1 = values[i + 1];
+        t2 = values[i + 2];
+        t3 = values[i + 3];
+        bitCnt += HI_LTAB(FDKaacEnc_huff_ltab5_6[t0 + 4][t1 + 4]) +
+                  HI_LTAB(FDKaacEnc_huff_ltab5_6[t2 + 4][t3 + 4]);
+      }
+      break;
+
+    case CODE_BOOK_6_NO:
+      for (i = 0; i < width; i += 4) {
+        t0 = values[i + 0];
+        t1 = values[i + 1];
+        t2 = values[i + 2];
+        t3 = values[i + 3];
+        bitCnt += LO_LTAB(FDKaacEnc_huff_ltab5_6[t0 + 4][t1 + 4]) +
+                  LO_LTAB(FDKaacEnc_huff_ltab5_6[t2 + 4][t3 + 4]);
+      }
+      break;
+
+    case CODE_BOOK_7_NO:
+      for (i = 0; i < width; i += 4) {
+        t0 = fixp_abs(values[i + 0]);
+        bitCnt += (t0 > 0);
+        t1 = fixp_abs(values[i + 1]);
+        bitCnt += (t1 > 0);
+        t2 = fixp_abs(values[i + 2]);
+        bitCnt += (t2 > 0);
+        t3 = fixp_abs(values[i + 3]);
+        bitCnt += (t3 > 0);
+        bitCnt += HI_LTAB(FDKaacEnc_huff_ltab7_8[t0][t1]) +
+                  HI_LTAB(FDKaacEnc_huff_ltab7_8[t2][t3]);
+      }
+      break;
+
+    case CODE_BOOK_8_NO:
+      for (i = 0; i < width; i += 4) {
+        t0 = fixp_abs(values[i + 0]);
+        bitCnt += (t0 > 0);
+        t1 = fixp_abs(values[i + 1]);
+        bitCnt += (t1 > 0);
+        t2 = fixp_abs(values[i + 2]);
+        bitCnt += (t2 > 0);
+        t3 = fixp_abs(values[i + 3]);
+        bitCnt += (t3 > 0);
+        bitCnt += LO_LTAB(FDKaacEnc_huff_ltab7_8[t0][t1]) +
+                  LO_LTAB(FDKaacEnc_huff_ltab7_8[t2][t3]);
+      }
+      break;
+
+    case CODE_BOOK_9_NO:
+      for (i = 0; i < width; i += 4) {
+        t0 = fixp_abs(values[i + 0]);
+        bitCnt += (t0 > 0);
+        t1 = fixp_abs(values[i + 1]);
+        bitCnt += (t1 > 0);
+        t2 = fixp_abs(values[i + 2]);
+        bitCnt += (t2 > 0);
+        t3 = fixp_abs(values[i + 3]);
+        bitCnt += (t3 > 0);
+        bitCnt += HI_LTAB(FDKaacEnc_huff_ltab9_10[t0][t1]) +
+                  HI_LTAB(FDKaacEnc_huff_ltab9_10[t2][t3]);
+      }
+      break;
+
+    case CODE_BOOK_10_NO:
+      for (i = 0; i < width; i += 4) {
+        t0 = fixp_abs(values[i + 0]);
+        bitCnt += (t0 > 0);
+        t1 = fixp_abs(values[i + 1]);
+        bitCnt += (t1 > 0);
+        t2 = fixp_abs(values[i + 2]);
+        bitCnt += (t2 > 0);
+        t3 = fixp_abs(values[i + 3]);
+        bitCnt += (t3 > 0);
+        bitCnt += LO_LTAB(FDKaacEnc_huff_ltab9_10[t0][t1]) +
+                  LO_LTAB(FDKaacEnc_huff_ltab9_10[t2][t3]);
+      }
+      break;
+
+    case CODE_BOOK_ESC_NO:
+      for (i = 0; i < width; i += 2) {
+        t0 = fixp_abs(values[i + 0]);
+        bitCnt += (t0 > 0);
+        t1 = fixp_abs(values[i + 1]);
+        bitCnt += (t1 > 0);
+        bitCnt += (INT)FDKaacEnc_huff_ltab11[fixMin(t0, 16)][fixMin(t1, 16)];
+        if (t0 >= 16) {
+          bitCnt += 5;
+          while ((t0 >>= 1) >= 16) bitCnt += 2;
         }
-        bitCnt+=(n+5);
-      }
-      if(t1 >=16){
-        INT n,p;
-        n=0;
-        p=t1;
-        while((p>>=1) >=16){
-          bitCnt++;
-          n++;
+        if (t1 >= 16) {
+          bitCnt += 5;
+          while ((t1 >>= 1) >= 16) bitCnt += 2;
         }
-        bitCnt+=(n+5);
       }
-    }
-    break;
+      break;
 
-  default:
-    break;
+    default:
+      break;
   }
 
-  return(bitCnt);
+  return (bitCnt);
 }
 
-
-
-INT FDKaacEnc_codeValues(SHORT *RESTRICT values, INT width, INT codeBook,  HANDLE_FDK_BITSTREAM hBitstream)
-{
-
-  INT i,t0,t1,t2,t3,t00,t01;
-  INT codeWord,codeLength;
-  INT sign,signLength;
-
-  switch(codeBook){
-  case CODE_BOOK_ZERO_NO:
-    break;
-
-  case CODE_BOOK_1_NO:
-    for(i=0; i<width; i+=4) {
-      t0         = values[i+0]+1;
-      t1         = values[i+1]+1;
-      t2         = values[i+2]+1;
-      t3         = values[i+3]+1;
-      codeWord   = FDKaacEnc_huff_ctab1[t0][t1][t2][t3];
-      codeLength = HI_LTAB(FDKaacEnc_huff_ltab1_2[t0][t1][t2][t3]);
-      FDKwriteBits(hBitstream,codeWord,codeLength);
-    }
-    break;
-
-  case CODE_BOOK_2_NO:
-    for(i=0; i<width; i+=4) {
-      t0         = values[i+0]+1;
-      t1         = values[i+1]+1;
-      t2         = values[i+2]+1;
-      t3         = values[i+3]+1;
-      codeWord   = FDKaacEnc_huff_ctab2[t0][t1][t2][t3];
-      codeLength = LO_LTAB(FDKaacEnc_huff_ltab1_2[t0][t1][t2][t3]);
-      FDKwriteBits(hBitstream,codeWord,codeLength);
-    }
-    break;
-
-  case CODE_BOOK_3_NO:
-    for(i=0; i<width; i+=4) {
-      sign=0;
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        sign<<=1;
-        if(t0 < 0){
-          sign|=1;
-          t0=fixp_abs(t0);
+INT FDKaacEnc_codeValues(SHORT *RESTRICT values, INT width, INT codeBook,
+                         HANDLE_FDK_BITSTREAM hBitstream) {
+  INT i, t0, t1, t2, t3, t00, t01;
+  INT codeWord, codeLength;
+  INT sign, signLength;
+
+  DWORD_ALIGNED(values);
+
+  switch (codeBook) {
+    case CODE_BOOK_ZERO_NO:
+      break;
+
+    case CODE_BOOK_1_NO:
+      for (i = 0; i < width; i += 4) {
+        t0 = values[i + 0] + 1;
+        t1 = values[i + 1] + 1;
+        t2 = values[i + 2] + 1;
+        t3 = values[i + 3] + 1;
+        codeWord = FDKaacEnc_huff_ctab1[t0][t1][t2][t3];
+        codeLength = HI_LTAB(FDKaacEnc_huff_ltab1_2[t0][t1][t2][t3]);
+        FDKwriteBits(hBitstream, codeWord, codeLength);
+      }
+      break;
+
+    case CODE_BOOK_2_NO:
+      for (i = 0; i < width; i += 4) {
+        t0 = values[i + 0] + 1;
+        t1 = values[i + 1] + 1;
+        t2 = values[i + 2] + 1;
+        t3 = values[i + 3] + 1;
+        codeWord = FDKaacEnc_huff_ctab2[t0][t1][t2][t3];
+        codeLength = LO_LTAB(FDKaacEnc_huff_ltab1_2[t0][t1][t2][t3]);
+        FDKwriteBits(hBitstream, codeWord, codeLength);
+      }
+      break;
+
+    case CODE_BOOK_3_NO:
+      for (i = 0; i < (width >> 2); i++) {
+        sign = 0;
+        signLength = 0;
+        int index[4];
+        for (int j = 0; j < 4; j++) {
+          int ti = *values++;
+          int zero = (ti == 0) ? 0 : 1;
+          signLength += zero;
+          sign = (sign << zero) + ((UINT)ti >> 31);
+          index[j] = fixp_abs(ti);
         }
-      }
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        sign<<=1;
-        if(t1 < 0){
-          sign|=1;
-          t1=fixp_abs(t1);
-        }
-      }
-      t2 = values[i+2];
-      if(t2 != 0){
-        signLength++;
-        sign<<=1;
-        if(t2 < 0){
-          sign|=1;
-          t2=fixp_abs(t2);
+        codeWord = FDKaacEnc_huff_ctab3[index[0]][index[1]][index[2]][index[3]];
+        codeLength = HI_LTAB(
+            FDKaacEnc_huff_ltab3_4[index[0]][index[1]][index[2]][index[3]]);
+        FDKwriteBits(hBitstream, (codeWord << signLength) | sign,
+                     codeLength + signLength);
+      }
+      break;
+
+    case CODE_BOOK_4_NO:
+      for (i = 0; i < width; i += 4) {
+        sign = 0;
+        signLength = 0;
+        int index[4];
+        for (int j = 0; j < 4; j++) {
+          int ti = *values++;
+          int zero = (ti == 0) ? 0 : 1;
+          signLength += zero;
+          sign = (sign << zero) + ((UINT)ti >> 31);
+          index[j] = fixp_abs(ti);
         }
-      }
-      t3 = values[i+3];
-      if(t3 != 0){
-        signLength++;
-        sign<<=1;
-        if(t3 < 0){
-          sign|=1;
-          t3=fixp_abs(t3);
+        codeWord = FDKaacEnc_huff_ctab4[index[0]][index[1]][index[2]][index[3]];
+        codeLength = LO_LTAB(
+            FDKaacEnc_huff_ltab3_4[index[0]][index[1]][index[2]][index[3]]);
+        FDKwriteBits(hBitstream, (codeWord << signLength) | sign,
+                     codeLength + signLength);
+      }
+      break;
+
+    case CODE_BOOK_5_NO:
+      for (i = 0; i < (width >> 2); i++) {
+        t0 = *values++ + 4;
+        t1 = *values++ + 4;
+        t2 = *values++ + 4;
+        t3 = *values++ + 4;
+        codeWord = FDKaacEnc_huff_ctab5[t0][t1];
+        codeLength =
+            HI_LTAB(FDKaacEnc_huff_ltab5_6[t2][t3]); /* length of 2nd cw */
+        codeWord = (codeWord << codeLength) + FDKaacEnc_huff_ctab5[t2][t3];
+        codeLength += HI_LTAB(FDKaacEnc_huff_ltab5_6[t0][t1]);
+        FDKwriteBits(hBitstream, codeWord, codeLength);
+      }
+      break;
+
+    case CODE_BOOK_6_NO:
+      for (i = 0; i < (width >> 2); i++) {
+        t0 = *values++ + 4;
+        t1 = *values++ + 4;
+        t2 = *values++ + 4;
+        t3 = *values++ + 4;
+        codeWord = FDKaacEnc_huff_ctab6[t0][t1];
+        codeLength =
+            LO_LTAB(FDKaacEnc_huff_ltab5_6[t2][t3]); /* length of 2nd cw */
+        codeWord = (codeWord << codeLength) + FDKaacEnc_huff_ctab6[t2][t3];
+        codeLength += LO_LTAB(FDKaacEnc_huff_ltab5_6[t0][t1]);
+        FDKwriteBits(hBitstream, codeWord, codeLength);
+      }
+      break;
+
+    case CODE_BOOK_7_NO:
+      for (i = 0; i < (width >> 1); i++) {
+        t0 = *values++;
+        sign = ((UINT)t0 >> 31);
+        t0 = fixp_abs(t0);
+        signLength = (t0 == 0) ? 0 : 1;
+        t1 = *values++;
+        INT zero = (t1 == 0) ? 0 : 1;
+        signLength += zero;
+        sign = (sign << zero) + ((UINT)t1 >> 31);
+        t1 = fixp_abs(t1);
+        codeWord = FDKaacEnc_huff_ctab7[t0][t1];
+        codeLength = HI_LTAB(FDKaacEnc_huff_ltab7_8[t0][t1]);
+        FDKwriteBits(hBitstream, (codeWord << signLength) | sign,
+                     codeLength + signLength);
+      }
+      break;
+
+    case CODE_BOOK_8_NO:
+      for (i = 0; i < (width >> 1); i++) {
+        t0 = *values++;
+        sign = ((UINT)t0 >> 31);
+        t0 = fixp_abs(t0);
+        signLength = (t0 == 0) ? 0 : 1;
+        t1 = *values++;
+        INT zero = (t1 == 0) ? 0 : 1;
+        signLength += zero;
+        sign = (sign << zero) + ((UINT)t1 >> 31);
+        t1 = fixp_abs(t1);
+        codeWord = FDKaacEnc_huff_ctab8[t0][t1];
+        codeLength = LO_LTAB(FDKaacEnc_huff_ltab7_8[t0][t1]);
+        FDKwriteBits(hBitstream, (codeWord << signLength) | sign,
+                     codeLength + signLength);
+      }
+      break;
+
+    case CODE_BOOK_9_NO:
+      for (i = 0; i < (width >> 1); i++) {
+        t0 = *values++;
+        sign = ((UINT)t0 >> 31);
+        t0 = fixp_abs(t0);
+        signLength = (t0 == 0) ? 0 : 1;
+        t1 = *values++;
+        INT zero = (t1 == 0) ? 0 : 1;
+        signLength += zero;
+        sign = (sign << zero) + ((UINT)t1 >> 31);
+        t1 = fixp_abs(t1);
+        codeWord = FDKaacEnc_huff_ctab9[t0][t1];
+        codeLength = HI_LTAB(FDKaacEnc_huff_ltab9_10[t0][t1]);
+        FDKwriteBits(hBitstream, (codeWord << signLength) | sign,
+                     codeLength + signLength);
+      }
+      break;
+
+    case CODE_BOOK_10_NO:
+      for (i = 0; i < (width >> 1); i++) {
+        t0 = *values++;
+        sign = ((UINT)t0 >> 31);
+        t0 = fixp_abs(t0);
+        signLength = (t0 == 0) ? 0 : 1;
+        t1 = *values++;
+        INT zero = (t1 == 0) ? 0 : 1;
+        signLength += zero;
+        sign = (sign << zero) + ((UINT)t1 >> 31);
+        t1 = fixp_abs(t1);
+        codeWord = FDKaacEnc_huff_ctab10[t0][t1];
+        codeLength = LO_LTAB(FDKaacEnc_huff_ltab9_10[t0][t1]);
+        FDKwriteBits(hBitstream, (codeWord << signLength) | sign,
+                     codeLength + signLength);
+      }
+      break;
+
+    case CODE_BOOK_ESC_NO:
+      for (i = 0; i < (width >> 1); i++) {
+        t0 = *values++;
+        sign = ((UINT)t0 >> 31);
+        t0 = fixp_abs(t0);
+        signLength = (t0 == 0) ? 0 : 1;
+        t1 = *values++;
+        INT zero = (t1 == 0) ? 0 : 1;
+        signLength += zero;
+        sign = (sign << zero) + ((UINT)t1 >> 31);
+        t1 = fixp_abs(t1);
+
+        t00 = fixMin(t0, 16);
+        t01 = fixMin(t1, 16);
+
+        codeWord = FDKaacEnc_huff_ctab11[t00][t01];
+        codeLength = (INT)FDKaacEnc_huff_ltab11[t00][t01];
+        FDKwriteBits(hBitstream, (codeWord << signLength) | sign,
+                     codeLength + signLength);
+        for (int j = 0; j < 2; j++) {
+          if (t0 >= 16) {
+            INT n = 4, p = t0;
+            for (; (p >>= 1) >= 16;) n++;
+            FDKwriteBits(hBitstream,
+                         (((1 << (n - 3)) - 2) << n) | (t0 - (1 << n)),
+                         n + n - 3);
+          }
+          t0 = t1;
         }
       }
+      break;
 
-      codeWord   = FDKaacEnc_huff_ctab3[t0][t1][t2][t3];
-      codeLength = HI_LTAB(FDKaacEnc_huff_ltab3_4[t0][t1][t2][t3]);
-      FDKwriteBits(hBitstream,codeWord,codeLength);
-      FDKwriteBits(hBitstream,sign,signLength);
-    }
-    break;
-
-  case CODE_BOOK_4_NO:
-    for(i=0; i<width; i+=4) {
-      sign=0;
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        sign<<=1;
-        if(t0 < 0){
-          sign|=1;
-          t0=fixp_abs(t0);
-        }
-      }
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        sign<<=1;
-        if(t1 < 0){
-          sign|=1;
-          t1=fixp_abs(t1);
-        }
-      }
-      t2 = values[i+2];
-      if(t2 != 0){
-        signLength++;
-        sign<<=1;
-        if(t2 < 0){
-          sign|=1;
-          t2=fixp_abs(t2);
-        }
-      }
-      t3 = values[i+3];
-      if(t3 != 0){
-        signLength++;
-        sign<<=1;
-        if(t3 < 0){
-          sign|=1;
-          t3=fixp_abs(t3);
-        }
-      }
-      codeWord   = FDKaacEnc_huff_ctab4[t0][t1][t2][t3];
-      codeLength = LO_LTAB(FDKaacEnc_huff_ltab3_4[t0][t1][t2][t3]);
-      FDKwriteBits(hBitstream,codeWord,codeLength);
-      FDKwriteBits(hBitstream,sign,signLength);
-    }
-    break;
-
-  case CODE_BOOK_5_NO:
-    for(i=0; i<width; i+=2) {
-      t0         = values[i+0]+4;
-      t1         = values[i+1]+4;
-      codeWord   = FDKaacEnc_huff_ctab5[t0][t1];
-      codeLength = HI_LTAB(FDKaacEnc_huff_ltab5_6[t0][t1]);
-      FDKwriteBits(hBitstream,codeWord,codeLength);
-    }
-    break;
-
-  case CODE_BOOK_6_NO:
-    for(i=0; i<width; i+=2) {
-      t0         = values[i+0]+4;
-      t1         = values[i+1]+4;
-      codeWord   = FDKaacEnc_huff_ctab6[t0][t1];
-      codeLength = LO_LTAB(FDKaacEnc_huff_ltab5_6[t0][t1]);
-      FDKwriteBits(hBitstream,codeWord,codeLength);
-    }
-    break;
-
-  case CODE_BOOK_7_NO:
-    for(i=0; i<width; i+=2){
-      sign=0;
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        sign<<=1;
-        if(t0 < 0){
-          sign|=1;
-          t0=fixp_abs(t0);
-        }
-      }
-
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        sign<<=1;
-        if(t1 < 0){
-          sign|=1;
-          t1=fixp_abs(t1);
-        }
-      }
-      codeWord   = FDKaacEnc_huff_ctab7[t0][t1];
-      codeLength = HI_LTAB(FDKaacEnc_huff_ltab7_8[t0][t1]);
-      FDKwriteBits(hBitstream,codeWord,codeLength);
-      FDKwriteBits(hBitstream,sign,signLength);
-    }
-    break;
-
-  case CODE_BOOK_8_NO:
-    for(i=0; i<width; i+=2) {
-      sign=0;
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        sign<<=1;
-        if(t0 < 0){
-          sign|=1;
-          t0=fixp_abs(t0);
-        }
-      }
-
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        sign<<=1;
-        if(t1 < 0){
-          sign|=1;
-          t1=fixp_abs(t1);
-        }
-      }
-      codeWord   = FDKaacEnc_huff_ctab8[t0][t1];
-      codeLength = LO_LTAB(FDKaacEnc_huff_ltab7_8[t0][t1]);
-      FDKwriteBits(hBitstream,codeWord,codeLength);
-      FDKwriteBits(hBitstream,sign,signLength);
-    }
-    break;
-
-  case CODE_BOOK_9_NO:
-    for(i=0; i<width; i+=2) {
-      sign=0;
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        sign<<=1;
-        if(t0 < 0){
-          sign|=1;
-          t0=fixp_abs(t0);
-        }
-      }
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        sign<<=1;
-        if(t1 < 0){
-          sign|=1;
-          t1=fixp_abs(t1);
-        }
-      }
-      codeWord   = FDKaacEnc_huff_ctab9[t0][t1];
-      codeLength = HI_LTAB(FDKaacEnc_huff_ltab9_10[t0][t1]);
-      FDKwriteBits(hBitstream,codeWord,codeLength);
-      FDKwriteBits(hBitstream,sign,signLength);
-    }
-    break;
-
-  case CODE_BOOK_10_NO:
-    for(i=0; i<width; i+=2) {
-      sign=0;
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        sign<<=1;
-        if(t0 < 0){
-          sign|=1;
-          t0=fixp_abs(t0);
-        }
-      }
-
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        sign<<=1;
-        if(t1 < 0){
-          sign|=1;
-          t1=fixp_abs(t1);
-        }
-      }
-      codeWord   = FDKaacEnc_huff_ctab10[t0][t1];
-      codeLength = LO_LTAB(FDKaacEnc_huff_ltab9_10[t0][t1]);
-      FDKwriteBits(hBitstream,codeWord,codeLength);
-      FDKwriteBits(hBitstream,sign,signLength);
-    }
-    break;
-
-  case CODE_BOOK_ESC_NO:
-    for(i=0; i<width; i+=2) {
-      sign=0;
-      signLength=0;
-      t0 = values[i+0];
-      if(t0 != 0){
-        signLength++;
-        sign<<=1;
-        if(t0 < 0){
-          sign|=1;
-          t0=fixp_abs(t0);
-        }
-      }
-      t1 = values[i+1];
-      if(t1 != 0){
-        signLength++;
-        sign<<=1;
-        if(t1 < 0){
-          sign|=1;
-          t1=fixp_abs(t1);
-        }
-      }
-      t00 = fixMin(t0,16);
-      t01 = fixMin(t1,16);
-
-      codeWord   = FDKaacEnc_huff_ctab11[t00][t01];
-      codeLength = (INT) FDKaacEnc_huff_ltab11[t00][t01];
-      FDKwriteBits(hBitstream,codeWord,codeLength);
-      FDKwriteBits(hBitstream,sign,signLength);
-      if(t0 >=16){
-        INT n,p;
-        n=0;
-        p=t0;
-        while((p>>=1) >=16){
-          FDKwriteBits(hBitstream,1,1);
-          n++;
-        }
-        FDKwriteBits(hBitstream,0,1);
-        FDKwriteBits(hBitstream,t0-(1<<(n+4)),n+4);
-      }
-      if(t1 >=16){
-        INT n,p;
-        n=0;
-        p=t1;
-        while((p>>=1) >=16){
-          FDKwriteBits(hBitstream,1,1);
-          n++;
-        }
-        FDKwriteBits(hBitstream,0,1);
-        FDKwriteBits(hBitstream,t1-(1<<(n+4)),n+4);
-      }
-    }
-    break;
-
-  default:
-    break;
+    default:
+      break;
   }
-  return(0);
+  return (0);
 }
 
-INT FDKaacEnc_codeScalefactorDelta(INT delta, HANDLE_FDK_BITSTREAM hBitstream)
-{
-  INT codeWord,codeLength;
+INT FDKaacEnc_codeScalefactorDelta(INT delta, HANDLE_FDK_BITSTREAM hBitstream) {
+  INT codeWord, codeLength;
 
-  if(fixp_abs(delta) >CODE_BOOK_SCF_LAV)
-    return(1);
+  if (fixp_abs(delta) > CODE_BOOK_SCF_LAV) return (1);
 
-  codeWord   = FDKaacEnc_huff_ctabscf[delta+CODE_BOOK_SCF_LAV];
-  codeLength = (INT)FDKaacEnc_huff_ltabscf[delta+CODE_BOOK_SCF_LAV];
-  FDKwriteBits(hBitstream,codeWord,codeLength);
-  return(0);
+  codeWord = FDKaacEnc_huff_ctabscf[delta + CODE_BOOK_SCF_LAV];
+  codeLength = (INT)FDKaacEnc_huff_ltabscf[delta + CODE_BOOK_SCF_LAV];
+  FDKwriteBits(hBitstream, codeWord, codeLength);
+  return (0);
 }
-
-
-