diff options
Diffstat (limited to 'src/libfaad/codebook')
| -rw-r--r-- | src/libfaad/codebook/Makefile.am | 24 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb.h | 62 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb_1.h (renamed from src/libfaad/codebook/hcb_1.c) | 27 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb_10.h (renamed from src/libfaad/codebook/hcb_10.c) | 27 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb_11.h (renamed from src/libfaad/codebook/hcb_11.c) | 27 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb_2.h (renamed from src/libfaad/codebook/hcb_2.c) | 27 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb_3.h (renamed from src/libfaad/codebook/hcb_3.c) | 25 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb_4.h (renamed from src/libfaad/codebook/hcb_4.c) | 27 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb_5.h (renamed from src/libfaad/codebook/hcb_5.c) | 25 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb_6.h (renamed from src/libfaad/codebook/hcb_6.c) | 27 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb_7.h (renamed from src/libfaad/codebook/hcb_7.c) | 25 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb_8.h (renamed from src/libfaad/codebook/hcb_8.c) | 27 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb_9.h (renamed from src/libfaad/codebook/hcb_9.c) | 25 | ||||
| -rw-r--r-- | src/libfaad/codebook/hcb_sf.h (renamed from src/libfaad/codebook/hcb_sf.c) | 25 |
14 files changed, 221 insertions, 179 deletions
diff --git a/src/libfaad/codebook/Makefile.am b/src/libfaad/codebook/Makefile.am index bd2f22e5f..e4691f4b9 100644 --- a/src/libfaad/codebook/Makefile.am +++ b/src/libfaad/codebook/Makefile.am @@ -1,15 +1,15 @@ include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = hcb.h \ - hcb_1.c \ - hcb_2.c \ - hcb_3.c \ - hcb_4.c \ - hcb_5.c \ - hcb_6.c \ - hcb_7.c \ - hcb_8.c \ - hcb_9.c \ - hcb_10.c \ - hcb_11.c \ - hcb_sf.c + hcb_1.h \ + hcb_2.h \ + hcb_3.h \ + hcb_4.h \ + hcb_5.h \ + hcb_6.h \ + hcb_7.h \ + hcb_8.h \ + hcb_9.h \ + hcb_10.h \ + hcb_11.h \ + hcb_sf.h diff --git a/src/libfaad/codebook/hcb.h b/src/libfaad/codebook/hcb.h index f798e58ed..66d937076 100644 --- a/src/libfaad/codebook/hcb.h +++ b/src/libfaad/codebook/hcb.h @@ -1,22 +1,28 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb.h,v 1.2 2002/12/16 18:58:53 miguelfreitas Exp $ +** 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.3 2003/12/30 02:00:12 miguelfreitas Exp $ **/ #ifndef __HCB_H__ @@ -65,7 +71,6 @@ extern "C" { #define ESC_HCB 11 #define QUAD_LEN 4 #define PAIR_LEN 2 -#define BOOKSCL 12 #define NOISE_HCB 13 #define INTENSITY_HCB2 14 #define INTENSITY_HCB 15 @@ -107,28 +112,29 @@ typedef struct int8_t data[2]; } hcb_bin_pair; -extern hcb hcb1_1[]; -extern hcb hcb2_1[]; -extern hcb hcb4_1[]; -extern hcb hcb6_1[]; -extern hcb hcb8_1[]; -extern hcb hcb10_1[]; -extern hcb hcb11_1[]; - -extern hcb_2_quad hcb1_2[]; -extern hcb_2_quad hcb2_2[]; -extern hcb_2_quad hcb4_2[]; -extern hcb_2_pair hcb6_2[]; -extern hcb_2_pair hcb8_2[]; -extern hcb_2_pair hcb10_2[]; -extern hcb_2_pair hcb11_2[]; +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[]; -extern hcb_bin_quad hcb3[]; -extern hcb_bin_pair hcb5[]; -extern hcb_bin_pair hcb7[]; -extern hcb_bin_pair hcb9[]; +#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" -extern uint8_t hcb_sf[][2]; #ifdef __cplusplus } diff --git a/src/libfaad/codebook/hcb_1.c b/src/libfaad/codebook/hcb_1.h index 95bbd3f52..1c838558c 100644 --- a/src/libfaad/codebook/hcb_1.c +++ b/src/libfaad/codebook/hcb_1.h @@ -1,27 +1,30 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb_1.c,v 1.2 2002/12/16 18:58:54 miguelfreitas Exp $ +** 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.1 2003/12/30 02:00:12 miguelfreitas Exp $ **/ -#include "../common.h" -#include "hcb.h" - /* 2-step huffman table HCB_1 */ @@ -30,7 +33,7 @@ * * Used to find offset into 2nd step table and number of extra bits to get */ -extern hcb hcb1_1[] = { +static hcb hcb1_1[] = { { /* 00000 */ 0, 0 }, { /* */ 0, 0 }, { /* */ 0, 0 }, @@ -75,7 +78,7 @@ extern hcb hcb1_1[] = { * * Gives size of codeword and actual data (x,y,v,w) */ -extern hcb_2_quad hcb1_2[] = { +static hcb_2_quad hcb1_2[] = { /* 1 bit codeword */ { 1, 0, 0, 0, 0 }, diff --git a/src/libfaad/codebook/hcb_10.c b/src/libfaad/codebook/hcb_10.h index 7aea30985..1875fc090 100644 --- a/src/libfaad/codebook/hcb_10.c +++ b/src/libfaad/codebook/hcb_10.h @@ -1,27 +1,30 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb_10.c,v 1.2 2002/12/16 18:58:55 miguelfreitas Exp $ +** 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.1 2003/12/30 02:00:12 miguelfreitas Exp $ **/ -#include "../common.h" -#include "hcb.h" - /* 2-step huffman table HCB_10 */ @@ -30,7 +33,7 @@ * * Used to find offset into 2nd step table and number of extra bits to get */ -extern hcb hcb10_1[] = { +static hcb hcb10_1[] = { /* 4 bit codewords */ { /* 000000 */ 0, 0 }, { /* */ 0, 0 }, @@ -112,7 +115,7 @@ extern hcb hcb10_1[] = { * * Gives size of codeword and actual data (x,y,v,w) */ -extern hcb_2_pair hcb10_2[] = { +static hcb_2_pair hcb10_2[] = { /* 4 bit codewords */ { 4, 1, 1 }, { 4, 1, 2 }, diff --git a/src/libfaad/codebook/hcb_11.c b/src/libfaad/codebook/hcb_11.h index b6d202e80..352151cc2 100644 --- a/src/libfaad/codebook/hcb_11.c +++ b/src/libfaad/codebook/hcb_11.h @@ -1,27 +1,30 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb_11.c,v 1.2 2002/12/16 18:58:56 miguelfreitas Exp $ +** 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.1 2003/12/30 02:00:12 miguelfreitas Exp $ **/ -#include "../common.h" -#include "hcb.h" - /* 2-step huffman table HCB_11 */ @@ -30,7 +33,7 @@ * * Used to find offset into 2nd step table and number of extra bits to get */ -extern hcb hcb11_1[] = { +static hcb hcb11_1[] = { /* 4 bits */ { /* 00000 */ 0, 0 }, { /* */ 0, 0 }, @@ -92,7 +95,7 @@ extern hcb hcb11_1[] = { * * Gives size of codeword and actual data (x,y,v,w) */ -extern hcb_2_pair hcb11_2[] = { +static hcb_2_pair hcb11_2[] = { /* 4 */ { 4, 0, 0 }, { 4, 1, 1 }, diff --git a/src/libfaad/codebook/hcb_2.c b/src/libfaad/codebook/hcb_2.h index 6e2b9c1cf..16aa4308d 100644 --- a/src/libfaad/codebook/hcb_2.c +++ b/src/libfaad/codebook/hcb_2.h @@ -1,27 +1,30 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb_2.c,v 1.2 2002/12/16 18:58:57 miguelfreitas Exp $ +** 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_2.h,v 1.1 2003/12/30 02:00:12 miguelfreitas Exp $ **/ -#include "../common.h" -#include "hcb.h" - /* 2-step huffman table HCB_2 */ @@ -30,7 +33,7 @@ * * Used to find offset into 2nd step table and number of extra bits to get */ -extern hcb hcb2_1[] = { +static hcb hcb2_1[] = { { /* 00000 */ 0, 0 }, { /* */ 0, 0 }, { /* */ 0, 0 }, @@ -79,7 +82,7 @@ extern hcb hcb2_1[] = { * * Gives size of codeword and actual data (x,y,v,w) */ -extern hcb_2_quad hcb2_2[] = { +static hcb_2_quad hcb2_2[] = { /* 3 bit codeword */ { 3, 0, 0, 0, 0 }, diff --git a/src/libfaad/codebook/hcb_3.c b/src/libfaad/codebook/hcb_3.h index 09e013056..6b370f4ba 100644 --- a/src/libfaad/codebook/hcb_3.c +++ b/src/libfaad/codebook/hcb_3.h @@ -1,31 +1,34 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb_3.c,v 1.2 2002/12/16 18:58:58 miguelfreitas Exp $ +** 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_3.h,v 1.1 2003/12/30 02:00:12 miguelfreitas Exp $ **/ -#include "../common.h" -#include "hcb.h" - /* Binary search huffman table HCB_3 */ -extern hcb_bin_quad hcb3[] = { +static hcb_bin_quad hcb3[] = { { /* 0 */ 0, { 1, 2, 0, 0 } }, { /* 1 */ 1, { 0, 0, 0, 0 } }, /* 0 */ { /* 2 */ 0, { 1, 2, 0, 0 } }, diff --git a/src/libfaad/codebook/hcb_4.c b/src/libfaad/codebook/hcb_4.h index 1845936d4..46f373bd7 100644 --- a/src/libfaad/codebook/hcb_4.c +++ b/src/libfaad/codebook/hcb_4.h @@ -1,27 +1,30 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb_4.c,v 1.2 2002/12/16 18:58:58 miguelfreitas Exp $ +** 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_4.h,v 1.1 2003/12/30 02:00:12 miguelfreitas Exp $ **/ -#include "../common.h" -#include "hcb.h" - /* 2-step huffman table HCB_4 */ @@ -30,7 +33,7 @@ * * Used to find offset into 2nd step table and number of extra bits to get */ -extern hcb hcb4_1[] = { +static hcb hcb4_1[] = { /* 4 bit codewords */ { /* 00000 */ 0, 0 }, { /* */ 0, 0 }, @@ -82,7 +85,7 @@ extern hcb hcb4_1[] = { * * Gives size of codeword and actual data (x,y,v,w) */ -extern hcb_2_quad hcb4_2[] = { +static hcb_2_quad hcb4_2[] = { /* 4 bit codewords */ { 4, 1, 1, 1, 1 }, { 4, 0, 1, 1, 1 }, diff --git a/src/libfaad/codebook/hcb_5.c b/src/libfaad/codebook/hcb_5.h index 094a7ffd2..db309a4b6 100644 --- a/src/libfaad/codebook/hcb_5.c +++ b/src/libfaad/codebook/hcb_5.h @@ -1,31 +1,34 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb_5.c,v 1.2 2002/12/16 18:58:58 miguelfreitas Exp $ +** 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_5.h,v 1.1 2003/12/30 02:00:12 miguelfreitas Exp $ **/ -#include "../common.h" -#include "hcb.h" - /* Binary search huffman table HCB_5 */ -extern hcb_bin_pair hcb5[] = { +static hcb_bin_pair hcb5[] = { { /* 0 */ 0, { 1, 2 } }, { /* 1 */ 1, { 0, 0 } }, /* 0 */ { /* 2 */ 0, { 1, 2 } }, diff --git a/src/libfaad/codebook/hcb_6.c b/src/libfaad/codebook/hcb_6.h index 4136ebdfe..503d76ba9 100644 --- a/src/libfaad/codebook/hcb_6.c +++ b/src/libfaad/codebook/hcb_6.h @@ -1,27 +1,30 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb_6.c,v 1.2 2002/12/16 18:58:59 miguelfreitas Exp $ +** 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_6.h,v 1.1 2003/12/30 02:00:12 miguelfreitas Exp $ **/ -#include "../common.h" -#include "hcb.h" - /* 2-step huffman table HCB_6 */ @@ -30,7 +33,7 @@ * * Used to find offset into 2nd step table and number of extra bits to get */ -extern hcb hcb6_1[] = { +static hcb hcb6_1[] = { /* 4 bit codewords */ { /* 00000 */ 0, 0 }, { /* */ 0, 0 }, @@ -80,7 +83,7 @@ extern hcb hcb6_1[] = { * * Gives size of codeword and actual data (x,y,v,w) */ -extern hcb_2_pair hcb6_2[] = { +static hcb_2_pair hcb6_2[] = { /* 4 bit codewords */ { 4, 0, 0 }, { 4, 1, 0 }, diff --git a/src/libfaad/codebook/hcb_7.c b/src/libfaad/codebook/hcb_7.h index b0ba2fbfa..ea881776b 100644 --- a/src/libfaad/codebook/hcb_7.c +++ b/src/libfaad/codebook/hcb_7.h @@ -1,31 +1,34 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb_7.c,v 1.2 2002/12/16 18:58:59 miguelfreitas Exp $ +** 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_7.h,v 1.1 2003/12/30 02:00:12 miguelfreitas Exp $ **/ -#include "../common.h" -#include "hcb.h" - /* Binary search huffman table HCB_7 */ -extern hcb_bin_pair hcb7[] = { +static hcb_bin_pair hcb7[] = { { /* 0 */ 0, { 1, 2 } }, { /* 1 */ 1, { 0, 0 } }, { /* 2 */ 0, { 1, 2 } }, diff --git a/src/libfaad/codebook/hcb_8.c b/src/libfaad/codebook/hcb_8.h index 5aed46949..fc4c398b9 100644 --- a/src/libfaad/codebook/hcb_8.c +++ b/src/libfaad/codebook/hcb_8.h @@ -1,27 +1,30 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb_8.c,v 1.2 2002/12/16 18:59:00 miguelfreitas Exp $ +** 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_8.h,v 1.1 2003/12/30 02:00:12 miguelfreitas Exp $ **/ -#include "../common.h" -#include "hcb.h" - /* 2-step huffman table HCB_8 */ @@ -30,7 +33,7 @@ * * Used to find offset into 2nd step table and number of extra bits to get */ -extern hcb hcb8_1[] = { +static hcb hcb8_1[] = { /* 3 bit codeword */ { /* 00000 */ 0, 0 }, { /* */ 0, 0 }, @@ -84,7 +87,7 @@ extern hcb hcb8_1[] = { * * Gives size of codeword and actual data (x,y,v,w) */ -extern hcb_2_pair hcb8_2[] = { +static hcb_2_pair hcb8_2[] = { /* 3 bit codeword */ { 3, 1, 1 }, diff --git a/src/libfaad/codebook/hcb_9.c b/src/libfaad/codebook/hcb_9.h index 8a7638871..3121bcb53 100644 --- a/src/libfaad/codebook/hcb_9.c +++ b/src/libfaad/codebook/hcb_9.h @@ -1,31 +1,34 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb_9.c,v 1.2 2002/12/16 18:59:00 miguelfreitas Exp $ +** 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_9.h,v 1.1 2003/12/30 02:00:12 miguelfreitas Exp $ **/ -#include "../common.h" -#include "hcb.h" - /* Binary search huffman table HCB_9 */ -extern hcb_bin_pair hcb9[] = { +static hcb_bin_pair hcb9[] = { { /* 0 */ 0, { 1, 2 } }, { /* 1 */ 1, { 0, 0 } }, { /* 2 */ 0, { 1, 2 } }, diff --git a/src/libfaad/codebook/hcb_sf.c b/src/libfaad/codebook/hcb_sf.h index bdb9732f4..f7be8fd8e 100644 --- a/src/libfaad/codebook/hcb_sf.c +++ b/src/libfaad/codebook/hcb_sf.h @@ -1,31 +1,34 @@ /* -** FAAD - Freeware Advanced Audio Decoder -** Copyright (C) 2002 M. Bakker -** +** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: hcb_sf.c,v 1.2 2002/12/16 18:59:01 miguelfreitas Exp $ +** 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_sf.h,v 1.1 2003/12/30 02:00:12 miguelfreitas Exp $ **/ -#include "../common.h" -#include "hcb.h" - /* Binary search huffman table HCB_SF */ -extern uint8_t hcb_sf[][2] = { +static uint8_t hcb_sf[][2] = { { /* 0 */ 1, 2 }, { /* 1 */ 60, 0 }, { /* 2 */ 1, 2 }, |