annotate bitstream.c @ 6323:e6da66f378c7 libavcodec

mpegvideo.h has two function declarations with the 'inline' specifier but no definition for those functions. The C standard requires a definition to appear in the same translation unit for any function declared with 'inline'. Most of the files including mpegvideo.h do not define those functions. Fix this by removing the 'inline' specifiers from the header. patch by Uoti Urpala
author diego
date Sun, 03 Feb 2008 17:54:30 +0000
parents 13d52b7647a0
children 6335f2688c04
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
986e461dc072 Initial revision
glantau
parents:
diff changeset
2 * Common bit i/o utils
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
3 * Copyright (c) 2000, 2001 Fabrice Bellard.
1739
07a484280a82 copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents: 1660
diff changeset
4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5 *
5214
470601203f44 Group all copyright and author notices together.
diego
parents: 5206
diff changeset
6 * alternative bitstream reader & writer by Michael Niedermayer <michaelni@gmx.at>
470601203f44 Group all copyright and author notices together.
diego
parents: 5206
diff changeset
7 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3648
diff changeset
8 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3648
diff changeset
9 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3648
diff changeset
10 * FFmpeg is free software; you can redistribute it and/or
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
11 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
12 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3648
diff changeset
13 * version 2.1 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3648
diff changeset
15 * FFmpeg is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
18 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
19 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
20 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3648
diff changeset
21 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2979
diff changeset
22 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
23 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1083
diff changeset
24
1e39f273ecd6 per file doxy
michaelni
parents: 1083
diff changeset
25 /**
2398
582e635cfa08 common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents: 2370
diff changeset
26 * @file bitstream.c
582e635cfa08 common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents: 2370
diff changeset
27 * bitstream api.
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1083
diff changeset
28 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
29
524
3e579fbef701 * declare av_free
kabi
parents: 520
diff changeset
30 #include "avcodec.h"
2398
582e635cfa08 common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents: 2370
diff changeset
31 #include "bitstream.h"
1037
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
32
4576
ad02fe65f45a Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents: 3947
diff changeset
33 /**
ad02fe65f45a Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents: 3947
diff changeset
34 * Same as av_mallocz_static(), but does a realloc.
ad02fe65f45a Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents: 3947
diff changeset
35 *
ad02fe65f45a Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents: 3947
diff changeset
36 * @param[in] ptr The block of memory to reallocate.
ad02fe65f45a Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents: 3947
diff changeset
37 * @param[in] size The requested size.
ad02fe65f45a Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents: 3947
diff changeset
38 * @return Block of memory of requested size.
5409
13d52b7647a0 Ahem, fix typos overlooked in last commit.
diego
parents: 5408
diff changeset
39 * @deprecated. Code which uses ff_realloc_static is broken/misdesigned
4889
beeb03aad909 patch so that the deprecated items show up correctly
benoit
parents: 4685
diff changeset
40 * and should correctly use static arrays
4576
ad02fe65f45a Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents: 3947
diff changeset
41 */
4670
aab60ff3d468 deprecate ff_realloc_static
michael
parents: 4577
diff changeset
42 attribute_deprecated void *ff_realloc_static(void *ptr, unsigned int size);
4576
ad02fe65f45a Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents: 3947
diff changeset
43
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
44 void align_put_bits(PutBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
45 {
234
5fc0c3af3fe4 alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents: 219
diff changeset
46 #ifdef ALT_BITSTREAM_WRITER
5fc0c3af3fe4 alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents: 219
diff changeset
47 put_bits(s,( - s->index) & 7,0);
5fc0c3af3fe4 alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents: 219
diff changeset
48 #else
238
99a9f903f0e3 optimized the normal bitstream writer, its faster than the alternative one on p3 now ... lets hope its at least not slower on p4 & k7
michaelni
parents: 234
diff changeset
49 put_bits(s,s->bit_left & 7,0);
234
5fc0c3af3fe4 alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents: 219
diff changeset
50 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
51 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
52
2885
5dfb90019814 Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.
diego
parents: 2663
diff changeset
53 void ff_put_string(PutBitContext * pbc, char *s, int put_zero)
358
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
54 {
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
55 while(*s){
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
56 put_bits(pbc, 8, *s);
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
57 s++;
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
58 }
1795
920e6381e1fe 2 byte shorter userdata for mpeg4
michael
parents: 1786
diff changeset
59 if(put_zero)
920e6381e1fe 2 byte shorter userdata for mpeg4
michael
parents: 1786
diff changeset
60 put_bits(pbc, 8, 0);
358
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
61 }
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
62
5229
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
63 void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length)
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
64 {
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
65 const uint16_t *srcw= (uint16_t*)src;
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
66 int words= length>>4;
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
67 int bits= length&15;
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
68 int i;
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
69
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
70 if(length==0) return;
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
71
5247
32b69770ae23 simplify ff_copy_bits() when compiled with config-small
aurel
parents: 5230
diff changeset
72 if(ENABLE_SMALL || words < 16 || put_bits_count(pb)&7){
5229
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
73 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i]));
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
74 }else{
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
75 for(i=0; put_bits_count(pb)&31; i++)
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
76 put_bits(pb, 8, src[i]);
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
77 flush_put_bits(pb);
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
78 memcpy(pbBufPtr(pb), src+i, 2*words-i);
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
79 skip_put_bytes(pb, 2*words-i);
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
80 }
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
81
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
82 put_bits(pb, bits, be2me_16(srcw[words])>>(16-bits));
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
83 }
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
84
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
85 /* VLC decoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
86
986e461dc072 Initial revision
glantau
parents:
diff changeset
87 //#define DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
88
986e461dc072 Initial revision
glantau
parents:
diff changeset
89 #define GET_DATA(v, table, i, wrap, size) \
986e461dc072 Initial revision
glantau
parents:
diff changeset
90 {\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
91 const uint8_t *ptr = (const uint8_t *)table + i * wrap;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
92 switch(size) {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
93 case 1:\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
94 v = *(const uint8_t *)ptr;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
96 case 2:\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
97 v = *(const uint16_t *)ptr;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
98 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
99 default:\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
100 v = *(const uint32_t *)ptr;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
101 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
102 }\
986e461dc072 Initial revision
glantau
parents:
diff changeset
103 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
104
986e461dc072 Initial revision
glantau
parents:
diff changeset
105
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
106 static int alloc_table(VLC *vlc, int size, int use_static)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
107 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
108 int index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
109 index = vlc->table_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
110 vlc->table_size += size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
111 if (vlc->table_size > vlc->table_allocated) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
112 vlc->table_allocated += (1 << vlc->bits);
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
113 if(use_static)
4577
88cf097ebe75 av_realloc_static() is an internal function and therefore should use the ff_ prefix instead of av_.
takis
parents: 4576
diff changeset
114 vlc->table = ff_realloc_static(vlc->table,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
115 sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
116 else
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
117 vlc->table = av_realloc(vlc->table,
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
118 sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
119 if (!vlc->table)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
120 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
121 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
122 return index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
123 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
124
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
125 static int build_table(VLC *vlc, int table_nb_bits,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
126 int nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
127 const void *bits, int bits_wrap, int bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
128 const void *codes, int codes_wrap, int codes_size,
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
129 const void *symbols, int symbols_wrap, int symbols_size,
2663
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
130 uint32_t code_prefix, int n_prefix, int flags)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
131 {
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
132 int i, j, k, n, table_size, table_index, nb, n1, index, code_prefix2, symbol;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
133 uint32_t code;
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
134 VLC_TYPE (*table)[2];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
135
986e461dc072 Initial revision
glantau
parents:
diff changeset
136 table_size = 1 << table_nb_bits;
2663
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
137 table_index = alloc_table(vlc, table_size, flags & INIT_VLC_USE_STATIC);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
138 #ifdef DEBUG_VLC
5013
c7904664624c printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents: 4889
diff changeset
139 av_log(NULL,AV_LOG_DEBUG,"new table index=%d size=%d code_prefix=%x n=%d\n",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
140 table_index, table_size, code_prefix, n_prefix);
986e461dc072 Initial revision
glantau
parents:
diff changeset
141 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
142 if (table_index < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
143 return -1;
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
144 table = &vlc->table[table_index];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
145
986e461dc072 Initial revision
glantau
parents:
diff changeset
146 for(i=0;i<table_size;i++) {
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
147 table[i][1] = 0; //bits
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
148 table[i][0] = -1; //codes
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
149 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
150
986e461dc072 Initial revision
glantau
parents:
diff changeset
151 /* first pass: map codes and compute auxillary table sizes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
152 for(i=0;i<nb_codes;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
153 GET_DATA(n, bits, i, bits_wrap, bits_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
154 GET_DATA(code, codes, i, codes_wrap, codes_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
155 /* we accept tables with holes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
156 if (n <= 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
157 continue;
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
158 if (!symbols)
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
159 symbol = i;
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
160 else
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
161 GET_DATA(symbol, symbols, i, symbols_wrap, symbols_size);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
162 #if defined(DEBUG_VLC) && 0
5013
c7904664624c printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents: 4889
diff changeset
163 av_log(NULL,AV_LOG_DEBUG,"i=%d n=%d code=0x%x\n", i, n, code);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
164 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
165 /* if code matches the prefix, it is in the table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
166 n -= n_prefix;
2663
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
167 if(flags & INIT_VLC_LE)
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
168 code_prefix2= code & (n_prefix>=32 ? 0xffffffff : (1 << n_prefix)-1);
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
169 else
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
170 code_prefix2= code >> n;
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
171 if (n > 0 && code_prefix2 == code_prefix) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
172 if (n <= table_nb_bits) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
173 /* no need to add another table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
174 j = (code << (table_nb_bits - n)) & (table_size - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
175 nb = 1 << (table_nb_bits - n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
176 for(k=0;k<nb;k++) {
2663
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
177 if(flags & INIT_VLC_LE)
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
178 j = (code >> n_prefix) + (k<<n);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
179 #ifdef DEBUG_VLC
1602
fdb8244da1e5 av_log patch(2 of ?) by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1598
diff changeset
180 av_log(NULL, AV_LOG_DEBUG, "%4x: code=%d n=%d\n",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
181 j, i, n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
182 #endif
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
183 if (table[j][1] /*bits*/ != 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
184 av_log(NULL, AV_LOG_ERROR, "incorrect codes\n");
2281
7b345b735ac7 do not call (av_)abort()
michael
parents: 1875
diff changeset
185 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
186 }
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
187 table[j][1] = n; //bits
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
188 table[j][0] = symbol;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
189 j++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
190 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
191 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
192 n -= table_nb_bits;
2663
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
193 j = (code >> ((flags & INIT_VLC_LE) ? n_prefix : n)) & ((1 << table_nb_bits) - 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
194 #ifdef DEBUG_VLC
5013
c7904664624c printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents: 4889
diff changeset
195 av_log(NULL,AV_LOG_DEBUG,"%4x: n=%d (subtable)\n",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
196 j, n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
197 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
198 /* compute table size */
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
199 n1 = -table[j][1]; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
200 if (n > n1)
986e461dc072 Initial revision
glantau
parents:
diff changeset
201 n1 = n;
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
202 table[j][1] = -n1; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
203 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
204 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
205 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
206
986e461dc072 Initial revision
glantau
parents:
diff changeset
207 /* second pass : fill auxillary tables recursively */
986e461dc072 Initial revision
glantau
parents:
diff changeset
208 for(i=0;i<table_size;i++) {
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
209 n = table[i][1]; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
210 if (n < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
211 n = -n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
212 if (n > table_nb_bits) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
213 n = table_nb_bits;
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
214 table[i][1] = -n; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
215 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
216 index = build_table(vlc, n, nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
217 bits, bits_wrap, bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
218 codes, codes_wrap, codes_size,
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
219 symbols, symbols_wrap, symbols_size,
2663
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
220 (flags & INIT_VLC_LE) ? (code_prefix | (i << n_prefix)) : ((code_prefix << table_nb_bits) | i),
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
221 n_prefix + table_nb_bits, flags);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
222 if (index < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
223 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
224 /* note: realloc has been done, so reload tables */
520
19a5e2a81e1a new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents: 497
diff changeset
225 table = &vlc->table[table_index];
535
7f1b09bb34c6 dont trash table in GET_VLC
michaelni
parents: 529
diff changeset
226 table[i][0] = index; //code
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
227 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
228 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
229 return table_index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
230 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
231
986e461dc072 Initial revision
glantau
parents:
diff changeset
232
24
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
233 /* Build VLC decoding tables suitable for use with get_vlc().
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
234
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
235 'nb_bits' set thee decoding table size (2^nb_bits) entries. The
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
236 bigger it is, the faster is the decoding. But it should not be too
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
237 big to save memory and L1 cache. '9' is a good compromise.
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
238
24
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
239 'nb_codes' : number of vlcs codes
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
240
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
241 'bits' : table which gives the size (in bits) of each vlc code.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
242
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
243 'codes' : table which gives the bit pattern of of each vlc code.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
244
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
245 'symbols' : table which gives the values to be returned from get_vlc().
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
246
24
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
247 'xxx_wrap' : give the number of bytes between each entry of the
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
248 'bits' or 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
249
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
250 'xxx_size' : gives the number of bytes of each entry of the 'bits'
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
251 or 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
252
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
253 'wrap' and 'size' allows to use any memory configuration and types
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
254 (byte/word/long) to store the 'bits', 'codes', and 'symbols' tables.
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
255
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
256 'use_static' should be set to 1 for tables, which should be freed
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
257 with av_free_static(), 0 if free_vlc() will be used.
24
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
258 */
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
259 int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
260 const void *bits, int bits_wrap, int bits_size,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
261 const void *codes, int codes_wrap, int codes_size,
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
262 const void *symbols, int symbols_wrap, int symbols_size,
4685
2c8f88e7397a fix init_vlc() with nonzero flags
mru
parents: 4670
diff changeset
263 int flags)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
265 vlc->bits = nb_bits;
4685
2c8f88e7397a fix init_vlc() with nonzero flags
mru
parents: 4670
diff changeset
266 if(!(flags & INIT_VLC_USE_STATIC)) {
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
267 vlc->table = NULL;
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
268 vlc->table_allocated = 0;
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
269 vlc->table_size = 0;
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
270 } else {
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
271 /* Static tables are initially always NULL, return
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
272 if vlc->table != NULL to avoid double allocation */
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
273 if(vlc->table)
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
274 return 0;
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
275 }
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
276
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
277 #ifdef DEBUG_VLC
5013
c7904664624c printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents: 4889
diff changeset
278 av_log(NULL,AV_LOG_DEBUG,"build table nb_codes=%d\n", nb_codes);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
279 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
280
986e461dc072 Initial revision
glantau
parents:
diff changeset
281 if (build_table(vlc, nb_bits, nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
282 bits, bits_wrap, bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
283 codes, codes_wrap, codes_size,
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
284 symbols, symbols_wrap, symbols_size,
4685
2c8f88e7397a fix init_vlc() with nonzero flags
mru
parents: 4670
diff changeset
285 0, 0, flags) < 0) {
5206
02dd5e0d7e46 use av_freep() in free_vlc() and failed init_vlc()
mru
parents: 5071
diff changeset
286 av_freep(&vlc->table);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
287 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
288 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
289 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
290 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
291
986e461dc072 Initial revision
glantau
parents:
diff changeset
292
986e461dc072 Initial revision
glantau
parents:
diff changeset
293 void free_vlc(VLC *vlc)
986e461dc072 Initial revision
glantau
parents:
diff changeset
294 {
5206
02dd5e0d7e46 use av_freep() in free_vlc() and failed init_vlc()
mru
parents: 5071
diff changeset
295 av_freep(&vlc->table);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
296 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
297