diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-06-16 17:11:58 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-06-21 17:39:51 +0200 |
| commit | af1e70dd664e874d855e862fa7a05766a22b55ee (patch) | |
| tree | 1be01e1d60b75f2b054946251ce113508949a2ea /libavcodec/dpx.c | |
| parent | a2613647c4f40b9e802cd21f37545ef1fdf370d1 (diff) | |
lavc/dpx: Support 12-bit packing method b (msbpad).
Diffstat (limited to 'libavcodec/dpx.c')
| -rw-r--r-- | libavcodec/dpx.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 582a861fdc..a781d8a40d 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -170,10 +170,6 @@ static int decode_frame(AVCodecContext *avctx, packing = read16(&buf, endian); encoding = read16(&buf, endian); - if (packing > 1) { - avpriv_report_missing_feature(avctx, "Packing %d", packing); - return AVERROR_PATCHWELCOME; - } if (encoding) { avpriv_report_missing_feature(avctx, "Encoding %d", encoding); return AVERROR_PATCHWELCOME; @@ -225,7 +221,7 @@ static int decode_frame(AVCodecContext *avctx, stride = avctx->width * elements; break; case 10: - if (!packing) { + if (!packing || packing > 1) { av_log(avctx, AV_LOG_ERROR, "Packing to 32bit required\n"); return -1; } @@ -387,16 +383,16 @@ static int decode_frame(AVCodecContext *avctx, (uint16_t*)ptr[1], (uint16_t*)ptr[2], (uint16_t*)ptr[3]}; + int shift = packing == 1 ? 4 : 0; for (y = 0; y < avctx->width; y++) { if (packing) { - if (elements >= 3) - *dst[2]++ = read16(&buf, endian) >> 4; - *dst[0] = read16(&buf, endian) >> 4; - dst[0]++; - if (elements >= 2) - *dst[1]++ = read16(&buf, endian) >> 4; - if (elements == 4) - *dst[3]++ = read16(&buf, endian) >> 4; + if (elements >= 3) + *dst[2]++ = read16(&buf, endian) >> shift & 0xFFF; + *dst[0]++ = read16(&buf, endian) >> shift & 0xFFF; + if (elements >= 2) + *dst[1]++ = read16(&buf, endian) >> shift & 0xFFF; + if (elements == 4) + *dst[3]++ = read16(&buf, endian) >> shift & 0xFFF; } else { *dst[2]++ = read12in32(&buf, &rgbBuffer, &n_datum, endian); |