typedef struct YLCContext {
VLC vlc[4];
- uint32_t table[1024];
+ uint32_t table[256];
uint8_t *buffer;
int buffer_size;
BswapDSPContext bdsp;
if ((ret = init_get_bits8(&gb, s->buffer, boffset - toffset)) < 0)
return ret;
- for (x = 0; x < 1024; x++) {
- unsigned len = get_unary(&gb, 1, 31);
- uint32_t val = ((1U << len) - 1) + get_bits_long(&gb, len);
+ for (int i = 0; i < 4; i++) {
+ for (x = 0; x < 256; x++) {
+ unsigned len = get_unary(&gb, 1, 31);
+ uint32_t val = ((1U << len) - 1) + get_bits_long(&gb, len);
- s->table[x] = val;
- }
+ s->table[x] = val;
+ }
- ret = build_vlc(avctx, &s->vlc[0], &s->table[0 ]);
- if (ret < 0)
- return ret;
- ret = build_vlc(avctx, &s->vlc[1], &s->table[256]);
- if (ret < 0)
- return ret;
- ret = build_vlc(avctx, &s->vlc[2], &s->table[512]);
- if (ret < 0)
- return ret;
- ret = build_vlc(avctx, &s->vlc[3], &s->table[768]);
- if (ret < 0)
- return ret;
+ ret = build_vlc(avctx, &s->vlc[i], s->table);
+ if (ret < 0)
+ return ret;
+ }
memcpy(s->buffer, avpkt->data + boffset, avpkt->size - boffset);
memset(s->buffer + avpkt->size - boffset, 0, AV_INPUT_BUFFER_PADDING_SIZE);
{
YLCContext *s = avctx->priv_data;
- ff_free_vlc(&s->vlc[0]);
- ff_free_vlc(&s->vlc[1]);
- ff_free_vlc(&s->vlc[2]);
- ff_free_vlc(&s->vlc[3]);
+ for (int i = 0; i < FF_ARRAY_ELEMS(s->vlc); i++)
+ ff_free_vlc(&s->vlc[i]);
av_freep(&s->buffer);
s->buffer_size = 0;
return 0;
}
-AVCodec ff_ylc_decoder = {
+const AVCodec ff_ylc_decoder = {
.name = "ylc",
.long_name = NULL_IF_CONFIG_SMALL("YUY2 Lossless Codec"),
.type = AVMEDIA_TYPE_VIDEO,