static inline int loco_get_rice(RICEContext *r)
{
- int v;
+ unsigned v;
if (r->run > 0) { /* we have zero run */
r->run--;
loco_update_rice_param(r, 0);
return 0;
}
+ if (get_bits_left(&r->gb) < 1)
+ return INT_MIN;
v = get_ur_golomb_jpegls(&r->gb, loco_get_rice_param(r), INT_MAX, 0);
loco_update_rice_param(r, (v + 1) >> 1);
if (!v) {
int stride, const uint8_t *buf, int buf_size)
{
RICEContext rc;
- int val;
+ unsigned val;
int ret;
int i, j;
/* restore top line */
for (i = 1; i < width; i++) {
val = loco_get_rice(&rc);
+ if (val == INT_MIN)
+ return AVERROR_INVALIDDATA;
data[i] = data[i - 1] + val;
}
data += stride;
for (j = 1; j < height; j++) {
/* restore left column */
val = loco_get_rice(&rc);
+ if (val == INT_MIN)
+ return AVERROR_INVALIDDATA;
data[0] = data[-stride] + val;
/* restore all other pixels */
for (i = 1; i < width; i++) {
val = loco_get_rice(&rc);
+ if (val == INT_MIN)
+ return -1;
data[i] = loco_predict(&data[i], stride) + val;
}
data += stride;
ADVANCE_BY_DECODED;
decoded = loco_decode_plane(l, p->data[2] + p->linesize[2]*(avctx->height-1), avctx->width, avctx->height,
-p->linesize[2], buf, buf_size);
- if (avctx->width & 1)
+ if (avctx->width & 1) {
+ rotate_faulty_loco(p->data[0] + p->linesize[0]*(avctx->height-1), avctx->width, avctx->height, -p->linesize[0]);
rotate_faulty_loco(p->data[1] + p->linesize[1]*(avctx->height-1), avctx->width, avctx->height, -p->linesize[1]);
+ rotate_faulty_loco(p->data[2] + p->linesize[2]*(avctx->height-1), avctx->width, avctx->height, -p->linesize[2]);
+ }
break;
case LOCO_CRGBA:
case LOCO_RGBA:
avpriv_request_sample(avctx, "LOCO codec version %i", version);
}
+ if (l->lossy > 65536U) {
+ av_log(avctx, AV_LOG_ERROR, "lossy %i is too large\n", l->lossy);
+ return AVERROR_INVALIDDATA;
+ }
+
l->mode = AV_RL32(avctx->extradata + 4);
switch (l->mode) {
case LOCO_CYUY2:
.init = decode_init,
.decode = decode_frame,
.capabilities = AV_CODEC_CAP_DR1,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};