From d239b83e2e5addea31c5e3277131406c6bfc3283 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sun, 8 May 2011 17:57:54 +0200 Subject: v210enc: switch to PIX_FMT_422P10 Signed-off-by: Anton Khirnov --- libavcodec/v210enc.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'libavcodec/v210enc.c') diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index 1f621d4907..808ab7d949 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -31,8 +31,8 @@ static av_cold int encode_init(AVCodecContext *avctx) return -1; } - if (avctx->pix_fmt != PIX_FMT_YUV422P16) { - av_log(avctx, AV_LOG_ERROR, "v210 needs YUV422P16\n"); + if (avctx->pix_fmt != PIX_FMT_YUV422P10) { + av_log(avctx, AV_LOG_ERROR, "v210 needs YUV422P10\n"); return -1; } @@ -68,9 +68,9 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, #define WRITE_PIXELS(a, b, c) \ do { \ - val = (*a++ >> 6) | \ - ((*b++ & 0xFFC0) << 4); \ - val|= (*c++ & 0xFFC0) << 14; \ + val = *a++; \ + val |= (*b++ << 10) | \ + (*c++ << 20); \ bytestream_put_le32(&p, val); \ } while (0) @@ -85,17 +85,15 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, if (w < avctx->width - 1) { WRITE_PIXELS(u, y, v); - val = *y++ >> 6; + val = *y++; if (w == avctx->width - 2) bytestream_put_le32(&p, val); } if (w < avctx->width - 3) { - val |=((*u++ & 0xFFC0) << 4) | - ((*y++ & 0xFFC0) << 14); + val |= (*u++ << 10) | (*y++ << 20); bytestream_put_le32(&p, val); - val = (*v++ >> 6) | - (*y++ & 0xFFC0) << 4; + val = *v++ | (*y++ << 10); bytestream_put_le32(&p, val); } @@ -124,6 +122,6 @@ AVCodec ff_v210_encoder = { .init = encode_init, .encode = encode_frame, .close = encode_close, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P16, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P10, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), }; -- cgit v1.2.3 From 635bbecfc300ae49461b8987e2ebbf200ec8d6b6 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sun, 8 May 2011 17:58:20 +0200 Subject: v210enc: clip values according to specifications Signed-off-by: Anton Khirnov --- libavcodec/v210enc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'libavcodec/v210enc.c') diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index 808ab7d949..58613520a5 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -66,11 +66,13 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, return -1; } +#define CLIP(v) av_clip(v, 4, 1019) + #define WRITE_PIXELS(a, b, c) \ do { \ - val = *a++; \ - val |= (*b++ << 10) | \ - (*c++ << 20); \ + val = CLIP(*a++); \ + val |= (CLIP(*b++) << 10) | \ + (CLIP(*c++) << 20); \ bytestream_put_le32(&p, val); \ } while (0) @@ -85,15 +87,15 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, if (w < avctx->width - 1) { WRITE_PIXELS(u, y, v); - val = *y++; + val = CLIP(*y++); if (w == avctx->width - 2) bytestream_put_le32(&p, val); } if (w < avctx->width - 3) { - val |= (*u++ << 10) | (*y++ << 20); + val |= (CLIP(*u++) << 10) | (CLIP(*y++) << 20); bytestream_put_le32(&p, val); - val = *v++ | (*y++ << 10); + val = CLIP(*v++) | (CLIP(*y++) << 10); bytestream_put_le32(&p, val); } -- cgit v1.2.3