aboutsummaryrefslogtreecommitdiffstats
path: root/libAACenc/src/bit_cnt.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libAACenc/src/bit_cnt.cpp')
-rw-r--r--libAACenc/src/bit_cnt.cpp1714
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);
}
-
-
-