dst = (uint16_t *)p->data[i] + j * sheight * stride;
if (flags & 1) {
+ if (get_bits_left(&gb) < bps * width * height)
+ return AVERROR_INVALIDDATA;
for (k = 0; k < height; k++) {
for (x = 0; x < width; x++)
dst[x] = get_bits(&gb, bps);
MagicYUVContext *s = avctx->priv_data;
int interlaced = s->interlaced;
AVFrame *p = s->p;
- int i, k, x;
+ int i, k, x, min_width;
GetBitContext gb;
uint8_t *dst;
dst = p->data[i] + j * sheight * stride;
if (flags & 1) {
+ if (get_bits_left(&gb) < 8* width * height)
+ return AVERROR_INVALIDDATA;
for (k = 0; k < height; k++) {
for (x = 0; x < width; x++)
dst[x] = get_bits(&gb, 8);
s->llviddsp.add_left_pred(dst, dst, width, 0);
dst += stride;
}
+ min_width = FFMIN(width, 32);
for (k = 1 + interlaced; k < height; k++) {
top = dst[-fake_stride];
left = top + dst[0];
dst[0] = left;
- for (x = 1; x < width; x++) {
+ for (x = 1; x < min_width; x++) { /* dsp need aligned 32 */
top = dst[x - fake_stride];
lefttop = dst[x - (fake_stride + 1)];
left += top - lefttop + dst[x];
dst[x] = left;
}
+ if (width > 32)
+ s->llviddsp.add_gradient_pred(dst + 32, fake_stride, width - 32);
dst += stride;
}
break;
s->hshift[2] =
s->vshift[2] = 0;
s->decorrelate = 0;
- s->max = 256;
s->bps = 8;
- s->huff_build = huff_build;
- s->magy_decode_slice = magy_decode_slice;
format = bytestream2_get_byte(&gbyte);
switch (format) {
avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
s->hshift[1] =
s->hshift[2] = 1;
- s->max = 1024;
- s->huff_build = huff_build10;
- s->magy_decode_slice = magy_decode_slice10;
+ s->bps = 10;
+ break;
+ case 0x76:
+ avctx->pix_fmt = AV_PIX_FMT_YUV444P10;
s->bps = 10;
break;
case 0x6d:
avctx->pix_fmt = AV_PIX_FMT_GBRP10;
s->decorrelate = 1;
- s->max = 1024;
- s->huff_build = huff_build10;
- s->magy_decode_slice = magy_decode_slice10;
s->bps = 10;
break;
case 0x6e:
avctx->pix_fmt = AV_PIX_FMT_GBRAP10;
s->decorrelate = 1;
- s->max = 1024;
- s->huff_build = huff_build10;
- s->magy_decode_slice = magy_decode_slice10;
s->bps = 10;
break;
case 0x6f:
avctx->pix_fmt = AV_PIX_FMT_GBRP12;
s->decorrelate = 1;
- s->max = 4096;
- s->huff_build = huff_build12;
- s->magy_decode_slice = magy_decode_slice10;
s->bps = 12;
break;
case 0x70:
avctx->pix_fmt = AV_PIX_FMT_GBRAP12;
s->decorrelate = 1;
- s->max = 4096;
- s->huff_build = huff_build12;
- s->magy_decode_slice = magy_decode_slice10;
s->bps = 12;
break;
case 0x73:
avctx->pix_fmt = AV_PIX_FMT_GRAY10;
- s->max = 1024;
- s->huff_build = huff_build10;
- s->magy_decode_slice = magy_decode_slice10;
s->bps = 10;
break;
default:
avpriv_request_sample(avctx, "Format 0x%X", format);
return AVERROR_PATCHWELCOME;
}
+ s->max = 1 << s->bps;
+ s->magy_decode_slice = s->bps == 8 ? magy_decode_slice : magy_decode_slice10;
+ if ( s->bps == 8)
+ s->huff_build = huff_build;
+ else
+ s->huff_build = s->bps == 10 ? huff_build10 : huff_build12;
s->planes = av_pix_fmt_count_planes(avctx->pix_fmt);
bytestream2_skip(&gbyte, 1);