diff options
| author | Peter Ross <pross@xvid.org> | 2014-02-23 12:18:42 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 02:38:17 +0100 |
| commit | 7e23cfba765ae0f69adc315f333446b5a46cbbb5 (patch) | |
| tree | 8418073d51a4187dd5c7dee316c1471070e52dbb | |
| parent | a3a4d07d6ae5d435adc8024b5ed9cea888d9e611 (diff) | |
| download | ffmpeg-7e23cfba765ae0f69adc315f333446b5a46cbbb5.tar.gz | |
avcodec/rawdec: for 16-bit pix fmts, shift pixels when bits_per_coded_sample < 16
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/rawdec.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index e1682e399e..5448b47bd3 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -41,6 +41,7 @@ typedef struct RawVideoContext { int flip; int is_2_4_bpp; // 2 or 4 bpp raw in avi/mov int is_yuv2; + int is_lt_16bpp; // 16bpp pixfmt and bits_per_coded_sample < 16 int tff; } RawVideoContext; @@ -142,6 +143,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) FFALIGN(avctx->width, 16), avctx->height); } else { + context->is_lt_16bpp = av_get_bits_per_pixel(desc) == 16 && avctx->bits_per_coded_sample && avctx->bits_per_coded_sample < 16; context->frame_size = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); } @@ -175,7 +177,7 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, int buf_size = avpkt->size; int linesize_align = 4; int res, len; - int need_copy = !avpkt->buf || context->is_2_4_bpp || context->is_yuv2; + int need_copy = !avpkt->buf || context->is_2_4_bpp || context->is_yuv2 || context->is_lt_16bpp; AVFrame *frame = data; AVPicture *picture = data; @@ -240,6 +242,19 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, return AVERROR(EINVAL); } + if (context->is_lt_16bpp) { + int i; + uint8_t *dst = frame->buf[0]->data; + if (desc->flags & AV_PIX_FMT_FLAG_BE) { + for (i = 0; i + 1 < buf_size; i += 2) + AV_WB16(dst + i, AV_RB16(buf + i) << (16 - avctx->bits_per_coded_sample)); + } else { + for (i = 0; i + 1 < buf_size; i += 2) + AV_WL16(dst + i, AV_RL16(buf + i) << (16 - avctx->bits_per_coded_sample)); + } + buf = dst; + } + if ((res = avpicture_fill(picture, buf, avctx->pix_fmt, avctx->width, avctx->height)) < 0) { av_buffer_unref(&frame->buf[0]); |