annotate common.c @ 219:5b88ee1abf97 libavcodec

(m)jpeg pad/flush with 1 instead of 0, fix by Rik Snel <rsnel@cube.dyndns.org>
author arpi_esp
date Sat, 26 Jan 2002 00:22:25 +0000
parents b691dd3e9088
children 5fc0c3af3fe4
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
3 * Copyright (c) 2000, 2001 Gerard Lantau.
986e461dc072 Initial revision
glantau
parents:
diff changeset
4 *
986e461dc072 Initial revision
glantau
parents:
diff changeset
5 * This program is free software; you can redistribute it and/or modify
986e461dc072 Initial revision
glantau
parents:
diff changeset
6 * it under the terms of the GNU General Public License as published by
986e461dc072 Initial revision
glantau
parents:
diff changeset
7 * the Free Software Foundation; either version 2 of the License, or
986e461dc072 Initial revision
glantau
parents:
diff changeset
8 * (at your option) any later version.
986e461dc072 Initial revision
glantau
parents:
diff changeset
9 *
986e461dc072 Initial revision
glantau
parents:
diff changeset
10 * This program is distributed in the hope that it will be useful,
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
986e461dc072 Initial revision
glantau
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
986e461dc072 Initial revision
glantau
parents:
diff changeset
13 * GNU General Public License for more details.
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
986e461dc072 Initial revision
glantau
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License
986e461dc072 Initial revision
glantau
parents:
diff changeset
16 * along with this program; if not, write to the Free Software
986e461dc072 Initial revision
glantau
parents:
diff changeset
17 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
18 *
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
19 * alternative bitstream reader by Michael Niedermayer <michaelni@gmx.at>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
20 */
64
5aa6292a1660 win32 fixes
glantau
parents: 24
diff changeset
21 #include "common.h"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
22 #include <math.h>
8
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 0
diff changeset
23
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
24 void init_put_bits(PutBitContext *s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
25 UINT8 *buffer, int buffer_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
26 void *opaque,
986e461dc072 Initial revision
glantau
parents:
diff changeset
27 void (*write_data)(void *, UINT8 *, int))
986e461dc072 Initial revision
glantau
parents:
diff changeset
28 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
29 s->buf = buffer;
986e461dc072 Initial revision
glantau
parents:
diff changeset
30 s->buf_ptr = s->buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
31 s->buf_end = s->buf + buffer_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
32 s->bit_cnt=0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
33 s->bit_buf=0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
34 s->data_out_size = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
35 s->write_data = write_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
36 s->opaque = opaque;
986e461dc072 Initial revision
glantau
parents:
diff changeset
37 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
38
986e461dc072 Initial revision
glantau
parents:
diff changeset
39 static void flush_buffer(PutBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
40 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
41 int size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
42 if (s->write_data) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
43 size = s->buf_ptr - s->buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
44 if (size > 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
45 s->write_data(s->opaque, s->buf, size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
46 s->buf_ptr = s->buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
47 s->data_out_size += size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
48 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
49 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
50
986e461dc072 Initial revision
glantau
parents:
diff changeset
51 void put_bits(PutBitContext *s, int n, unsigned int value)
986e461dc072 Initial revision
glantau
parents:
diff changeset
52 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
53 unsigned int bit_buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
54 int bit_cnt;
986e461dc072 Initial revision
glantau
parents:
diff changeset
55
986e461dc072 Initial revision
glantau
parents:
diff changeset
56 #ifdef STATS
986e461dc072 Initial revision
glantau
parents:
diff changeset
57 st_out_bit_counts[st_current_index] += n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
58 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
59 // printf("put_bits=%d %x\n", n, value);
986e461dc072 Initial revision
glantau
parents:
diff changeset
60 assert(n == 32 || value < (1U << n));
986e461dc072 Initial revision
glantau
parents:
diff changeset
61
986e461dc072 Initial revision
glantau
parents:
diff changeset
62 bit_buf = s->bit_buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
63 bit_cnt = s->bit_cnt;
986e461dc072 Initial revision
glantau
parents:
diff changeset
64
986e461dc072 Initial revision
glantau
parents:
diff changeset
65 // printf("n=%d value=%x cnt=%d buf=%x\n", n, value, bit_cnt, bit_buf);
986e461dc072 Initial revision
glantau
parents:
diff changeset
66 /* XXX: optimize */
986e461dc072 Initial revision
glantau
parents:
diff changeset
67 if (n < (32-bit_cnt)) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
68 bit_buf |= value << (32 - n - bit_cnt);
986e461dc072 Initial revision
glantau
parents:
diff changeset
69 bit_cnt+=n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
70 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
71 bit_buf |= value >> (n + bit_cnt - 32);
64
5aa6292a1660 win32 fixes
glantau
parents: 24
diff changeset
72 *(UINT32 *)s->buf_ptr = be2me_32(bit_buf);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
73 //printf("bitbuf = %08x\n", bit_buf);
986e461dc072 Initial revision
glantau
parents:
diff changeset
74 s->buf_ptr+=4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
75 if (s->buf_ptr >= s->buf_end)
986e461dc072 Initial revision
glantau
parents:
diff changeset
76 flush_buffer(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
77 bit_cnt=bit_cnt + n - 32;
986e461dc072 Initial revision
glantau
parents:
diff changeset
78 if (bit_cnt == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
79 bit_buf = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
80 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
81 bit_buf = value << (32 - bit_cnt);
986e461dc072 Initial revision
glantau
parents:
diff changeset
82 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
83 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
84
986e461dc072 Initial revision
glantau
parents:
diff changeset
85 s->bit_buf = bit_buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
86 s->bit_cnt = bit_cnt;
986e461dc072 Initial revision
glantau
parents:
diff changeset
87 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
88
986e461dc072 Initial revision
glantau
parents:
diff changeset
89 /* return the number of bits output */
64
5aa6292a1660 win32 fixes
glantau
parents: 24
diff changeset
90 INT64 get_bit_count(PutBitContext *s)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
91 {
64
5aa6292a1660 win32 fixes
glantau
parents: 24
diff changeset
92 return (s->buf_ptr - s->buf + s->data_out_size) * 8 + (INT64)s->bit_cnt;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
93 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
94
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 void align_put_bits(PutBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
96 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
97 put_bits(s,(8 - s->bit_cnt) & 7,0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
98 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
99
986e461dc072 Initial revision
glantau
parents:
diff changeset
100 /* pad the end of the output stream with zeros */
986e461dc072 Initial revision
glantau
parents:
diff changeset
101 void flush_put_bits(PutBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
102 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
103 while (s->bit_cnt > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
104 /* XXX: should test end of buffer */
986e461dc072 Initial revision
glantau
parents:
diff changeset
105 *s->buf_ptr++=s->bit_buf >> 24;
986e461dc072 Initial revision
glantau
parents:
diff changeset
106 s->bit_buf<<=8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
107 s->bit_cnt-=8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
108 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
109 flush_buffer(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
110 s->bit_cnt=0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
111 s->bit_buf=0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
112 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
113
24
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
114 /* for jpeg : escape 0xff with 0x00 after it */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
115 void jput_bits(PutBitContext *s, int n, unsigned int value)
986e461dc072 Initial revision
glantau
parents:
diff changeset
116 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
117 unsigned int bit_buf, b;
986e461dc072 Initial revision
glantau
parents:
diff changeset
118 int bit_cnt, i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
119
986e461dc072 Initial revision
glantau
parents:
diff changeset
120 assert(n == 32 || value < (1U << n));
986e461dc072 Initial revision
glantau
parents:
diff changeset
121
986e461dc072 Initial revision
glantau
parents:
diff changeset
122 bit_buf = s->bit_buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
123 bit_cnt = s->bit_cnt;
986e461dc072 Initial revision
glantau
parents:
diff changeset
124
986e461dc072 Initial revision
glantau
parents:
diff changeset
125 //printf("n=%d value=%x cnt=%d buf=%x\n", n, value, bit_cnt, bit_buf);
986e461dc072 Initial revision
glantau
parents:
diff changeset
126 /* XXX: optimize */
986e461dc072 Initial revision
glantau
parents:
diff changeset
127 if (n < (32-bit_cnt)) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
128 bit_buf |= value << (32 - n - bit_cnt);
986e461dc072 Initial revision
glantau
parents:
diff changeset
129 bit_cnt+=n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
130 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
131 bit_buf |= value >> (n + bit_cnt - 32);
986e461dc072 Initial revision
glantau
parents:
diff changeset
132 /* handle escape */
986e461dc072 Initial revision
glantau
parents:
diff changeset
133 for(i=0;i<4;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
134 b = (bit_buf >> 24);
986e461dc072 Initial revision
glantau
parents:
diff changeset
135 *(s->buf_ptr++) = b;
986e461dc072 Initial revision
glantau
parents:
diff changeset
136 if (b == 0xff)
986e461dc072 Initial revision
glantau
parents:
diff changeset
137 *(s->buf_ptr++) = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
138 bit_buf <<= 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
139 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
140 /* we flush the buffer sooner to handle worst case */
986e461dc072 Initial revision
glantau
parents:
diff changeset
141 if (s->buf_ptr >= (s->buf_end - 8))
986e461dc072 Initial revision
glantau
parents:
diff changeset
142 flush_buffer(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
143
986e461dc072 Initial revision
glantau
parents:
diff changeset
144 bit_cnt=bit_cnt + n - 32;
986e461dc072 Initial revision
glantau
parents:
diff changeset
145 if (bit_cnt == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
146 bit_buf = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
147 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
148 bit_buf = value << (32 - bit_cnt);
986e461dc072 Initial revision
glantau
parents:
diff changeset
149 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
150 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
151
986e461dc072 Initial revision
glantau
parents:
diff changeset
152 s->bit_buf = bit_buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
153 s->bit_cnt = bit_cnt;
986e461dc072 Initial revision
glantau
parents:
diff changeset
154 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
155
986e461dc072 Initial revision
glantau
parents:
diff changeset
156 /* pad the end of the output stream with zeros */
986e461dc072 Initial revision
glantau
parents:
diff changeset
157 void jflush_put_bits(PutBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
158 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
159 unsigned int b;
219
5b88ee1abf97 (m)jpeg pad/flush with 1 instead of 0, fix by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 193
diff changeset
160 s->bit_buf |= ~1U >> s->bit_cnt; /* set all the unused bits to one */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
161
986e461dc072 Initial revision
glantau
parents:
diff changeset
162 while (s->bit_cnt > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
163 b = s->bit_buf >> 24;
986e461dc072 Initial revision
glantau
parents:
diff changeset
164 *s->buf_ptr++ = b;
986e461dc072 Initial revision
glantau
parents:
diff changeset
165 if (b == 0xff)
986e461dc072 Initial revision
glantau
parents:
diff changeset
166 *s->buf_ptr++ = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
167 s->bit_buf<<=8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
168 s->bit_cnt-=8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
169 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
170 flush_buffer(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
171 s->bit_cnt=0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
172 s->bit_buf=0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
173 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
174
986e461dc072 Initial revision
glantau
parents:
diff changeset
175 /* bit input functions */
986e461dc072 Initial revision
glantau
parents:
diff changeset
176
986e461dc072 Initial revision
glantau
parents:
diff changeset
177 void init_get_bits(GetBitContext *s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
178 UINT8 *buffer, int buffer_size)
986e461dc072 Initial revision
glantau
parents:
diff changeset
179 {
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
180 #ifdef ALT_BITSTREAM_READER
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
181 s->index=0;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
182 s->buffer= buffer;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
183 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
184 s->buf = buffer;
986e461dc072 Initial revision
glantau
parents:
diff changeset
185 s->buf_ptr = buffer;
986e461dc072 Initial revision
glantau
parents:
diff changeset
186 s->buf_end = buffer + buffer_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
187 s->bit_cnt = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
188 s->bit_buf = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
189 while (s->buf_ptr < s->buf_end &&
986e461dc072 Initial revision
glantau
parents:
diff changeset
190 s->bit_cnt < 32) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
191 s->bit_buf |= (*s->buf_ptr++ << (24 - s->bit_cnt));
986e461dc072 Initial revision
glantau
parents:
diff changeset
192 s->bit_cnt += 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
193 }
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
194 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
195 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
196
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
197 #ifndef ALT_BITSTREAM_READER
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
198 /* n must be >= 1 and <= 32 */
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 8
diff changeset
199 /* also true: n > s->bit_cnt */
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 8
diff changeset
200 unsigned int get_bits_long(GetBitContext *s, int n)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
201 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
202 unsigned int val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
203 int bit_cnt;
986e461dc072 Initial revision
glantau
parents:
diff changeset
204 unsigned int bit_buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
205
986e461dc072 Initial revision
glantau
parents:
diff changeset
206 #ifdef STATS
986e461dc072 Initial revision
glantau
parents:
diff changeset
207 st_bit_counts[st_current_index] += n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
208 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
209
986e461dc072 Initial revision
glantau
parents:
diff changeset
210 bit_buf = s->bit_buf;
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 8
diff changeset
211 bit_cnt = s->bit_cnt - n;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
212
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 8
diff changeset
213 // if (bit_cnt >= 0) {
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 8
diff changeset
214 // val = bit_buf >> (32 - n);
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 8
diff changeset
215 // bit_buf <<= n;
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 8
diff changeset
216 // } else
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 8
diff changeset
217 {
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 8
diff changeset
218 UINT8 *buf_ptr;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
219 val = bit_buf >> (32 - n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
220 buf_ptr = s->buf_ptr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
221 buf_ptr += 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
222 /* handle common case: we can read everything */
986e461dc072 Initial revision
glantau
parents:
diff changeset
223 if (buf_ptr <= s->buf_end) {
8
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 0
diff changeset
224 #if ARCH_X86
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 0
diff changeset
225 bit_buf = bswap_32(*((unsigned long*)(&buf_ptr[-4])));
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 0
diff changeset
226 #else
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 0
diff changeset
227 bit_buf = (buf_ptr[-4] << 24) |
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 0
diff changeset
228 (buf_ptr[-3] << 16) |
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
229 (buf_ptr[-2] << 8) |
8
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 0
diff changeset
230 (buf_ptr[-1]);
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 0
diff changeset
231 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
232 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
233 buf_ptr -= 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
234 bit_buf = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
235 if (buf_ptr < s->buf_end)
986e461dc072 Initial revision
glantau
parents:
diff changeset
236 bit_buf |= *buf_ptr++ << 24;
986e461dc072 Initial revision
glantau
parents:
diff changeset
237 if (buf_ptr < s->buf_end)
986e461dc072 Initial revision
glantau
parents:
diff changeset
238 bit_buf |= *buf_ptr++ << 16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
239 if (buf_ptr < s->buf_end)
986e461dc072 Initial revision
glantau
parents:
diff changeset
240 bit_buf |= *buf_ptr++ << 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
241 if (buf_ptr < s->buf_end)
986e461dc072 Initial revision
glantau
parents:
diff changeset
242 bit_buf |= *buf_ptr++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
244 s->buf_ptr = buf_ptr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
245 val |= bit_buf >> (32 + bit_cnt);
986e461dc072 Initial revision
glantau
parents:
diff changeset
246 bit_buf <<= - bit_cnt;
986e461dc072 Initial revision
glantau
parents:
diff changeset
247 bit_cnt += 32;
986e461dc072 Initial revision
glantau
parents:
diff changeset
248 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
249 s->bit_buf = bit_buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
250 s->bit_cnt = bit_cnt;
986e461dc072 Initial revision
glantau
parents:
diff changeset
251 return val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
252 }
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
253 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
254
986e461dc072 Initial revision
glantau
parents:
diff changeset
255 void align_get_bits(GetBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
256 {
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
257 #ifdef ALT_BITSTREAM_READER
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
258 s->index= (s->index + 7) & (~7);
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
259 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
260 int n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
261 n = s->bit_cnt & 7;
986e461dc072 Initial revision
glantau
parents:
diff changeset
262 if (n > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
263 get_bits(s, n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 }
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
265 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
266 }
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
267
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
268 #ifndef ALT_BITSTREAM_READER
144
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
269 /* This function is identical to get_bits_long(), the */
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
270 /* only diference is that it doesn't touch the buffer */
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
271 /* it is usefull to see the buffer. */
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
272
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
273 unsigned int show_bits_long(GetBitContext *s, int n)
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
274 {
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
275 unsigned int val;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
276 int bit_cnt;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
277 unsigned int bit_buf;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
278 UINT8 *buf_ptr;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
279
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
280 bit_buf = s->bit_buf;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
281 bit_cnt = s->bit_cnt - n;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
282
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
283 val = bit_buf >> (32 - n);
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
284 buf_ptr = s->buf_ptr;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
285 buf_ptr += 4;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
286
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
287 /* handle common case: we can read everything */
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
288 if (buf_ptr <= s->buf_end) {
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
289 #ifdef ARCH_X86
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
290 bit_buf = bswap_32(*((unsigned long*)(&buf_ptr[-4])));
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
291 #else
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
292 bit_buf = (buf_ptr[-4] << 24) |
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
293 (buf_ptr[-3] << 16) |
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
294 (buf_ptr[-2] << 8) |
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
295 (buf_ptr[-1]);
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
296 #endif
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
297 } else {
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
298 buf_ptr -= 4;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
299 bit_buf = 0;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
300 if (buf_ptr < s->buf_end)
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
301 bit_buf |= *buf_ptr++ << 24;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
302 if (buf_ptr < s->buf_end)
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
303 bit_buf |= *buf_ptr++ << 16;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
304 if (buf_ptr < s->buf_end)
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
305 bit_buf |= *buf_ptr++ << 8;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
306 if (buf_ptr < s->buf_end)
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
307 bit_buf |= *buf_ptr++;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
308 }
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
309 val |= bit_buf >> (32 + bit_cnt);
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
310 bit_buf <<= - bit_cnt;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
311 bit_cnt += 32;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
312
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
313 return val;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 64
diff changeset
314 }
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
315 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
316
986e461dc072 Initial revision
glantau
parents:
diff changeset
317 /* VLC decoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
318
986e461dc072 Initial revision
glantau
parents:
diff changeset
319 //#define DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
320
986e461dc072 Initial revision
glantau
parents:
diff changeset
321 #define GET_DATA(v, table, i, wrap, size) \
986e461dc072 Initial revision
glantau
parents:
diff changeset
322 {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
323 UINT8 *ptr = (UINT8 *)table + i * wrap;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
324 switch(size) {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
325 case 1:\
986e461dc072 Initial revision
glantau
parents:
diff changeset
326 v = *(UINT8 *)ptr;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
327 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
328 case 2:\
986e461dc072 Initial revision
glantau
parents:
diff changeset
329 v = *(UINT16 *)ptr;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
330 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
331 default:\
986e461dc072 Initial revision
glantau
parents:
diff changeset
332 v = *(UINT32 *)ptr;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
333 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
334 }\
986e461dc072 Initial revision
glantau
parents:
diff changeset
335 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
336
986e461dc072 Initial revision
glantau
parents:
diff changeset
337
986e461dc072 Initial revision
glantau
parents:
diff changeset
338 static int alloc_table(VLC *vlc, int size)
986e461dc072 Initial revision
glantau
parents:
diff changeset
339 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
340 int index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
341 index = vlc->table_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
342 vlc->table_size += size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
343 if (vlc->table_size > vlc->table_allocated) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
344 vlc->table_allocated += (1 << vlc->bits);
986e461dc072 Initial revision
glantau
parents:
diff changeset
345 vlc->table_bits = realloc(vlc->table_bits,
986e461dc072 Initial revision
glantau
parents:
diff changeset
346 sizeof(INT8) * vlc->table_allocated);
986e461dc072 Initial revision
glantau
parents:
diff changeset
347 vlc->table_codes = realloc(vlc->table_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
348 sizeof(INT16) * vlc->table_allocated);
986e461dc072 Initial revision
glantau
parents:
diff changeset
349 if (!vlc->table_bits ||
986e461dc072 Initial revision
glantau
parents:
diff changeset
350 !vlc->table_codes)
986e461dc072 Initial revision
glantau
parents:
diff changeset
351 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
352 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
353 return index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
354 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
355
986e461dc072 Initial revision
glantau
parents:
diff changeset
356 static int build_table(VLC *vlc, int table_nb_bits,
986e461dc072 Initial revision
glantau
parents:
diff changeset
357 int nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
358 const void *bits, int bits_wrap, int bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
359 const void *codes, int codes_wrap, int codes_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
360 UINT32 code_prefix, int n_prefix)
986e461dc072 Initial revision
glantau
parents:
diff changeset
361 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
362 int i, j, k, n, table_size, table_index, nb, n1, index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
363 UINT32 code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
364 INT8 *table_bits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
365 INT16 *table_codes;
986e461dc072 Initial revision
glantau
parents:
diff changeset
366
986e461dc072 Initial revision
glantau
parents:
diff changeset
367 table_size = 1 << table_nb_bits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
368 table_index = alloc_table(vlc, table_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
369 #ifdef DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
370 printf("new table index=%d size=%d code_prefix=%x n=%d\n",
986e461dc072 Initial revision
glantau
parents:
diff changeset
371 table_index, table_size, code_prefix, n_prefix);
986e461dc072 Initial revision
glantau
parents:
diff changeset
372 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
373 if (table_index < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
374 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
375 table_bits = &vlc->table_bits[table_index];
986e461dc072 Initial revision
glantau
parents:
diff changeset
376 table_codes = &vlc->table_codes[table_index];
986e461dc072 Initial revision
glantau
parents:
diff changeset
377
986e461dc072 Initial revision
glantau
parents:
diff changeset
378 for(i=0;i<table_size;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
379 table_bits[i] = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
380 table_codes[i] = -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
381 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
382
986e461dc072 Initial revision
glantau
parents:
diff changeset
383 /* first pass: map codes and compute auxillary table sizes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
384 for(i=0;i<nb_codes;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
385 GET_DATA(n, bits, i, bits_wrap, bits_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
386 GET_DATA(code, codes, i, codes_wrap, codes_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
387 /* we accept tables with holes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
388 if (n <= 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
389 continue;
986e461dc072 Initial revision
glantau
parents:
diff changeset
390 #if defined(DEBUG_VLC) && 0
986e461dc072 Initial revision
glantau
parents:
diff changeset
391 printf("i=%d n=%d code=0x%x\n", i, n, code);
986e461dc072 Initial revision
glantau
parents:
diff changeset
392 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
393 /* if code matches the prefix, it is in the table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
394 n -= n_prefix;
986e461dc072 Initial revision
glantau
parents:
diff changeset
395 if (n > 0 && (code >> n) == code_prefix) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
396 if (n <= table_nb_bits) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
397 /* no need to add another table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
398 j = (code << (table_nb_bits - n)) & (table_size - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
399 nb = 1 << (table_nb_bits - n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
400 for(k=0;k<nb;k++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
401 #ifdef DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
402 printf("%4x: code=%d n=%d\n",
986e461dc072 Initial revision
glantau
parents:
diff changeset
403 j, i, n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
404 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
405 if (table_bits[j] != 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
406 fprintf(stderr, "incorrect codes\n");
986e461dc072 Initial revision
glantau
parents:
diff changeset
407 exit(1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
408 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
409 table_bits[j] = n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
410 table_codes[j] = i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
411 j++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
412 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
413 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
414 n -= table_nb_bits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
415 j = (code >> n) & ((1 << table_nb_bits) - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
416 #ifdef DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
417 printf("%4x: n=%d (subtable)\n",
986e461dc072 Initial revision
glantau
parents:
diff changeset
418 j, n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
419 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
420 /* compute table size */
986e461dc072 Initial revision
glantau
parents:
diff changeset
421 n1 = -table_bits[j];
986e461dc072 Initial revision
glantau
parents:
diff changeset
422 if (n > n1)
986e461dc072 Initial revision
glantau
parents:
diff changeset
423 n1 = n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
424 table_bits[j] = -n1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
425 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
426 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
427 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
428
986e461dc072 Initial revision
glantau
parents:
diff changeset
429 /* second pass : fill auxillary tables recursively */
986e461dc072 Initial revision
glantau
parents:
diff changeset
430 for(i=0;i<table_size;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
431 n = table_bits[i];
986e461dc072 Initial revision
glantau
parents:
diff changeset
432 if (n < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
433 n = -n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
434 if (n > table_nb_bits) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
435 n = table_nb_bits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
436 table_bits[i] = -n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
437 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
438 index = build_table(vlc, n, nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
439 bits, bits_wrap, bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
440 codes, codes_wrap, codes_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
441 (code_prefix << table_nb_bits) | i,
986e461dc072 Initial revision
glantau
parents:
diff changeset
442 n_prefix + table_nb_bits);
986e461dc072 Initial revision
glantau
parents:
diff changeset
443 if (index < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
444 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
445 /* note: realloc has been done, so reload tables */
986e461dc072 Initial revision
glantau
parents:
diff changeset
446 table_bits = &vlc->table_bits[table_index];
986e461dc072 Initial revision
glantau
parents:
diff changeset
447 table_codes = &vlc->table_codes[table_index];
986e461dc072 Initial revision
glantau
parents:
diff changeset
448 table_codes[i] = index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
449 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
450 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
451 return table_index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
452 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
453
986e461dc072 Initial revision
glantau
parents:
diff changeset
454
24
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
455 /* Build VLC decoding tables suitable for use with get_vlc().
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
456
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
457 'nb_bits' set thee decoding table size (2^nb_bits) entries. The
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
458 bigger it is, the faster is the decoding. But it should not be too
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
459 big to save memory and L1 cache. '9' is a good compromise.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
460
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
461 'nb_codes' : number of vlcs codes
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
462
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
463 'bits' : table which gives the size (in bits) of each vlc code.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
464
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
465 'codes' : table which gives the bit pattern of of each vlc code.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
466
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
467 'xxx_wrap' : give the number of bytes between each entry of the
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
468 'bits' or 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
469
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
470 'xxx_size' : gives the number of bytes of each entry of the 'bits'
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
471 or 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
472
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
473 'wrap' and 'size' allows to use any memory configuration and types
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
474 (byte/word/long) to store the 'bits' and 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
475 */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
476 int init_vlc(VLC *vlc, int nb_bits, int nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
477 const void *bits, int bits_wrap, int bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
478 const void *codes, int codes_wrap, int codes_size)
986e461dc072 Initial revision
glantau
parents:
diff changeset
479 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
480 vlc->bits = nb_bits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
481 vlc->table_bits = NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
482 vlc->table_codes = NULL;
986e461dc072 Initial revision
glantau
parents:
diff changeset
483 vlc->table_allocated = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
484 vlc->table_size = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
485 #ifdef DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
486 printf("build table nb_codes=%d\n", nb_codes);
986e461dc072 Initial revision
glantau
parents:
diff changeset
487 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
488
986e461dc072 Initial revision
glantau
parents:
diff changeset
489 if (build_table(vlc, nb_bits, nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
490 bits, bits_wrap, bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
491 codes, codes_wrap, codes_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
492 0, 0) < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
493 if (vlc->table_bits)
986e461dc072 Initial revision
glantau
parents:
diff changeset
494 free(vlc->table_bits);
986e461dc072 Initial revision
glantau
parents:
diff changeset
495 if (vlc->table_codes)
986e461dc072 Initial revision
glantau
parents:
diff changeset
496 free(vlc->table_codes);
986e461dc072 Initial revision
glantau
parents:
diff changeset
497 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
498 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
499 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
500 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
501
986e461dc072 Initial revision
glantau
parents:
diff changeset
502
986e461dc072 Initial revision
glantau
parents:
diff changeset
503 void free_vlc(VLC *vlc)
986e461dc072 Initial revision
glantau
parents:
diff changeset
504 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
505 free(vlc->table_bits);
986e461dc072 Initial revision
glantau
parents:
diff changeset
506 free(vlc->table_codes);
986e461dc072 Initial revision
glantau
parents:
diff changeset
507 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
508