highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2016-06-15 17:45:51 +02:00
parent 346b3c5c41
commit aec96e233f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/dpx.c
View File

@ -264,11 +264,13 @@ static int decode_frame(AVCodecContext *avctx,
avctx->pix_fmt = AV_PIX_FMT_GBRAP10; avctx->pix_fmt = AV_PIX_FMT_GBRAP10;
break; break;
case 50120: case 50120:
case 51120:
case 50121: case 50121:
case 51121:
avctx->pix_fmt = AV_PIX_FMT_GBRP12; avctx->pix_fmt = AV_PIX_FMT_GBRP12;
break; break;
case 51120:
case 51121:
avctx->pix_fmt = AV_PIX_FMT_GBRAP12;
break;
case 6161: case 6161:
avctx->pix_fmt = AV_PIX_FMT_GRAY16BE; avctx->pix_fmt = AV_PIX_FMT_GRAY16BE;
break; break;
@ -338,9 +340,10 @@ static int decode_frame(AVCodecContext *avctx,
break; break;
case 12: case 12:
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] = read16(&buf, endian) >> 4; *dst[2] = read16(&buf, endian) >> 4;
dst[2]++; dst[2]++;
@ -348,11 +351,10 @@ static int decode_frame(AVCodecContext *avctx,
dst[0]++; dst[0]++;
*dst[1] = read16(&buf, endian) >> 4; *dst[1] = read16(&buf, endian) >> 4;
dst[1]++; dst[1]++;
// For 12 bit, ignore alpha
if (elements == 4) if (elements == 4)
buf += 2; *dst[3]++ = read16(&buf, endian) >> 4;
} }
for (i = 0; i < 3; i++) for (i = 0; i < elements; i++)
ptr[i] += p->linesize[i]; ptr[i] += p->linesize[i];
// Jump to next aligned position // Jump to next aligned position
buf += need_align; buf += need_align;