diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-05-08 17:57:54 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-09-07 12:16:21 +0200 |
| commit | d239b83e2e5addea31c5e3277131406c6bfc3283 (patch) | |
| tree | d1c6e6802d35f08311d6ae25bf834eb32bde6ee6 | |
| parent | 08fa23d6c2e9a39857045702c1d2804c0b99ccec (diff) | |
| download | ffmpeg-d239b83e2e5addea31c5e3277131406c6bfc3283.tar.gz | |
v210enc: switch to PIX_FMT_422P10
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/v210enc.c | 20 |
1 files changed, 9 insertions, 11 deletions
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"), }; |