Mercurial > libavcodec.hg
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 |
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 */ |
4670 | 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 | 44 void align_put_bits(PutBitContext *s) |
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 | 51 } |
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 | 54 { |
55 while(*s){ | |
56 put_bits(pbc, 8, *s); | |
57 s++; | |
58 } | |
1795 | 59 if(put_zero) |
60 put_bits(pbc, 8, 0); | |
358 | 61 } |
62 | |
5229 | 63 void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length) |
64 { | |
65 const uint16_t *srcw= (uint16_t*)src; | |
66 int words= length>>4; | |
67 int bits= length&15; | |
68 int i; | |
69 | |
70 if(length==0) return; | |
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 | 73 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i])); |
74 }else{ | |
75 for(i=0; put_bits_count(pb)&31; i++) | |
76 put_bits(pb, 8, src[i]); | |
77 flush_put_bits(pb); | |
78 memcpy(pbBufPtr(pb), src+i, 2*words-i); | |
79 skip_put_bytes(pb, 2*words-i); | |
80 } | |
81 | |
82 put_bits(pb, bits, be2me_16(srcw[words])>>(16-bits)); | |
83 } | |
84 | |
0 | 85 /* VLC decoding */ |
86 | |
87 //#define DEBUG_VLC | |
88 | |
89 #define GET_DATA(v, table, i, wrap, size) \ | |
90 {\ | |
1064 | 91 const uint8_t *ptr = (const uint8_t *)table + i * wrap;\ |
0 | 92 switch(size) {\ |
93 case 1:\ | |
1064 | 94 v = *(const uint8_t *)ptr;\ |
0 | 95 break;\ |
96 case 2:\ | |
1064 | 97 v = *(const uint16_t *)ptr;\ |
0 | 98 break;\ |
99 default:\ | |
1064 | 100 v = *(const uint32_t *)ptr;\ |
0 | 101 break;\ |
102 }\ | |
103 } | |
104 | |
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 | 107 { |
108 int index; | |
109 index = vlc->table_size; | |
110 vlc->table_size += size; | |
111 if (vlc->table_size > vlc->table_allocated) { | |
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 | 120 return -1; |
121 } | |
122 return index; | |
123 } | |
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 | 126 int nb_codes, |
127 const void *bits, int bits_wrap, int bits_size, | |
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 | 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 | 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 | 135 |
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 | 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 | 140 table_index, table_size, code_prefix, n_prefix); |
141 #endif | |
142 if (table_index < 0) | |
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 | 145 |
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 | 149 } |
150 | |
151 /* first pass: map codes and compute auxillary table sizes */ | |
152 for(i=0;i<nb_codes;i++) { | |
153 GET_DATA(n, bits, i, bits_wrap, bits_size); | |
154 GET_DATA(code, codes, i, codes_wrap, codes_size); | |
155 /* we accept tables with holes */ | |
156 if (n <= 0) | |
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 | 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 | 164 #endif |
165 /* if code matches the prefix, it is in the table */ | |
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 | 172 if (n <= table_nb_bits) { |
173 /* no need to add another table */ | |
174 j = (code << (table_nb_bits - n)) & (table_size - 1); | |
175 nb = 1 << (table_nb_bits - n); | |
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 | 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 | 181 j, i, n); |
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 | 185 return -1; |
0 | 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 | 189 j++; |
190 } | |
191 } else { | |
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 | 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 | 196 j, n); |
197 #endif | |
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 | 200 if (n > n1) |
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 | 203 } |
204 } | |
205 } | |
206 | |
207 /* second pass : fill auxillary tables recursively */ | |
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 | 210 if (n < 0) { |
211 n = -n; | |
212 if (n > table_nb_bits) { | |
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 | 215 } |
216 index = build_table(vlc, n, nb_codes, | |
217 bits, bits_wrap, bits_size, | |
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 | 222 if (index < 0) |
223 return -1; | |
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 | 226 table[i][0] = index; //code |
0 | 227 } |
228 } | |
229 return table_index; | |
230 } | |
231 | |
232 | |
24 | 233 /* Build VLC decoding tables suitable for use with get_vlc(). |
234 | |
235 'nb_bits' set thee decoding table size (2^nb_bits) entries. The | |
236 bigger it is, the faster is the decoding. But it should not be too | |
237 big to save memory and L1 cache. '9' is a good compromise. | |
2967 | 238 |
24 | 239 'nb_codes' : number of vlcs codes |
240 | |
241 'bits' : table which gives the size (in bits) of each vlc code. | |
242 | |
243 'codes' : table which gives the bit pattern of of each vlc code. | |
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 | 247 'xxx_wrap' : give the number of bytes between each entry of the |
248 'bits' or 'codes' tables. | |
249 | |
250 'xxx_size' : gives the number of bytes of each entry of the 'bits' | |
251 or 'codes' tables. | |
252 | |
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 | 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 | 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 | 263 int flags) |
0 | 264 { |
265 vlc->bits = nb_bits; | |
4685 | 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 | 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 | 279 #endif |
280 | |
281 if (build_table(vlc, nb_bits, nb_codes, | |
282 bits, bits_wrap, bits_size, | |
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 | 285 0, 0, flags) < 0) { |
5206 | 286 av_freep(&vlc->table); |
0 | 287 return -1; |
288 } | |
289 return 0; | |
290 } | |
291 | |
292 | |
293 void free_vlc(VLC *vlc) | |
294 { | |
5206 | 295 av_freep(&vlc->table); |
0 | 296 } |
297 |