Mercurial > libavcodec.hg
annotate bitstream.c @ 4902:1296fd337cdf libavcodec
Move some declarations into header
Based on patch by Denis Fortin
(cons (car '(fortin NOSPAM)) '(nerim net))
| author | kostya |
|---|---|
| date | Fri, 04 May 2007 03:34:21 +0000 |
| parents | beeb03aad909 |
| children | c7904664624c |
| 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 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3648
diff
changeset
|
6 * This file is part of FFmpeg. |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3648
diff
changeset
|
7 * |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3648
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
| 429 | 9 * modify it under the terms of the GNU Lesser General Public |
| 10 * 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
|
11 * version 2.1 of the License, or (at your option) any later version. |
| 0 | 12 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3648
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
| 0 | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 16 * Lesser General Public License for more details. | |
| 0 | 17 * |
| 429 | 18 * 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
|
19 * 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
|
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
192
1e5f64be86fc
another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents:
144
diff
changeset
|
21 * |
|
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
|
22 * alternative bitstream reader & writer by Michael Niedermayer <michaelni@gmx.at> |
| 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. |
|
4889
beeb03aad909
patch so that the deprecated items show up correctly
benoit
parents:
4685
diff
changeset
|
39 * @deprecated. Code which uses ff_realloc_static is broken/missdesigned |
|
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 | |
| 0 | 63 /* VLC decoding */ |
| 64 | |
| 65 //#define DEBUG_VLC | |
| 66 | |
| 67 #define GET_DATA(v, table, i, wrap, size) \ | |
| 68 {\ | |
| 1064 | 69 const uint8_t *ptr = (const uint8_t *)table + i * wrap;\ |
| 0 | 70 switch(size) {\ |
| 71 case 1:\ | |
| 1064 | 72 v = *(const uint8_t *)ptr;\ |
| 0 | 73 break;\ |
| 74 case 2:\ | |
| 1064 | 75 v = *(const uint16_t *)ptr;\ |
| 0 | 76 break;\ |
| 77 default:\ | |
| 1064 | 78 v = *(const uint32_t *)ptr;\ |
| 0 | 79 break;\ |
| 80 }\ | |
| 81 } | |
| 82 | |
| 83 | |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
84 static int alloc_table(VLC *vlc, int size, int use_static) |
| 0 | 85 { |
| 86 int index; | |
| 87 index = vlc->table_size; | |
| 88 vlc->table_size += size; | |
| 89 if (vlc->table_size > vlc->table_allocated) { | |
| 90 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
|
91 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
|
92 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
|
93 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
|
94 else |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
95 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
|
96 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
|
97 if (!vlc->table) |
| 0 | 98 return -1; |
| 99 } | |
| 100 return index; | |
| 101 } | |
| 102 | |
|
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
|
103 static int build_table(VLC *vlc, int table_nb_bits, |
| 0 | 104 int nb_codes, |
| 105 const void *bits, int bits_wrap, int bits_size, | |
| 106 const void *codes, int codes_wrap, int codes_size, | |
|
2663
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
107 uint32_t code_prefix, int n_prefix, int flags) |
| 0 | 108 { |
|
2663
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
109 int i, j, k, n, table_size, table_index, nb, n1, index, code_prefix2; |
| 1064 | 110 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
|
111 VLC_TYPE (*table)[2]; |
| 0 | 112 |
| 113 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
|
114 table_index = alloc_table(vlc, table_size, flags & INIT_VLC_USE_STATIC); |
| 0 | 115 #ifdef DEBUG_VLC |
|
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
|
116 printf("new table index=%d size=%d code_prefix=%x n=%d\n", |
| 0 | 117 table_index, table_size, code_prefix, n_prefix); |
| 118 #endif | |
| 119 if (table_index < 0) | |
| 120 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
|
121 table = &vlc->table[table_index]; |
| 0 | 122 |
| 123 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
|
124 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
|
125 table[i][0] = -1; //codes |
| 0 | 126 } |
| 127 | |
| 128 /* first pass: map codes and compute auxillary table sizes */ | |
| 129 for(i=0;i<nb_codes;i++) { | |
| 130 GET_DATA(n, bits, i, bits_wrap, bits_size); | |
| 131 GET_DATA(code, codes, i, codes_wrap, codes_size); | |
| 132 /* we accept tables with holes */ | |
| 133 if (n <= 0) | |
| 134 continue; | |
| 135 #if defined(DEBUG_VLC) && 0 | |
| 136 printf("i=%d n=%d code=0x%x\n", i, n, code); | |
| 137 #endif | |
| 138 /* if code matches the prefix, it is in the table */ | |
| 139 n -= n_prefix; | |
|
2663
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
140 if(flags & INIT_VLC_LE) |
|
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
141 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
|
142 else |
|
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
143 code_prefix2= code >> n; |
|
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
144 if (n > 0 && code_prefix2 == code_prefix) { |
| 0 | 145 if (n <= table_nb_bits) { |
| 146 /* no need to add another table */ | |
| 147 j = (code << (table_nb_bits - n)) & (table_size - 1); | |
| 148 nb = 1 << (table_nb_bits - n); | |
| 149 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
|
150 if(flags & INIT_VLC_LE) |
|
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
151 j = (code >> n_prefix) + (k<<n); |
| 0 | 152 #ifdef DEBUG_VLC |
|
1602
fdb8244da1e5
av_log patch(2 of ?) by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1598
diff
changeset
|
153 av_log(NULL, AV_LOG_DEBUG, "%4x: code=%d n=%d\n", |
| 0 | 154 j, i, n); |
| 155 #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
|
156 if (table[j][1] /*bits*/ != 0) { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
157 av_log(NULL, AV_LOG_ERROR, "incorrect codes\n"); |
| 2281 | 158 return -1; |
| 0 | 159 } |
|
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
|
160 table[j][1] = n; //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
|
161 table[j][0] = i; //code |
| 0 | 162 j++; |
| 163 } | |
| 164 } else { | |
| 165 n -= table_nb_bits; | |
|
2663
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
166 j = (code >> ((flags & INIT_VLC_LE) ? n_prefix : n)) & ((1 << table_nb_bits) - 1); |
| 0 | 167 #ifdef DEBUG_VLC |
| 168 printf("%4x: n=%d (subtable)\n", | |
| 169 j, n); | |
| 170 #endif | |
| 171 /* 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
|
172 n1 = -table[j][1]; //bits |
| 0 | 173 if (n > n1) |
| 174 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
|
175 table[j][1] = -n1; //bits |
| 0 | 176 } |
| 177 } | |
| 178 } | |
| 179 | |
| 180 /* second pass : fill auxillary tables recursively */ | |
| 181 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
|
182 n = table[i][1]; //bits |
| 0 | 183 if (n < 0) { |
| 184 n = -n; | |
| 185 if (n > table_nb_bits) { | |
| 186 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
|
187 table[i][1] = -n; //bits |
| 0 | 188 } |
| 189 index = build_table(vlc, n, nb_codes, | |
| 190 bits, bits_wrap, bits_size, | |
| 191 codes, codes_wrap, codes_size, | |
|
2663
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
192 (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
|
193 n_prefix + table_nb_bits, flags); |
| 0 | 194 if (index < 0) |
| 195 return -1; | |
| 196 /* 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
|
197 table = &vlc->table[table_index]; |
| 535 | 198 table[i][0] = index; //code |
| 0 | 199 } |
| 200 } | |
| 201 return table_index; | |
| 202 } | |
| 203 | |
| 204 | |
| 24 | 205 /* Build VLC decoding tables suitable for use with get_vlc(). |
| 206 | |
| 207 'nb_bits' set thee decoding table size (2^nb_bits) entries. The | |
| 208 bigger it is, the faster is the decoding. But it should not be too | |
| 209 big to save memory and L1 cache. '9' is a good compromise. | |
| 2967 | 210 |
| 24 | 211 'nb_codes' : number of vlcs codes |
| 212 | |
| 213 'bits' : table which gives the size (in bits) of each vlc code. | |
| 214 | |
| 215 'codes' : table which gives the bit pattern of of each vlc code. | |
| 216 | |
| 217 'xxx_wrap' : give the number of bytes between each entry of the | |
| 218 'bits' or 'codes' tables. | |
| 219 | |
| 220 'xxx_size' : gives the number of bytes of each entry of the 'bits' | |
| 221 or 'codes' tables. | |
| 222 | |
| 223 'wrap' and 'size' allows to use any memory configuration and types | |
| 2967 | 224 (byte/word/long) to store the 'bits' and 'codes' tables. |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
225 |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
226 '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
|
227 with av_free_static(), 0 if free_vlc() will be used. |
| 24 | 228 */ |
| 0 | 229 int init_vlc(VLC *vlc, int nb_bits, int nb_codes, |
| 230 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
|
231 const void *codes, int codes_wrap, int codes_size, |
| 4685 | 232 int flags) |
| 0 | 233 { |
| 234 vlc->bits = nb_bits; | |
| 4685 | 235 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
|
236 vlc->table = NULL; |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
237 vlc->table_allocated = 0; |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
238 vlc->table_size = 0; |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
239 } else { |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
240 /* 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
|
241 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
|
242 if(vlc->table) |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
243 return 0; |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
244 } |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
245 |
| 0 | 246 #ifdef DEBUG_VLC |
| 247 printf("build table nb_codes=%d\n", nb_codes); | |
| 248 #endif | |
| 249 | |
| 250 if (build_table(vlc, nb_bits, nb_codes, | |
| 251 bits, bits_wrap, bits_size, | |
| 252 codes, codes_wrap, codes_size, | |
| 4685 | 253 0, 0, flags) < 0) { |
|
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
|
254 av_free(vlc->table); |
| 0 | 255 return -1; |
| 256 } | |
| 257 return 0; | |
| 258 } | |
| 259 | |
| 260 | |
| 261 void free_vlc(VLC *vlc) | |
| 262 { | |
|
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
|
263 av_free(vlc->table); |
| 0 | 264 } |
| 265 |
