annotate bitstream.c @ 6941:da73a98945ea libavcodec

Move *_static to bitstream.c which is the only file left which needs them.
author michael
date Fri, 30 May 2008 21:12:33 +0000
parents 24e01f7cc819
children 29ebf511fb22
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 */
6519
f57fee2decd6 Apply 'alloc_size' attribute to ff_realloc_static()
zuxy
parents: 6325
diff changeset
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 unsigned int last_static = 0;
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
46 static unsigned int allocated_static = 0;
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
47 static void** array_static = NULL;
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 static void *av_mallocz_static(unsigned int size)
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
50 {
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
51 void *ptr = av_mallocz(size);
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
52
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
53 if(ptr){
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
54 array_static =av_fast_realloc(array_static, &allocated_static, sizeof(void*)*(last_static+1));
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
55 if(!array_static)
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
56 return NULL;
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
57 array_static[last_static++] = ptr;
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
58 }
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
59
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
60 return ptr;
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
61 }
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
62
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
63 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
64 {
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
65 int i;
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
66 if(!ptr)
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
67 return av_mallocz_static(size);
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
68 /* Look for the old ptr */
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
69 for(i = 0; i < last_static; i++) {
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
70 if(array_static[i] == ptr) {
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
71 array_static[i] = av_realloc(array_static[i], size);
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
72 return array_static[i];
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
73 }
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
74 }
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
75 return NULL;
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
76
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
77 }
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
78
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
79 static void av_free_static(void)
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
80 {
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
81 while(last_static){
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
82 av_freep(&array_static[--last_static]);
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
83 }
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
84 av_freep(&array_static);
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
85 }
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
86
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
87 /**
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
88 * Call av_free_static automatically before it's too late
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
89 */
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
90
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
91 static void do_free(void) __attribute__ ((destructor));
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
92
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
93 static void do_free(void)
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
94 {
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
95 av_free_static();
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
96 }
da73a98945ea Move *_static to bitstream.c which is the only file left which needs
michael
parents: 6935
diff changeset
97
4576
ad02fe65f45a Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents: 3947
diff changeset
98
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
99 void align_put_bits(PutBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
100 {
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
101 #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
102 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
103 #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
104 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
105 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
106 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
107
6325
michael
parents: 5409
diff changeset
108 void ff_put_string(PutBitContext * pbc, const char *s, int put_zero)
358
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
109 {
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
110 while(*s){
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
111 put_bits(pbc, 8, *s);
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
112 s++;
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
113 }
1795
920e6381e1fe 2 byte shorter userdata for mpeg4
michael
parents: 1786
diff changeset
114 if(put_zero)
920e6381e1fe 2 byte shorter userdata for mpeg4
michael
parents: 1786
diff changeset
115 put_bits(pbc, 8, 0);
358
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
116 }
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
117
6325
michael
parents: 5409
diff changeset
118 void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length)
5229
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
119 {
6325
michael
parents: 5409
diff changeset
120 const uint16_t *srcw= (const uint16_t*)src;
5229
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
121 int words= length>>4;
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
122 int bits= length&15;
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
123 int i;
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
124
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
125 if(length==0) return;
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
126
5247
32b69770ae23 simplify ff_copy_bits() when compiled with config-small
aurel
parents: 5230
diff changeset
127 if(ENABLE_SMALL || words < 16 || put_bits_count(pb)&7){
5229
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
128 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
129 }else{
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
130 for(i=0; put_bits_count(pb)&31; i++)
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
131 put_bits(pb, 8, src[i]);
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
132 flush_put_bits(pb);
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
133 memcpy(pbBufPtr(pb), src+i, 2*words-i);
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
134 skip_put_bytes(pb, 2*words-i);
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
135 }
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
136
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
137 put_bits(pb, bits, be2me_16(srcw[words])>>(16-bits));
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
138 }
604a09d6cf2e move ff_copy_bits to bitstream.c
aurel
parents: 5214
diff changeset
139
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
140 /* VLC decoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
141
986e461dc072 Initial revision
glantau
parents:
diff changeset
142 //#define DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
143
986e461dc072 Initial revision
glantau
parents:
diff changeset
144 #define GET_DATA(v, table, i, wrap, size) \
986e461dc072 Initial revision
glantau
parents:
diff changeset
145 {\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
146 const uint8_t *ptr = (const uint8_t *)table + i * wrap;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
147 switch(size) {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
148 case 1:\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
149 v = *(const uint8_t *)ptr;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
150 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
151 case 2:\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
152 v = *(const uint16_t *)ptr;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
153 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
154 default:\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
155 v = *(const uint32_t *)ptr;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
156 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
157 }\
986e461dc072 Initial revision
glantau
parents:
diff changeset
158 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
159
986e461dc072 Initial revision
glantau
parents:
diff changeset
160
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
161 static int alloc_table(VLC *vlc, int size, int use_static)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
162 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
163 int index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
164 index = vlc->table_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
165 vlc->table_size += size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
166 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
167 if(use_static>1)
24e01f7cc819 Make init_vlc* support proper static tables instead of this broken beyond
michael
parents: 6519
diff changeset
168 abort(); //cant do anything, init_vlc() is used with too little memory
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
169 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
170 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
171 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
172 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
173 else
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
174 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
175 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
176 if (!vlc->table)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
177 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
178 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
179 return index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
180 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
181
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 static int build_table(VLC *vlc, int table_nb_bits,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
183 int nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
184 const void *bits, int bits_wrap, int bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
185 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
186 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
187 uint32_t code_prefix, int n_prefix, int flags)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
188 {
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
189 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
190 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
191 VLC_TYPE (*table)[2];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
192
986e461dc072 Initial revision
glantau
parents:
diff changeset
193 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
194 table_index = alloc_table(vlc, table_size, flags & (INIT_VLC_USE_STATIC|INIT_VLC_USE_NEW_STATIC));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
195 #ifdef DEBUG_VLC
5013
c7904664624c printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents: 4889
diff changeset
196 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
197 table_index, table_size, code_prefix, n_prefix);
986e461dc072 Initial revision
glantau
parents:
diff changeset
198 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
199 if (table_index < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
200 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
201 table = &vlc->table[table_index];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
202
986e461dc072 Initial revision
glantau
parents:
diff changeset
203 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
204 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
205 table[i][0] = -1; //codes
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
206 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
207
986e461dc072 Initial revision
glantau
parents:
diff changeset
208 /* first pass: map codes and compute auxillary table sizes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
209 for(i=0;i<nb_codes;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
210 GET_DATA(n, bits, i, bits_wrap, bits_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
211 GET_DATA(code, codes, i, codes_wrap, codes_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
212 /* we accept tables with holes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
213 if (n <= 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
214 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
215 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
216 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
217 else
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
218 GET_DATA(symbol, symbols, i, symbols_wrap, symbols_size);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
219 #if defined(DEBUG_VLC) && 0
5013
c7904664624c printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents: 4889
diff changeset
220 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
221 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
222 /* if code matches the prefix, it is in the table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
223 n -= n_prefix;
2663
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
224 if(flags & INIT_VLC_LE)
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
225 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
226 else
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
227 code_prefix2= code >> n;
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
228 if (n > 0 && code_prefix2 == code_prefix) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
229 if (n <= table_nb_bits) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
230 /* no need to add another table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
231 j = (code << (table_nb_bits - n)) & (table_size - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
232 nb = 1 << (table_nb_bits - n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
233 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
234 if(flags & INIT_VLC_LE)
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
235 j = (code >> n_prefix) + (k<<n);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
236 #ifdef DEBUG_VLC
1602
fdb8244da1e5 av_log patch(2 of ?) by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1598
diff changeset
237 av_log(NULL, AV_LOG_DEBUG, "%4x: code=%d n=%d\n",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
238 j, i, n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
239 #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
240 if (table[j][1] /*bits*/ != 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
241 av_log(NULL, AV_LOG_ERROR, "incorrect codes\n");
2281
7b345b735ac7 do not call (av_)abort()
michael
parents: 1875
diff changeset
242 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 }
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
244 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
245 table[j][0] = symbol;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
246 j++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
247 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
248 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
249 n -= table_nb_bits;
2663
b33be8b00488 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents: 2398
diff changeset
250 j = (code >> ((flags & INIT_VLC_LE) ? n_prefix : n)) & ((1 << table_nb_bits) - 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
251 #ifdef DEBUG_VLC
5013
c7904664624c printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents: 4889
diff changeset
252 av_log(NULL,AV_LOG_DEBUG,"%4x: n=%d (subtable)\n",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
253 j, n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
254 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
255 /* 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
256 n1 = -table[j][1]; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
257 if (n > n1)
986e461dc072 Initial revision
glantau
parents:
diff changeset
258 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
259 table[j][1] = -n1; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
260 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
261 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
262 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
263
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 /* second pass : fill auxillary tables recursively */
986e461dc072 Initial revision
glantau
parents:
diff changeset
265 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
266 n = table[i][1]; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
267 if (n < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
268 n = -n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
269 if (n > table_nb_bits) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
270 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
271 table[i][1] = -n; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
272 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
273 index = build_table(vlc, n, nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
274 bits, bits_wrap, bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
275 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
276 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
277 (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
278 n_prefix + table_nb_bits, flags);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
279 if (index < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
280 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
281 /* 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
282 table = &vlc->table[table_index];
535
7f1b09bb34c6 dont trash table in GET_VLC
michaelni
parents: 529
diff changeset
283 table[i][0] = index; //code
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
284 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
285 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
286 return table_index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
287 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
288
986e461dc072 Initial revision
glantau
parents:
diff changeset
289
24
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
290 /* Build VLC decoding tables suitable for use with get_vlc().
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
291
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
292 'nb_bits' set thee decoding table size (2^nb_bits) entries. The
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
293 bigger it is, the faster is the decoding. But it should not be too
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
294 big to save memory and L1 cache. '9' is a good compromise.
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
295
24
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
296 'nb_codes' : number of vlcs codes
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
297
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
298 'bits' : table which gives the size (in bits) of each vlc code.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
299
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
300 'codes' : table which gives the bit pattern of of each vlc code.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
301
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
302 '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
303
24
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
304 'xxx_wrap' : give the number of bytes between each entry of the
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
305 'bits' or 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
306
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
307 'xxx_size' : gives the number of bytes of each entry of the 'bits'
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
308 or 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
309
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
310 '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
311 (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
312
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
313 '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
314 with av_free_static(), 0 if free_vlc() will be used.
24
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
315 */
5071
0d503c12092b add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents: 5013
diff changeset
316 int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
317 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
318 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
319 const void *symbols, int symbols_wrap, int symbols_size,
4685
2c8f88e7397a fix init_vlc() with nonzero flags
mru
parents: 4670
diff changeset
320 int flags)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
321 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
322 vlc->bits = nb_bits;
6935
24e01f7cc819 Make init_vlc* support proper static tables instead of this broken beyond
michael
parents: 6519
diff changeset
323 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
324 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
325 return 0;
24e01f7cc819 Make init_vlc* support proper static tables instead of this broken beyond
michael
parents: 6519
diff changeset
326 }else if(vlc->table_size){
24e01f7cc819 Make init_vlc* support proper static tables instead of this broken beyond
michael
parents: 6519
diff changeset
327 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
328 }
24e01f7cc819 Make init_vlc* support proper static tables instead of this broken beyond
michael
parents: 6519
diff changeset
329 }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
330 vlc->table = NULL;
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
331 vlc->table_allocated = 0;
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
332 vlc->table_size = 0;
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
333 } else {
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
334 /* 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
335 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
336 if(vlc->table)
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
337 return 0;
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
338 }
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2281
diff changeset
339
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
340 #ifdef DEBUG_VLC
5013
c7904664624c printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents: 4889
diff changeset
341 av_log(NULL,AV_LOG_DEBUG,"build table nb_codes=%d\n", nb_codes);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
342 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
343
986e461dc072 Initial revision
glantau
parents:
diff changeset
344 if (build_table(vlc, nb_bits, nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
345 bits, bits_wrap, bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
346 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
347 symbols, symbols_wrap, symbols_size,
4685
2c8f88e7397a fix init_vlc() with nonzero flags
mru
parents: 4670
diff changeset
348 0, 0, flags) < 0) {
5206
02dd5e0d7e46 use av_freep() in free_vlc() and failed init_vlc()
mru
parents: 5071
diff changeset
349 av_freep(&vlc->table);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
350 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
351 }
6935
24e01f7cc819 Make init_vlc* support proper static tables instead of this broken beyond
michael
parents: 6519
diff changeset
352 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
353 av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
354 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
355 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
356
986e461dc072 Initial revision
glantau
parents:
diff changeset
357
986e461dc072 Initial revision
glantau
parents:
diff changeset
358 void free_vlc(VLC *vlc)
986e461dc072 Initial revision
glantau
parents:
diff changeset
359 {
5206
02dd5e0d7e46 use av_freep() in free_vlc() and failed init_vlc()
mru
parents: 5071
diff changeset
360 av_freep(&vlc->table);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
361 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
362