| @@ -273,6 +273,9 @@ static int init_image(TiffContext *s, AVFrame *frame) · 272 unmodified lines |
| 273 | case 483: | 273 | case 483: |
| 274 | s->avctx->pix_fmt = s->le ? AV_PIX_FMT_RGB48LE : AV_PIX_FMT_RGB48BE; | 274 | s->avctx->pix_fmt = s->le ? AV_PIX_FMT_RGB48LE : AV_PIX_FMT_RGB48BE; |
| 275 | break; | 275 | break; |
| | 276 | case 644: |
| | 277 | s->avctx->pix_fmt = s->le ? AV_PIX_FMT_RGBA64LE : AV_PIX_FMT_RGBA64BE; |
| | 278 | break; |
| 276 | default: | 279 | default: |
| 277 | av_log(s->avctx, AV_LOG_ERROR, | 280 | av_log(s->avctx, AV_LOG_ERROR, |
| 278 | "This format is not supported (bpp=%d, bppcount=%d)\n", | 281 | "This format is not supported (bpp=%d, bppcount=%d)\n", |
| @@ -636,13 +639,15 @@ static int decode_frame(AVCodecContext *avctx, · 357 unmodified lines |
| 636 | dst = p->data[0]; | 639 | dst = p->data[0]; |
| 637 | soff = s->bpp >> 3; | 640 | soff = s->bpp >> 3; |
| 638 | ssize = s->width * soff; | 641 | ssize = s->width * soff; |
| 639 | if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE) { | 642 | if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE || |
| | 643 | s->avctx->pix_fmt == AV_PIX_FMT_RGBA64LE) { |
| 640 | for (i = 0; i < s->height; i++) { | 644 | for (i = 0; i < s->height; i++) { |
| 641 | for (j = soff; j < ssize; j += 2) | 645 | for (j = soff; j < ssize; j += 2) |
| 642 | AV_WL16(dst + j, AV_RL16(dst + j) + AV_RL16(dst + j - soff)); | 646 | AV_WL16(dst + j, AV_RL16(dst + j) + AV_RL16(dst + j - soff)); |
| 643 | dst += stride; | 647 | dst += stride; |
| 644 | } | 648 | } |
| 645 | } else if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48BE) { | 649 | } else if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48BE || |
| | 650 | s->avctx->pix_fmt == AV_PIX_FMT_RGBA64BE) { |
| 646 | for (i = 0; i < s->height; i++) { | 651 | for (i = 0; i < s->height; i++) { |
| 647 | for (j = soff; j < ssize; j += 2) | 652 | for (j = soff; j < ssize; j += 2) |
| 648 | AV_WB16(dst + j, AV_RB16(dst + j) + AV_RB16(dst + j - soff)); | 653 | AV_WB16(dst + j, AV_RB16(dst + j) + AV_RB16(dst + j - soff)); |