Commit 635bbecf authored by Baptiste Coudurier's avatar Baptiste Coudurier Committed by Anton Khirnov

v210enc: clip values according to specifications

Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
parent d239b83e
...@@ -66,11 +66,13 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, ...@@ -66,11 +66,13 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
return -1; return -1;
} }
#define CLIP(v) av_clip(v, 4, 1019)
#define WRITE_PIXELS(a, b, c) \ #define WRITE_PIXELS(a, b, c) \
do { \ do { \
val = *a++; \ val = CLIP(*a++); \
val |= (*b++ << 10) | \ val |= (CLIP(*b++) << 10) | \
(*c++ << 20); \ (CLIP(*c++) << 20); \
bytestream_put_le32(&p, val); \ bytestream_put_le32(&p, val); \
} while (0) } while (0)
...@@ -85,15 +87,15 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, ...@@ -85,15 +87,15 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
if (w < avctx->width - 1) { if (w < avctx->width - 1) {
WRITE_PIXELS(u, y, v); WRITE_PIXELS(u, y, v);
val = *y++; val = CLIP(*y++);
if (w == avctx->width - 2) if (w == avctx->width - 2)
bytestream_put_le32(&p, val); bytestream_put_le32(&p, val);
} }
if (w < avctx->width - 3) { if (w < avctx->width - 3) {
val |= (*u++ << 10) | (*y++ << 20); val |= (CLIP(*u++) << 10) | (CLIP(*y++) << 20);
bytestream_put_le32(&p, val); bytestream_put_le32(&p, val);
val = *v++ | (*y++ << 10); val = CLIP(*v++) | (CLIP(*y++) << 10);
bytestream_put_le32(&p, val); bytestream_put_le32(&p, val);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment