Commit 807a058e authored by Baptiste Coudurier's avatar Baptiste Coudurier Committed by Michael Niedermayer

v210dec: switch to PIX_FMT_422P10

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 4737a593
...@@ -30,7 +30,7 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -30,7 +30,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n"); av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n");
return -1; return -1;
} }
avctx->pix_fmt = PIX_FMT_YUV422P16; avctx->pix_fmt = PIX_FMT_YUV422P10;
avctx->bits_per_raw_sample = 10; avctx->bits_per_raw_sample = 10;
avctx->coded_frame = avcodec_alloc_frame(); avctx->coded_frame = avcodec_alloc_frame();
...@@ -68,10 +68,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, ...@@ -68,10 +68,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
#define READ_PIXELS(a, b, c) \ #define READ_PIXELS(a, b, c) \
do { \ do { \
val = av_le2ne32(*src++); \ val = av_le2ne32(*src++); \
*a++ = val << 6; \ *a++ = val & 0x3FF; \
*b++ = (val >> 4) & 0xFFC0; \ *b++ = (val >> 10) & 0x3FF; \
*c++ = (val >> 14) & 0xFFC0; \ *c++ = (val >> 20) & 0x3FF; \
} while (0) } while (0)
for (h = 0; h < avctx->height; h++) { for (h = 0; h < avctx->height; h++) {
...@@ -87,15 +87,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, ...@@ -87,15 +87,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
READ_PIXELS(u, y, v); READ_PIXELS(u, y, v);
val = av_le2ne32(*src++); val = av_le2ne32(*src++);
*y++ = val << 6; *y++ = val & 0x3FF;
} }
if (w < avctx->width - 3) { if (w < avctx->width - 3) {
*u++ = (val >> 4) & 0xFFC0; *u++ = (val >> 10) & 0x3FF;
*y++ = (val >> 14) & 0xFFC0; *y++ = (val >> 20) & 0x3FF;
val = av_le2ne32(*src++); val = av_le2ne32(*src++);
*v++ = val << 6; *v++ = val & 0x3FF;
*y++ = (val >> 4) & 0xFFC0; *y++ = (val >> 10) & 0x3FF;
} }
psrc += stride; psrc += stride;
......
0, 0, 3686400, 0x8d5c3847 0, 0, 3686400, 0x9c6c1dde
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