From e75ef2b7f48b96a9b6c8646058713899d5ea5731 Mon Sep 17 00:00:00 2001 From: Jean First Date: Sun, 25 Sep 2011 16:00:04 +0200 Subject: [PATCH] tiffdec: support predictor type 2 with RGB48 pixel format --- libavcodec/tiff.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index d801302704..6c72dc8293 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -635,10 +635,24 @@ static int decode_frame(AVCodecContext *avctx, dst = p->data[0]; soff = s->bpp >> 3; ssize = s->width * soff; - for (i = 0; i < s->height; i++) { - for (j = soff; j < ssize; j++) - dst[j] += dst[j - soff]; - dst += stride; + if (s->avctx->pix_fmt == PIX_FMT_RGB48LE) { + for (i = 0; i < s->height; i++) { + for (j = soff; j < ssize; j += 2) + AV_WL16(dst + j, AV_RL16(dst + j) + AV_RL16(dst + j - soff)); + dst += stride; + } + } else if (s->avctx->pix_fmt == PIX_FMT_RGB48BE) { + for (i = 0; i < s->height; i++) { + for (j = soff; j < ssize; j += 2) + AV_WB16(dst + j, AV_RB16(dst + j) + AV_RB16(dst + j - soff)); + dst += stride; + } + } else { + for (i = 0; i < s->height; i++) { + for (j = soff; j < ssize; j++) + dst[j] += dst[j - soff]; + dst += stride; + } } }