Commit d5ded429 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavc/dpx: Support decoding 10 bit colourspace with transparency information.

Fixes one sample from ticket #5639.
parent 6bcc6fd5
...@@ -256,11 +256,13 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -256,11 +256,13 @@ static int decode_frame(AVCodecContext *avctx,
avctx->pix_fmt = AV_PIX_FMT_RGBA; avctx->pix_fmt = AV_PIX_FMT_RGBA;
break; break;
case 50100: case 50100:
case 51100:
case 50101: case 50101:
case 51101:
avctx->pix_fmt = AV_PIX_FMT_GBRP10; avctx->pix_fmt = AV_PIX_FMT_GBRP10;
break; break;
case 51100:
case 51101:
avctx->pix_fmt = AV_PIX_FMT_GBRAP10;
break;
case 50120: case 50120:
case 51120: case 51120:
case 50121: case 50121:
...@@ -313,9 +315,10 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -313,9 +315,10 @@ static int decode_frame(AVCodecContext *avctx,
switch (bits_per_color) { switch (bits_per_color) {
case 10: case 10:
for (x = 0; x < avctx->height; x++) { for (x = 0; x < avctx->height; x++) {
uint16_t *dst[3] = {(uint16_t*)ptr[0], uint16_t *dst[4] = {(uint16_t*)ptr[0],
(uint16_t*)ptr[1], (uint16_t*)ptr[1],
(uint16_t*)ptr[2]}; (uint16_t*)ptr[2],
(uint16_t*)ptr[3]};
for (y = 0; y < avctx->width; y++) { for (y = 0; y < avctx->width; y++) {
*dst[2]++ = read10in32(&buf, &rgbBuffer, *dst[2]++ = read10in32(&buf, &rgbBuffer,
&n_datum, endian); &n_datum, endian);
...@@ -323,13 +326,13 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -323,13 +326,13 @@ static int decode_frame(AVCodecContext *avctx,
&n_datum, endian); &n_datum, endian);
*dst[1]++ = read10in32(&buf, &rgbBuffer, *dst[1]++ = read10in32(&buf, &rgbBuffer,
&n_datum, endian); &n_datum, endian);
// For 10 bit, ignore alpha
if (elements == 4) if (elements == 4)
*dst[3]++ =
read10in32(&buf, &rgbBuffer, read10in32(&buf, &rgbBuffer,
&n_datum, endian); &n_datum, endian);
} }
n_datum = 0; n_datum = 0;
for (i = 0; i < 3; i++) for (i = 0; i < elements; i++)
ptr[i] += p->linesize[i]; ptr[i] += p->linesize[i];
} }
break; break;
......
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