diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2011-01-01 14:27:41 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-31 16:00:58 +0200 |
commit | 42ed53f221dc6570b7f6e05ef93f38b7457a68d8 (patch) | |
tree | 457bc346edf64f3affb2bee9870c106fc03f866c /libfaad2/codebook | |
parent | f6fb536f87e687a4aacca75dd9ad1c7b71ffa731 (diff) | |
download | mpv-42ed53f221dc6570b7f6e05ef93f38b7457a68d8.tar.bz2 mpv-42ed53f221dc6570b7f6e05ef93f38b7457a68d8.tar.xz |
libfaad2:/ Remove forked internal libfaad2 copy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32741 b3059339-0415-0410-9bf9-f77b7e298cf2
Remove AAC/FAAD2 installation instructions.
There is nothing special about building and installing FAAD2, so there is
no longer a need to keep maintaining instructions for it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32742 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/codebook')
-rw-r--r-- | libfaad2/codebook/hcb.h | 142 | ||||
-rw-r--r-- | libfaad2/codebook/hcb_1.h | 183 | ||||
-rw-r--r-- | libfaad2/codebook/hcb_10.h | 309 | ||||
-rw-r--r-- | libfaad2/codebook/hcb_11.h | 412 | ||||
-rw-r--r-- | libfaad2/codebook/hcb_2.h | 182 | ||||
-rw-r--r-- | libfaad2/codebook/hcb_3.h | 193 | ||||
-rw-r--r-- | libfaad2/codebook/hcb_4.h | 196 | ||||
-rw-r--r-- | libfaad2/codebook/hcb_5.h | 193 | ||||
-rw-r--r-- | libfaad2/codebook/hcb_6.h | 179 | ||||
-rw-r--r-- | libfaad2/codebook/hcb_7.h | 159 | ||||
-rw-r--r-- | libfaad2/codebook/hcb_8.h | 170 | ||||
-rw-r--r-- | libfaad2/codebook/hcb_9.h | 369 | ||||
-rw-r--r-- | libfaad2/codebook/hcb_sf.h | 273 |
13 files changed, 0 insertions, 2960 deletions
diff --git a/libfaad2/codebook/hcb.h b/libfaad2/codebook/hcb.h deleted file mode 100644 index 093dfb265b..0000000000 --- a/libfaad2/codebook/hcb.h +++ /dev/null @@ -1,142 +0,0 @@ -/* -** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -** -** Any non-GPL usage of this software or parts of this software is strictly -** forbidden. -** -** Commercial non-GPL licensing of this software is possible. -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. -** -** $Id: hcb.h,v 1.6 2003/09/09 18:12:01 menno Exp $ -**/ - -#ifndef __HCB_H__ -#define __HCB_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * Optimal huffman decoding for AAC taken from: - * "SELECTING AN OPTIMAL HUFFMAN DECODER FOR AAC" by - * VLADIMIR Z. MESAROVIC , RAGHUNATH RAO, MIROSLAV V. DOKIC, and SACHIN DEO - * AES paper 5436 - * - * 2 methods are used for huffman decoding: - * - binary search - * - 2-step table lookup - * - * The choice of the "optimal" method is based on the fact that if the - * memory size for the Two-step is exorbitantly high then the decision - * is Binary search for that codebook. However, for marginally more memory - * size, if Twostep outperforms even the best case of Binary then the - * decision is Two-step for that codebook. - * - * The following methods are used for the different tables. - * codebook "optimal" method - * HCB_1 2-Step - * HCB_2 2-Step - * HCB_3 Binary - * HCB_4 2-Step - * HCB_5 Binary - * HCB_6 2-Step - * HCB_7 Binary - * HCB_8 2-Step - * HCB_9 Binary - * HCB_10 2-Step - * HCB_11 2-Step - * HCB_SF Binary - * - */ - - -#define ZERO_HCB 0 -#define FIRST_PAIR_HCB 5 -#define ESC_HCB 11 -#define QUAD_LEN 4 -#define PAIR_LEN 2 -#define NOISE_HCB 13 -#define INTENSITY_HCB2 14 -#define INTENSITY_HCB 15 - -/* 1st step table */ -typedef struct -{ - uint8_t offset; - uint8_t extra_bits; -} hcb; - -/* 2nd step table with quadruple data */ -typedef struct -{ - uint8_t bits; - int8_t x; - int8_t y; -} hcb_2_pair; - -typedef struct -{ - uint8_t bits; - int8_t x; - int8_t y; - int8_t v; - int8_t w; -} hcb_2_quad; - -/* binary search table */ -typedef struct -{ - uint8_t is_leaf; - int8_t data[4]; -} hcb_bin_quad; - -typedef struct -{ - uint8_t is_leaf; - int8_t data[2]; -} hcb_bin_pair; - -hcb *hcb_table[]; -hcb_2_quad *hcb_2_quad_table[]; -hcb_2_pair *hcb_2_pair_table[]; -hcb_bin_pair *hcb_bin_table[]; -uint8_t hcbN[]; -uint8_t unsigned_cb[]; -int hcb_2_quad_table_size[]; -int hcb_2_pair_table_size[]; -int hcb_bin_table_size[]; - -#include "codebook/hcb_1.h" -#include "codebook/hcb_2.h" -#include "codebook/hcb_3.h" -#include "codebook/hcb_4.h" -#include "codebook/hcb_5.h" -#include "codebook/hcb_6.h" -#include "codebook/hcb_7.h" -#include "codebook/hcb_8.h" -#include "codebook/hcb_9.h" -#include "codebook/hcb_10.h" -#include "codebook/hcb_11.h" -#include "codebook/hcb_sf.h" - - -#ifdef __cplusplus -} -#endif -#endif diff --git a/libfaad2/codebook/hcb_1.h b/libfaad2/codebook/hcb_1.h deleted file mode 100644 index cee50fcccf..0000000000 --- a/libfaad2/codebook/hcb_1.h +++ /dev/null @@ -1,183 +0,0 @@ -/* -** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -** -** Any non-GPL usage of this software or parts of this software is strictly -** forbidden. -** -** Commercial non-GPL licensing of this software is possible. -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. -** -** $Id: hcb_1.h,v 1.3 2003/09/09 18:12:01 menno Exp $ -**/ - -/* 2-step huffman table HCB_1 */ - - -/* 1st step: 5 bits - * 2^5 = 32 entries - * - * Used to find offset into 2nd step table and number of extra bits to get - */ -static hcb hcb1_1[] = { - { /* 00000 */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* 10000 */ 1, 0 }, - { /* 10001 */ 2, 0 }, - { /* 10010 */ 3, 0 }, - { /* 10011 */ 4, 0 }, - { /* 10100 */ 5, 0 }, - { /* 10101 */ 6, 0 }, - { /* 10110 */ 7, 0 }, - { /* 10111 */ 8, 0 }, - - /* 7 bit codewords */ - { /* 11000 */ 9, 2 }, - { /* 11001 */ 13, 2 }, - { /* 11010 */ 17, 2 }, - { /* 11011 */ 21, 2 }, - { /* 11100 */ 25, 2 }, - { /* 11101 */ 29, 2 }, - - /* 9 bit codewords */ - { /* 11110 */ 33, 4 }, - - /* 9/10/11 bit codewords */ - { /* 11111 */ 49, 6 } -}; - -/* 2nd step table - * - * Gives size of codeword and actual data (x,y,v,w) - */ -static hcb_2_quad hcb1_2[] = { - /* 1 bit codeword */ - { 1, 0, 0, 0, 0 }, - - /* 5 bit codewords */ - { 5, 1, 0, 0, 0 }, - { 5, -1, 0, 0, 0 }, - { 5, 0, 0, 0, -1 }, - { 5, 0, 1, 0, 0 }, - { 5, 0, 0, 0, 1 }, - { 5, 0, 0, -1, 0 }, - { 5, 0, 0, 1, 0 }, - { 5, 0, -1, 0, 0 }, - - /* 7 bit codewords */ - /* first 5 bits: 11000 */ - { 7, 1, -1, 0, 0 }, - { 7, -1, 1, 0, 0 }, - { 7, 0, 0, -1, 1 }, - { 7, 0, 1, -1, 0 }, - /* first 5 bits: 11001 */ - { 7, 0, -1, 1, 0 }, - { 7, 0, 0, 1, -1 }, - { 7, 1, 1, 0, 0 }, - { 7, 0, 0, -1, -1 }, - /* first 5 bits: 11010 */ - { 7, -1, -1, 0, 0 }, - { 7, 0, -1, -1, 0 }, - { 7, 1, 0, -1, 0 }, - { 7, 0, 1, 0, -1 }, - /* first 5 bits: 11011 */ - { 7, -1, 0, 1, 0 }, - { 7, 0, 0, 1, 1 }, - { 7, 1, 0, 1, 0 }, - { 7, 0, -1, 0, 1 }, - /* first 5 bits: 11100 */ - { 7, 0, 1, 1, 0 }, - { 7, 0, 1, 0, 1 }, - { 7, -1, 0, -1, 0 }, - { 7, 1, 0, 0, 1 }, - /* first 5 bits: 11101 */ - { 7, -1, 0, 0, -1 }, - { 7, 1, 0, 0, -1 }, - { 7, -1, 0, 0, 1 }, - { 7, 0, -1, 0, -1 }, - - /* 9 bit codeword */ - /* first 5 bits: 11110 */ - { 9, 1, 1, -1, 0 }, - { 9, -1, 1, -1, 0 }, - { 9, 1, -1, 1, 0 }, - { 9, 0, 1, 1, -1 }, - { 9, 0, 1, -1, 1 }, - { 9, 0, -1, 1, 1 }, - { 9, 0, -1, 1, -1 }, - { 9, 1, -1, -1, 0 }, - { 9, 1, 0, -1, 1 }, - { 9, 0, 1, -1, -1 }, - { 9, -1, 1, 1, 0 }, - { 9, -1, 0, 1, -1 }, - { 9, -1, -1, 1, 0 }, - { 9, 0, -1, -1, 1 }, - { 9, 1, -1, 0, 1 }, - { 9, 1, -1, 0, -1 }, - - /* 9/10/11 bit codewords */ - /* first 5 bits: 11111 */ - /* 9 bit: reading 11 bits -> 2 too much so 4 entries for each codeword */ - { 9, -1, 1, 0, -1 }, { 9, -1, 1, 0, -1 }, { 9, -1, 1, 0, -1 }, { 9, -1, 1, 0, -1 }, - { 9, -1, -1, -1, 0 }, { 9, -1, -1, -1, 0 }, { 9, -1, -1, -1, 0 }, { 9, -1, -1, -1, 0 }, - { 9, 0, -1, -1, -1 }, { 9, 0, -1, -1, -1 }, { 9, 0, -1, -1, -1 }, { 9, 0, -1, -1, -1 }, - { 9, 0, 1, 1, 1 }, { 9, 0, 1, 1, 1 }, { 9, 0, 1, 1, 1 }, { 9, 0, 1, 1, 1 }, - { 9, 1, 0, 1, -1 }, { 9, 1, 0, 1, -1 }, { 9, 1, 0, 1, -1 }, { 9, 1, 0, 1, -1 }, - { 9, 1, 1, 0, 1 }, { 9, 1, 1, 0, 1 }, { 9, 1, 1, 0, 1 }, { 9, 1, 1, 0, 1 }, - { 9, -1, 1, 0, 1 }, { 9, -1, 1, 0, 1 }, { 9, -1, 1, 0, 1 }, { 9, -1, 1, 0, 1 }, - { 9, 1, 1, 1, 0 }, { 9, 1, 1, 1, 0 }, { 9, 1, 1, 1, 0 }, { 9, 1, 1, 1, 0 }, - /* 10 bit: reading 11 bits -> 1 too much so 2 entries for each codeword */ - { 10, -1, -1, 0, 1 }, { 10, -1, -1, 0, 1 }, - { 10, -1, 0, -1, -1 }, { 10, -1, 0, -1, -1 }, - { 10, 1, 1, 0, -1 }, { 10, 1, 1, 0, -1 }, - { 10, 1, 0, -1, -1 }, { 10, 1, 0, -1, -1 }, - { 10, -1, 0, -1, 1 }, { 10, -1, 0, -1, 1 }, - { 10, -1, -1, 0, -1 }, { 10, -1, -1, 0, -1 }, - { 10, -1, 0, 1, 1 }, { 10, -1, 0, 1, 1 }, - { 10, 1, 0, 1, 1 }, { 10, 1, 0, 1, 1 }, - /* 11 bit */ - { 11, 1, -1, 1, -1 }, - { 11, -1, 1, -1, 1 }, - { 11, -1, 1, 1, -1 }, - { 11, 1, -1, -1, 1 }, - { 11, 1, 1, 1, 1 }, - { 11, -1, -1, 1, 1 }, - { 11, 1, 1, -1, -1 }, - { 11, -1, -1, 1, -1 }, - { 11, -1, -1, -1, -1 }, - { 11, 1, 1, -1, 1 }, - { 11, 1, -1, 1, 1 }, - { 11, -1, 1, 1, 1 }, - { 11, -1, 1, -1, -1 }, - { 11, -1, -1, -1, 1 }, - { 11, 1, -1, -1, -1 }, - { 11, 1, 1, 1, -1 } -}; diff --git a/libfaad2/codebook/hcb_10.h b/libfaad2/codebook/hcb_10.h deleted file mode 100644 index 7fc2fd5526..0000000000 --- a/libfaad2/codebook/hcb_10.h +++ /dev/null @@ -1,309 +0,0 @@ -/* -** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -** -** Any non-GPL usage of this software or parts of this software is strictly -** forbidden. -** -** Commercial non-GPL licensing of this software is possible. -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. -** -** $Id: hcb_10.h,v 1.3 2003/09/09 18:12:01 menno Exp $ -**/ - -/* 2-step huffman table HCB_10 */ - - -/* 1st step: 6 bits - * 2^6 = 64 entries - * - * Used to find offset into 2nd step table and number of extra bits to get - */ -static hcb hcb10_1[] = { - /* 4 bit codewords */ - { /* 000000 */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* */ 0, 0 }, - { /* 000100 */ 1, 0 }, - { /* */ 1, 0 }, - { /* */ 1, 0 }, - { /* */ 1, 0 }, - { /* 001000 */ 2, 0 }, - { /* */ 2, 0 }, - { /* */ 2, 0 }, - { /* */ 2, 0 }, - /* 5 bit codewords */ - { /* 001100 */ 3, 0 }, - { /* */ 3, 0 }, - { /* 001110 */ 4, 0 }, - { /* */ 4, 0 }, - { /* 010000 */ 5, 0 }, - { /* */ 5, 0 }, - { /* 010010 */ 6, 0 }, - { /* */ 6, 0 }, - { /* 010100 */ 7, 0 }, - { /* */ 7, 0 }, - { /* 010110 */ 8, 0 }, - { /* */ 8, 0 }, - { /* 011000 */ 9, 0 }, - { /* */ 9, 0 }, - { /* 011010 */ 10, 0 }, - { /* */ 10, 0 }, - /* 6 bit codewords */ - { /* 011100 */ 11, 0 }, - { /* 011101 */ 12, 0 }, - { /* 011110 */ 13, 0 }, - { /* 011111 */ 14, 0 }, - { /* 100000 */ 15, 0 }, - { /* 100001 */ 16, 0 }, - { /* 100010 */ 17, 0 }, - { /* 100011 */ 18, 0 }, - { /* 100100 */ 19, 0 }, - { /* 100101 */ 20, 0 }, - { /* 100110 */ 21, 0 }, - { /* 100111 */ 22, 0 }, - { /* 101000 */ 23, 0 }, - { /* 101001 */ 24, 0 }, - /* 7 bit codewords */ - { /* 101010 */ 25, 1 }, - { /* 101011 */ 27, 1 }, - { /* 101100 */ 29, 1 }, - { /* 101101 */ 31, 1 }, - { /* 101110 */ 33, 1 }, - { /* 101111 */ 35, 1 }, - { /* 110000 */ 37, 1 }, - { /* 110001 */ 39, 1 }, - /* 7/8 bit codewords */ - { /* 110010 */ 41, 2 }, - /* 8 bit codewords */ - { /* 110011 */ 45, 2 }, - { /* 110100 */ 49, 2 }, - { /* 110101 */ 53, 2 }, - { /* 110110 */ 57, 2 }, - { /* 110111 */ 61, 2 }, - /* 8/9 bit codewords */ - { /* 111000 */ 65, 3 }, - /* 9 bit codewords */ - { /* 111001 */ 73, 3 }, - { /* 111010 */ 81, 3 }, - { /* 111011 */ 89, 3 }, - /* 9/10 bit codewords */ - { /* 111100 */ 97, 4 }, - /* 10 bit codewords */ - { /* 111101 */ 113, 4 }, - { /* 111110 */ 129, 4 }, - /* 10/11/12 bit codewords */ - { /* 111111 */ 145, 6 } -}; - -/* 2nd step table - * - * Gives size of codeword and actual data (x,y,v,w) - */ -static hcb_2_pair hcb10_2[] = { - /* 4 bit codewords */ - { 4, 1, 1 }, - { 4, 1, 2 }, - { 4, 2, 1 }, - - /* 5 bit codewords */ - { 5, 2, 2 }, - { 5, 1, 0 }, - { 5, 0, 1 }, - { 5, 1, 3 }, - { 5, 3, 2 }, - { 5, 3, 1 }, - { 5, 2, 3 }, - { 5, 3, 3 }, - - /* 6 bit codewords */ - { 6, 2, 0 }, - { 6, 0, 2 }, - { 6, 2, 4 }, - { 6, 4, 2 }, - { 6, 1, 4 }, - { 6, 4, 1 }, - { 6, 0, 0 }, - { 6, 4, 3 }, - { 6, 3, 4 }, - { 6, 3, 0 }, - { 6, 0, 3 }, - { 6, 4, 4 }, - { 6, 2, 5 }, - { 6, 5, 2 }, - - /* 7 bit codewords */ - { 7, 1, 5 }, - { 7, 5, 1 }, - { 7, 5, 3 }, - { 7, 3, 5 }, - { 7, 5, 4 }, - { 7, 4, 5 }, - { 7, 6, 2 }, - { 7, 2, 6 }, - { 7, 6, 3 }, - { 7, 4, 0 }, - { 7, 6, 1 }, - { 7, 0, 4 }, - { 7, 1, 6 }, - { 7, 3, 6 }, - { 7, 5, 5 }, - { 7, 6, 4 }, - - /* 7/8 bit codewords */ - { 7, 4, 6 }, { 7, 4, 6 }, - { 8, 6, 5 }, - { 8, 7, 2 }, - - /* 8 bit codewords */ - { 8, 3, 7 }, - { 8, 2, 7 }, - { 8, 5, 6 }, - { 8, 8, 2 }, - { 8, 7, 3 }, - { 8, 5, 0 }, - { 8, 7, 1 }, - { 8, 0, 5 }, - { 8, 8, 1 }, - { 8, 1, 7 }, - { 8, 8, 3 }, - { 8, 7, 4 }, - { 8, 4, 7 }, - { 8, 2, 8 }, - { 8, 6, 6 }, - { 8, 7, 5 }, - { 8, 1, 8 }, - { 8, 3, 8 }, - { 8, 8, 4 }, - { 8, 4, 8 }, - - /* 8/9 bit codewords */ - { 8, 5, 7 }, { 8, 5, 7 }, - { 8, 8, 5 }, { 8, 8, 5 }, - { 8, 5, 8 }, { 8, 5, 8 }, - { 9, 7, 6 }, - { 9, 6, 7 }, - - /* 9 bit codewords */ - { 9, 9, 2 }, - { 9, 6, 0 }, - { 9, 6, 8 }, - { 9, 9, 3 }, - { 9, 3, 9 }, - { 9, 9, 1 }, - { 9, 2, 9 }, - { 9, 0, 6 }, - { 9, 8, 6 }, - { 9, 9, 4 }, - { 9, 4, 9 }, - { 9, 10, 2 }, - { 9, 1, 9 }, - { 9, 7, 7 }, - { 9, 8, 7 }, - { 9, 9, 5 }, - { 9, 7, 8 }, - { 9, 10, 3 }, - { 9, 5, 9 }, - { 9, 10, 4 }, - { 9, 2, 10 }, - { 9, 10, 1 }, - { 9, 3, 10 }, - { 9, 9, 6 }, - - /* 9/10 bit codewords */ - { 9, 6, 9 }, { 9, 6, 9 }, - { 9, 8, 0 }, { 9, 8, 0 }, - { 9, 4, 10 }, { 9, 4, 10 }, - { 9, 7, 0 }, { 9, 7, 0 }, - { 9, 11, 2 }, { 9, 11, 2 }, - { 10, 7, 9 }, - { 10, 11, 3 }, - { 10, 10, 6 }, - { 10, 1, 10 }, - { 10, 11, 1 }, - { 10, 9, 7 }, - - /* 10 bit codewords */ - { 10, 0, 7 }, - { 10, 8, 8 }, - { 10, 10, 5 }, - { 10, 3, 11 }, - { 10, 5, 10 }, - { 10, 8, 9 }, - { 10, 11, 5 }, - { 10, 0, 8 }, - { 10, 11, 4 }, - { 10, 2, 11 }, - { 10, 7, 10 }, - { 10, 6, 10 }, - { 10, 10, 7 }, - { 10, 4, 11 }, - { 10, 1, 11 }, - { 10, 12, 2 }, - { 10, 9, 8 }, - { 10, 12, 3 }, - { 10, 11, 6 }, - { 10, 5, 11 }, - { 10, 12, 4 }, - { 10, 11, 7 }, - { 10, 12, 5 }, - { 10, 3, 12 }, - { 10, 6, 11 }, - { 10, 9, 0 }, - { 10, 10, 8 }, - { 10, 10, 0 }, - { 10, 12, 1 }, - { 10, 0, 9 }, - { 10, 4, 12 }, - { 10, 9, 9 }, - - /* 10/11/12 bit codewords */ - { 10, 12, 6 }, { 10, 12, 6 }, { 10, 12, 6 }, { 10, 12, 6 }, - { 10, 2, 12 }, { 10, 2, 12 }, { 10, 2, 12 }, { 10, 2, 12 }, - { 10, 8, 10 }, { 10, 8, 10 }, { 10, 8, 10 }, { 10, 8, 10 }, - { 11, 9, 10 }, { 11, 9, 10 }, - { 11, 1, 12 }, { 11, 1, 12 }, - { 11, 11, 8 }, { 11, 11, 8 }, - { 11, 12, 7 }, { 11, 12, 7 }, - { 11, 7, 11 }, { 11, 7, 11 }, - { 11, 5, 12 }, { 11, 5, 12 }, - { 11, 6, 12 }, { 11, 6, 12 }, - { 11, 10, 9 }, { 11, 10, 9 }, - { 11, 8, 11 }, { 11, 8, 11 }, - { 11, 12, 8 }, { 11, 12, 8 }, - { 11, 0, 10 }, { 11, 0, 10 }, - { 11, 7, 12 }, { 11, 7, 12 }, - { 11, 11, 0 }, { 11, 11, 0 }, - { 11, 10, 10 }, { 11, 10, 10 }, - { 11, 11, 9 }, { 11, 11, 9 }, - { 11, 11, 10 }, { 11, 11, 10 }, - { 11, 0, 11 }, { 11, 0, 11 }, - { 11, 11, 11 }, { 11, 11, 11 }, - { 11, 9, 11 }, { 11, 9, 11 }, - { 11, 10, 11 }, { 11, 10, 11 }, - { 11, 12, 0 }, { 11, 12, 0 }, - { 11, 8, 12 }, { 11, 8, 12 }, - { 12, 12, 9 }, - { 12, 10, 12 }, - { 12, 9, 12 }, - { 12, 11, 12 }, - { 12, 12, 11 }, - { 12, 0, 12 }, - { 12, 12, 10 }, - { 12, 12, 12 } -}; diff --git a/libfaad2/codebook/hcb_11.h b/libfaad2/codebook/hcb_11.h deleted file mode 100644 index f0052423dc..0000000000 --- a/libfaad2/codebook/hcb_11.h +++ /dev/null @@ -1,412 +0,0 @@ -/* -** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -** -** Any non-GPL usage of this software or parts of this software is strictly -** forbidden. -** -** Commercial non-GPL licensing of this software is possible. -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. -** -** $Id: hcb_11.h,v 1.3 2003/09/09 18:12:01 menno Exp $ -**/ - -/* 2-step huffman table HCB_11 */ - - -/* 1st step: 5 bits - * 2^5 = 32 entries - * - * Used to find offset into 2nd step table and number of extra bits to get - */ -static hcb hcb11_1[] = { - /* 4 bits */ - { /* 00000 */ 0, 0 }, - { /* */ 0, 0 }, - { /* 00010 */ 1, 0 }, - { /* */ 1, 0 }, - - /* 5 bits */ - { /* 00100 */ 2, 0 }, - { /* 00101 */ 3, 0 }, - { /* 00110 */ 4, 0 }, - { /* 00111 */ 5, 0 }, - { /* 01000 */ 6, 0 }, - { /* 01001 */ 7, 0 }, - - /* 6 bits */ - { /* 01010 */ 8, 1 }, - { /* 01011 */ 10, 1 }, - { /* 01100 */ 12, 1 }, - - /* 6/7 bits */ - { /* 01101 */ 14, 2 }, - - /* 7 bits */ - { /* 01110 */ 18, 2 }, - { /* 01111 */ 22, 2 }, - { /* 10000 */ 26, 2 }, - - /* 7/8 bits */ - { /* 10001 */ 30, 3 }, - - /* 8 bits */ - { /* 10010 */ 38, 3 }, - { /* 10011 */ 46, 3 }, - { /* 10100 */ 54, 3 }, - { /* 10101 */ 62, 3 }, - { /* 10110 */ 70, 3 }, - { /* 10111 */ 78, 3 }, - - /* 8/9 bits */ - { /* 11000 */ 86, 4 }, - - /* 9 bits */ - { /* 11001 */ 102, 4 }, - { /* 11010 */ 118, 4 }, - { /* 11011 */ 134, 4 }, - - /* 9/10 bits */ - { /* 11100 */ 150, 5 }, - - /* 10 bits */ - { /* 11101 */ 182, 5 }, - { /* 11110 */ 214, 5 }, - - /* 10/11/12 bits */ - { /* 11111 */ 246, 7 } -}; - -/* 2nd step table - * - * Gives size of codeword and actual data (x,y,v,w) - */ -static hcb_2_pair hcb11_2[] = { - /* 4 */ - { 4, 0, 0 }, - { 4, 1, 1 }, - - /* 5 */ - { 5, 16, 16 }, - { 5, 1, 0 }, - { 5, 0, 1 }, - { 5, 2, 1 }, - { 5, 1, 2 }, - { 5, 2, 2 }, - - /* 6 */ - { 6, 1, 3 }, - { 6, 3, 1 }, - { 6, 3, 2 }, - { 6, 2, 0 }, - { 6, 2, 3 }, - { 6, 0, 2 }, - - /* 6/7 */ - { 6, 3, 3 }, { 6, 3, 3 }, - { 7, 4, 1 }, - { 7, 1, 4 }, - - /* 7 */ - { 7, 4, 2 }, - { 7, 2, 4 }, - { 7, 4, 3 }, - { 7, 3, 4 }, - { 7, 3, 0 }, - { 7, 0, 3 }, - { 7, 5, 1 }, - { 7, 5, 2 }, - { 7, 2, 5 }, - { 7, 4, 4 }, - { 7, 1, 5 }, - { 7, 5, 3 }, - - /* 7/8 */ - { 7, 3, 5 }, { 7, 3, 5 }, - { 7, 5, 4 }, { 7, 5, 4 }, - { 8, 4, 5 }, - { 8, 6, 2 }, - { 8, 2, 6 }, - { 8, 6, 1 }, - - /* 8 */ - { 8, 6, 3 }, - { 8, 3, 6 }, - { 8, 1, 6 }, - { 8, 4, 16 }, - { 8, 3, 16 }, - { 8, 16, 5 }, - { 8, 16, 3 }, - { 8, 16, 4 }, - { 8, 6, 4 }, - { 8, 16, 6 }, - { 8, 4, 0 }, - { 8, 4, 6 }, - { 8, 0, 4 }, - { 8, 2, 16 }, - { 8, 5, 5 }, - { 8, 5, 16 }, - { 8, 16, 7 }, - { 8, 16, 2 }, - { 8, 16, 8 }, - { 8, 2, 7 }, - { 8, 7, 2 }, - { 8, 3, 7 }, - { 8, 6, 5 }, - { 8, 5, 6 }, - { 8, 6, 16 }, - { 8, 16, 10 }, - { 8, 7, 3 }, - { 8, 7, 1 }, - { 8, 16, 9 }, - { 8, 7, 16 }, - { 8, 1, 16 }, - { 8, 1, 7 }, - { 8, 4, 7 }, - { 8, 16, 11 }, - { 8, 7, 4 }, - { 8, 16, 12 }, - { 8, 8, 16 }, - { 8, 16, 1 }, - { 8, 6, 6 }, - { 8, 9, 16 }, - { 8, 2, 8 }, - { 8, 5, 7 }, - { 8, 10, 16 }, - { 8, 16, 13 }, - { 8, 8, 3 }, - { 8, 8, 2 }, - { 8, 3, 8 }, - { 8, 5, 0 }, - - /* 8/9 */ - { 8, 16, 14 }, { 8, 16, 14 }, - { 8, 11, 16 }, { 8, 11, 16 }, - { 8, 7, 5 }, { 8, 7, 5 }, - { 8, 4, 8 }, { 8, 4, 8 }, - { 8, 6, 7 }, { 8, 6, 7 }, - { 8, 7, 6 }, { 8, 7, 6 }, - { 8, 0, 5 }, { 8, 0, 5 }, - { 9, 8, 4 }, - { 9, 16, 15 }, - - /* 9 */ - { 9, 12, 16 }, - { 9, 1, 8 }, - { 9, 8, 1 }, - { 9, 14, 16 }, - { 9, 5, 8 }, - { 9, 13, 16 }, - { 9, 3, 9 }, - { 9, 8, 5 }, - { 9, 7, 7 }, - { 9, 2, 9 }, - { 9, 8, 6 }, - { 9, 9, 2 }, - { 9, 9, 3 }, - { 9, 15, 16 }, - { 9, 4, 9 }, - { 9, 6, 8 }, - { 9, 6, 0 }, - { 9, 9, 4 }, - { 9, 5, 9 }, - { 9, 8, 7 }, - { 9, 7, 8 }, - { 9, 1, 9 }, - { 9, 10, 3 }, - { 9, 0, 6 }, - { 9, 10, 2 }, - { 9, 9, 1 }, - { 9, 9, 5 }, - { 9, 4, 10 }, - { 9, 2, 10 }, - { 9, 9, 6 }, - { 9, 3, 10 }, - { 9, 6, 9 }, - { 9, 10, 4 }, - { 9, 8, 8 }, - { 9, 10, 5 }, - { 9, 9, 7 }, - { 9, 11, 3 }, - { 9, 1, 10 }, - { 9, 7, 0 }, - { 9, 10, 6 }, - { 9, 7, 9 }, - { 9, 3, 11 }, - { 9, 5, 10 }, - { 9, 10, 1 }, - { 9, 4, 11 }, - { 9, 11, 2 }, - { 9, 13, 2 }, - { 9, 6, 10 }, - - /* 9/10 */ - { 9, 13, 3 }, { 9, 13, 3 }, - { 9, 2, 11 }, { 9, 2, 11 }, - { 9, 16, 0 }, { 9, 16, 0 }, - { 9, 5, 11 }, { 9, 5, 11 }, - { 9, 11, 5 }, { 9, 11, 5 }, - { 10, 11, 4 }, - { 10, 9, 8 }, - { 10, 7, 10 }, - { 10, 8, 9 }, - { 10, 0, 16 }, - { 10, 4, 13 }, - { 10, 0, 7 }, - { 10, 3, 13 }, - { 10, 11, 6 }, - { 10, 13, 1 }, - { 10, 13, 4 }, - { 10, 12, 3 }, - { 10, 2, 13 }, - { 10, 13, 5 }, - { 10, 8, 10 }, - { 10, 6, 11 }, - { 10, 10, 8 }, - { 10, 10, 7 }, - { 10, 14, 2 }, - { 10, 12, 4 }, - { 10, 1, 11 }, - { 10, 4, 12 }, - - /* 10 */ - { 10, 11, 1 }, - { 10, 3, 12 }, - { 10, 1, 13 }, - { 10, 12, 2 }, - { 10, 7, 11 }, - { 10, 3, 14 }, - { 10, 5, 12 }, - { 10, 5, 13 }, - { 10, 14, 4 }, - { 10, 4, 14 }, - { 10, 11, 7 }, - { 10, 14, 3 }, - { 10, 12, 5 }, - { 10, 13, 6 }, - { 10, 12, 6 }, - { 10, 8, 0 }, - { 10, 11, 8 }, - { 10, 2, 12 }, - { 10, 9, 9 }, - { 10, 14, 5 }, - { 10, 6, 13 }, - { 10, 10, 10 }, - { 10, 15, 2 }, - { 10, 8, 11 }, - { 10, 9, 10 }, - { 10, 14, 6 }, - { 10, 10, 9 }, - { 10, 5, 14 }, - { 10, 11, 9 }, - { 10, 14, 1 }, - { 10, 2, 14 }, - { 10, 6, 12 }, - { 10, 1, 12 }, - { 10, 13, 8 }, - { 10, 0, 8 }, - { 10, 13, 7 }, - { 10, 7, 12 }, - { 10, 12, 7 }, - { 10, 7, 13 }, - { 10, 15, 3 }, - { 10, 12, 1 }, - { 10, 6, 14 }, - { 10, 2, 15 }, - { 10, 15, 5 }, - { 10, 15, 4 }, - { 10, 1, 14 }, - { 10, 9, 11 }, - { 10, 4, 15 }, - { 10, 14, 7 }, - { 10, 8, 13 }, - { 10, 13, 9 }, - { 10, 8, 12 }, - { 10, 5, 15 }, - { 10, 3, 15 }, - { 10, 10, 11 }, - { 10, 11, 10 }, - { 10, 12, 8 }, - { 10, 15, 6 }, - { 10, 15, 7 }, - { 10, 8, 14 }, - { 10, 15, 1 }, - { 10, 7, 14 }, - { 10, 9, 0 }, - { 10, 0, 9 }, - - /* 10/11/12 */ - { 10, 9, 13 }, { 10, 9, 13 }, { 10, 9, 13 }, { 10, 9, 13 }, - { 10, 9, 12 }, { 10, 9, 12 }, { 10, 9, 12 }, { 10, 9, 12 }, - { 10, 12, 9 }, { 10, 12, 9 }, { 10, 12, 9 }, { 10, 12, 9 }, - { 10, 14, 8 }, { 10, 14, 8 }, { 10, 14, 8 }, { 10, 14, 8 }, - { 10, 10, 13 }, { 10, 10, 13 }, { 10, 10, 13 }, { 10, 10, 13 }, - { 10, 14, 9 }, { 10, 14, 9 }, { 10, 14, 9 }, { 10, 14, 9 }, - { 10, 12, 10 }, { 10, 12, 10 }, { 10, 12, 10 }, { 10, 12, 10 }, - { 10, 6, 15 }, { 10, 6, 15 }, { 10, 6, 15 }, { 10, 6, 15 }, - { 10, 7, 15 }, { 10, 7, 15 }, { 10, 7, 15 }, { 10, 7, 15 }, - - { 11, 9, 14 }, { 11, 9, 14 }, - { 11, 15, 8 }, { 11, 15, 8 }, - { 11, 11, 11 }, { 11, 11, 11 }, - { 11, 11, 14 }, { 11, 11, 14 }, - { 11, 1, 15 }, { 11, 1, 15 }, - { 11, 10, 12 }, { 11, 10, 12 }, - { 11, 10, 14 }, { 11, 10, 14 }, - { 11, 13, 11 }, { 11, 13, 11 }, - { 11, 13, 10 }, { 11, 13, 10 }, - { 11, 11, 13 }, { 11, 11, 13 }, - { 11, 11, 12 }, { 11, 11, 12 }, - { 11, 8, 15 }, { 11, 8, 15 }, - { 11, 14, 11 }, { 11, 14, 11 }, - { 11, 13, 12 }, { 11, 13, 12 }, - { 11, 12, 13 }, { 11, 12, 13 }, - { 11, 15, 9 }, { 11, 15, 9 }, - { 11, 14, 10 }, { 11, 14, 10 }, - { 11, 10, 0 }, { 11, 10, 0 }, - { 11, 12, 11 }, { 11, 12, 11 }, - { 11, 9, 15 }, { 11, 9, 15 }, - { 11, 0, 10 }, { 11, 0, 10 }, - { 11, 12, 12 }, { 11, 12, 12 }, - { 11, 11, 0 }, { 11, 11, 0 }, - { 11, 12, 14 }, { 11, 12, 14 }, - { 11, 10, 15 }, { 11, 10, 15 }, - { 11, 13, 13 }, { 11, 13, 13 }, - { 11, 0, 13 }, { 11, 0, 13 }, - { 11, 14, 12 }, { 11, 14, 12 }, - { 11, 15, 10 }, { 11, 15, 10 }, - { 11, |