History

avcodec/webp: Use LE VLC table for LE bitstream reader

The WebP format uses Huffman tables and the decoder therefore uses VLC tables. Given that WebP is a LE format, a LE bitreader is used; yet the VLC table is not created for a LE reader (the process used to create the tables puts the last bit to be read in the lowest bit) and therefore custom code for reading the VLCs that reverses the bits read is used instead of get_vlc2(). This commit changes this to use a table designed for LE bitreader which allows to use get_vlc2() directly. The necessary reversing of the codes is delegated to ff_init_vlc_sparse() (and is therefore only done during init and not when actually reading the VLCs).

Andreas Rheinhardt committed 6 years ago

Commit 00772ef1 parent d7a503e1 file · +2 −40Browse files

Unified · Split

libavcodec/webp.c+2−40
@@ -232,44 +232,6 @@ static void image_ctx_free(ImageContext *img) · 231 unmodified lines
232 memset(img, 0, sizeof(*img));232 memset(img, 0, sizeof(*img));
233}233}
234 234
235
236/* Differs from get_vlc2() in the following ways:
237 * - codes are bit-reversed
238 * - assumes 8-bit table to make reversal simpler
239 * - assumes max depth of 2 since the max code length for WebP is 15
240 */
241static av_always_inline int webp_get_vlc(GetBitContext *gb, VLC_TYPE (*table)[2])
242{
243 int n, nb_bits;
244 unsigned int index;
245 int code;
246
247 OPEN_READER(re, gb);
248 UPDATE_CACHE(re, gb);
249
250 index = SHOW_UBITS(re, gb, 8);
251 index = ff_reverse[index];
252 code = table[index][0];
253 n = table[index][1];
254
255 if (n < 0) {
256 LAST_SKIP_BITS(re, gb, 8);
257 UPDATE_CACHE(re, gb);
258
259 nb_bits = -n;
260
261 index = SHOW_UBITS(re, gb, nb_bits);
262 index = (ff_reverse[index] >> (8 - nb_bits)) + code;
263 code = table[index][0];
264 n = table[index][1];
265 }
266 SKIP_BITS(re, gb, n);
267
268 CLOSE_READER(re, gb);
269
270 return code;
271}
272
273static int huff_reader_get_symbol(HuffReader *r, GetBitContext *gb)235static int huff_reader_get_symbol(HuffReader *r, GetBitContext *gb)
274{236{
275 if (r->simple) {237 if (r->simple) {
@@ -278,7 +240,7 @@ static int huff_reader_get_symbol(HuffReader *r, GetBitContext *gb) · 2 unmodified lines
278 else240 else
279 return r->simple_symbols[get_bits1(gb)];241 return r->simple_symbols[get_bits1(gb)];
280 } else242 } else
281 return webp_get_vlc(gb, r->vlc.table);243 return get_vlc2(gb, r->vlc.table, 8, 2);
282}244}
283 245
284static int huff_reader_build_canonical(HuffReader *r, int *code_lengths,246static int huff_reader_build_canonical(HuffReader *r, int *code_lengths,
@@ -332,7 +294,7 @@ static int huff_reader_build_canonical(HuffReader *r, int *code_lengths, · 47 unmodified lines
332 294
333 ret = init_vlc(&r->vlc, 8, alphabet_size,295 ret = init_vlc(&r->vlc, 8, alphabet_size,
334 code_lengths, sizeof(*code_lengths), sizeof(*code_lengths),296 code_lengths, sizeof(*code_lengths), sizeof(*code_lengths),
335 codes, sizeof(*codes), sizeof(*codes), 0);297 codes, sizeof(*codes), sizeof(*codes), INIT_VLC_OUTPUT_LE);
336 if (ret < 0) {298 if (ret < 0) {
337 av_free(codes);299 av_free(codes);
338 return ret;300 return ret;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t