Mercurial > libavcodec.hg
annotate bitstream.c @ 7080:3cc0e7925700 libavcodec
10l: fix typo
author | vitor |
---|---|
date | Thu, 19 Jun 2008 20:34:29 +0000 |
parents | 7128fa020b0e |
children | d3a1ac3e227b |
rev | line source |
---|---|
0 | 1 /* |
2 * Common bit i/o utils | |
429 | 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 | 5 * |
5214 | 6 * alternative bitstream reader & writer by Michael Niedermayer <michaelni@gmx.at> |
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 | 11 * modify it under the terms of the GNU Lesser General Public |
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 | 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 | 16 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
429 | 17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
18 * Lesser General Public License for more details. | |
0 | 19 * |
429 | 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 | 23 */ |
1106 | 24 |
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 | 28 */ |
2967 | 29 |
524 | 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 | 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 | 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 */ |
6519 | 42 attribute_deprecated av_alloc_size(2) |
6941
da73a98945ea
Move *_static to bitstream.c which is the only file left which needs
michael
parents:
6935
diff
changeset
|
43 static void *ff_realloc_static(void *ptr, unsigned int size); |
da73a98945ea
Move *_static to bitstream.c which is the only file left which needs
michael
parents:
6935
diff
changeset
|
44 |
da73a98945ea
Move *_static to bitstream.c which is the only file left which needs
michael
parents:
6935
diff
changeset
|
45 static void *ff_realloc_static(void *ptr, unsigned int size) |
da73a98945ea
Move *_static to bitstream.c which is the only file left which needs
michael
parents:
6935
diff
changeset
|
46 { |
6944
030cc3278868
As *_static are not deallocated anymore except on program termination
michael
parents:
6943
diff
changeset
|
47 return av_realloc(ptr, size); |
6941
da73a98945ea
Move *_static to bitstream.c which is the only file left which needs
michael
parents:
6935
diff
changeset
|
48 } |
da73a98945ea
Move *_static to bitstream.c which is the only file left which needs
michael
parents:
6935
diff
changeset
|
49 |
0 | 50 void align_put_bits(PutBitContext *s) |
51 { | |
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
|
52 #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
|
53 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
|
54 #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
|
55 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
|
56 #endif |
0 | 57 } |
58 | |
6325 | 59 void ff_put_string(PutBitContext * pbc, const char *s, int put_zero) |
358 | 60 { |
61 while(*s){ | |
62 put_bits(pbc, 8, *s); | |
63 s++; | |
64 } | |
1795 | 65 if(put_zero) |
66 put_bits(pbc, 8, 0); | |
358 | 67 } |
68 | |
6325 | 69 void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length) |
5229 | 70 { |
6325 | 71 const uint16_t *srcw= (const uint16_t*)src; |
5229 | 72 int words= length>>4; |
73 int bits= length&15; | |
74 int i; | |
75 | |
76 if(length==0) return; | |
77 | |
5247
32b69770ae23
simplify ff_copy_bits() when compiled with config-small
aurel
parents:
5230
diff
changeset
|
78 if(ENABLE_SMALL || words < 16 || put_bits_count(pb)&7){ |
5229 | 79 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i])); |
80 }else{ | |
81 for(i=0; put_bits_count(pb)&31; i++) | |
82 put_bits(pb, 8, src[i]); | |
83 flush_put_bits(pb); | |
84 memcpy(pbBufPtr(pb), src+i, 2*words-i); | |
85 skip_put_bytes(pb, 2*words-i); | |
86 } | |
87 | |
88 put_bits(pb, bits, be2me_16(srcw[words])>>(16-bits)); | |
89 } | |
90 | |
0 | 91 /* VLC decoding */ |
92 | |
93 //#define DEBUG_VLC | |
94 | |
95 #define GET_DATA(v, table, i, wrap, size) \ | |
96 {\ | |
1064 | 97 const uint8_t *ptr = (const uint8_t *)table + i * wrap;\ |
0 | 98 switch(size) {\ |
99 case 1:\ | |
1064 | 100 v = *(const uint8_t *)ptr;\ |
0 | 101 break;\ |
102 case 2:\ | |
1064 | 103 v = *(const uint16_t *)ptr;\ |
0 | 104 break;\ |
105 default:\ | |
1064 | 106 v = *(const uint32_t *)ptr;\ |
0 | 107 break;\ |
108 }\ | |
109 } | |
110 | |
111 | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
112 static int alloc_table(VLC *vlc, int size, int use_static) |
0 | 113 { |
114 int index; | |
115 index = vlc->table_size; | |
116 vlc->table_size += size; | |
117 if (vlc->table_size > vlc->table_allocated) { | |
6935
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
118 if(use_static>1) |
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
119 abort(); //cant do anything, init_vlc() is used with too little memory |
0 | 120 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
|
121 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
|
122 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
|
123 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
|
124 else |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
125 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
|
126 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
|
127 if (!vlc->table) |
0 | 128 return -1; |
129 } | |
130 return index; | |
131 } | |
132 | |
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
|
133 static int build_table(VLC *vlc, int table_nb_bits, |
0 | 134 int nb_codes, |
135 const void *bits, int bits_wrap, int bits_size, | |
136 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
|
137 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
|
138 uint32_t code_prefix, int n_prefix, int flags) |
0 | 139 { |
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
140 int i, j, k, n, table_size, table_index, nb, n1, index, code_prefix2, symbol; |
1064 | 141 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
|
142 VLC_TYPE (*table)[2]; |
0 | 143 |
144 table_size = 1 << table_nb_bits; | |
6935
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
145 table_index = alloc_table(vlc, table_size, flags & (INIT_VLC_USE_STATIC|INIT_VLC_USE_NEW_STATIC)); |
0 | 146 #ifdef DEBUG_VLC |
5013
c7904664624c
printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents:
4889
diff
changeset
|
147 av_log(NULL,AV_LOG_DEBUG,"new table index=%d size=%d code_prefix=%x n=%d\n", |
0 | 148 table_index, table_size, code_prefix, n_prefix); |
149 #endif | |
150 if (table_index < 0) | |
151 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
|
152 table = &vlc->table[table_index]; |
0 | 153 |
154 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
|
155 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
|
156 table[i][0] = -1; //codes |
0 | 157 } |
158 | |
159 /* first pass: map codes and compute auxillary table sizes */ | |
160 for(i=0;i<nb_codes;i++) { | |
161 GET_DATA(n, bits, i, bits_wrap, bits_size); | |
162 GET_DATA(code, codes, i, codes_wrap, codes_size); | |
163 /* we accept tables with holes */ | |
164 if (n <= 0) | |
165 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
|
166 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
|
167 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
|
168 else |
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
169 GET_DATA(symbol, symbols, i, symbols_wrap, symbols_size); |
0 | 170 #if defined(DEBUG_VLC) && 0 |
5013
c7904664624c
printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents:
4889
diff
changeset
|
171 av_log(NULL,AV_LOG_DEBUG,"i=%d n=%d code=0x%x\n", i, n, code); |
0 | 172 #endif |
173 /* if code matches the prefix, it is in the table */ | |
174 n -= n_prefix; | |
2663
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
175 if(flags & INIT_VLC_LE) |
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
176 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
|
177 else |
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
178 code_prefix2= code >> n; |
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
179 if (n > 0 && code_prefix2 == code_prefix) { |
0 | 180 if (n <= table_nb_bits) { |
181 /* no need to add another table */ | |
182 j = (code << (table_nb_bits - n)) & (table_size - 1); | |
183 nb = 1 << (table_nb_bits - n); | |
184 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
|
185 if(flags & INIT_VLC_LE) |
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
186 j = (code >> n_prefix) + (k<<n); |
0 | 187 #ifdef DEBUG_VLC |
1602
fdb8244da1e5
av_log patch(2 of ?) by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1598
diff
changeset
|
188 av_log(NULL, AV_LOG_DEBUG, "%4x: code=%d n=%d\n", |
0 | 189 j, i, n); |
190 #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
|
191 if (table[j][1] /*bits*/ != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
192 av_log(NULL, AV_LOG_ERROR, "incorrect codes\n"); |
2281 | 193 return -1; |
0 | 194 } |
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
|
195 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
|
196 table[j][0] = symbol; |
0 | 197 j++; |
198 } | |
199 } else { | |
200 n -= table_nb_bits; | |
2663
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
201 j = (code >> ((flags & INIT_VLC_LE) ? n_prefix : n)) & ((1 << table_nb_bits) - 1); |
0 | 202 #ifdef DEBUG_VLC |
5013
c7904664624c
printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents:
4889
diff
changeset
|
203 av_log(NULL,AV_LOG_DEBUG,"%4x: n=%d (subtable)\n", |
0 | 204 j, n); |
205 #endif | |
206 /* 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
|
207 n1 = -table[j][1]; //bits |
0 | 208 if (n > n1) |
209 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
|
210 table[j][1] = -n1; //bits |
0 | 211 } |
212 } | |
213 } | |
214 | |
215 /* second pass : fill auxillary tables recursively */ | |
216 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
|
217 n = table[i][1]; //bits |
0 | 218 if (n < 0) { |
219 n = -n; | |
220 if (n > table_nb_bits) { | |
221 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
|
222 table[i][1] = -n; //bits |
0 | 223 } |
224 index = build_table(vlc, n, nb_codes, | |
225 bits, bits_wrap, bits_size, | |
226 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
|
227 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
|
228 (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
|
229 n_prefix + table_nb_bits, flags); |
0 | 230 if (index < 0) |
231 return -1; | |
232 /* 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
|
233 table = &vlc->table[table_index]; |
535 | 234 table[i][0] = index; //code |
0 | 235 } |
236 } | |
237 return table_index; | |
238 } | |
239 | |
240 | |
24 | 241 /* Build VLC decoding tables suitable for use with get_vlc(). |
242 | |
243 'nb_bits' set thee decoding table size (2^nb_bits) entries. The | |
244 bigger it is, the faster is the decoding. But it should not be too | |
245 big to save memory and L1 cache. '9' is a good compromise. | |
2967 | 246 |
24 | 247 'nb_codes' : number of vlcs codes |
248 | |
249 'bits' : table which gives the size (in bits) of each vlc code. | |
250 | |
251 'codes' : table which gives the bit pattern of of each vlc code. | |
252 | |
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
253 '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
|
254 |
24 | 255 'xxx_wrap' : give the number of bytes between each entry of the |
256 'bits' or 'codes' tables. | |
257 | |
258 'xxx_size' : gives the number of bytes of each entry of the 'bits' | |
259 or 'codes' tables. | |
260 | |
261 '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
|
262 (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
|
263 |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
264 '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
|
265 with av_free_static(), 0 if free_vlc() will be used. |
24 | 266 */ |
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
267 int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, |
0 | 268 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
|
269 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
|
270 const void *symbols, int symbols_wrap, int symbols_size, |
4685 | 271 int flags) |
0 | 272 { |
273 vlc->bits = nb_bits; | |
6935
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
274 if(flags & INIT_VLC_USE_NEW_STATIC){ |
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
275 if(vlc->table_size && vlc->table_size == vlc->table_allocated){ |
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
276 return 0; |
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
277 }else if(vlc->table_size){ |
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
278 abort(); // fatal error, we are called on a partially initialized table |
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
279 } |
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
280 }else 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
|
281 vlc->table = NULL; |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
282 vlc->table_allocated = 0; |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
283 vlc->table_size = 0; |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
284 } else { |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
285 /* 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
|
286 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
|
287 if(vlc->table) |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
288 return 0; |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
289 } |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
290 |
0 | 291 #ifdef DEBUG_VLC |
5013
c7904664624c
printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents:
4889
diff
changeset
|
292 av_log(NULL,AV_LOG_DEBUG,"build table nb_codes=%d\n", nb_codes); |
0 | 293 #endif |
294 | |
295 if (build_table(vlc, nb_bits, nb_codes, | |
296 bits, bits_wrap, bits_size, | |
297 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
|
298 symbols, symbols_wrap, symbols_size, |
4685 | 299 0, 0, flags) < 0) { |
5206 | 300 av_freep(&vlc->table); |
0 | 301 return -1; |
302 } | |
6935
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
303 if((flags & INIT_VLC_USE_NEW_STATIC) && vlc->table_size != vlc->table_allocated) |
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
304 av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); |
0 | 305 return 0; |
306 } | |
307 | |
308 | |
309 void free_vlc(VLC *vlc) | |
310 { | |
5206 | 311 av_freep(&vlc->table); |
0 | 312 } |
313 |