History

tiff: support encoding and decoding 64bit images

Carl Eugen Hoyos committed 11 years ago

Commit 3a3790b1 parent 59f02753 files · +10 −4Browse files

Unified · Split

3 files
  1. libavcodec/tiff.c +7 −2
  2. libavcodec/tiffenc.c +2 −1
  3. libavcodec/version.h +1 −1
libavcodec/tiff.c+7−2
@@ -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));
libavcodec/tiffenc.c+2−1
@@ -246,6 +246,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, · 245 unmodified lines
246 s->subsampling[1] = 1;246 s->subsampling[1] = 1;
247 247
248 switch (avctx->pix_fmt) {248 switch (avctx->pix_fmt) {
249 case AV_PIX_FMT_RGBA64LE:
249 case AV_PIX_FMT_RGB48LE:250 case AV_PIX_FMT_RGB48LE:
250 case AV_PIX_FMT_GRAY16LE:251 case AV_PIX_FMT_GRAY16LE:
251 case AV_PIX_FMT_RGBA:252 case AV_PIX_FMT_RGBA:
@@ -535,7 +536,7 @@ AVCodec ff_tiff_encoder = { · 283 unmodified lines
535 .encode2 = encode_frame,536 .encode2 = encode_frame,
536 .pix_fmts = (const enum AVPixelFormat[]) {537 .pix_fmts = (const enum AVPixelFormat[]) {
537 AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48LE, AV_PIX_FMT_PAL8,538 AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48LE, AV_PIX_FMT_PAL8,
538 AV_PIX_FMT_RGBA,539 AV_PIX_FMT_RGBA, AV_PIX_FMT_RGBA64LE,
539 AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16LE,540 AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16LE,
540 AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_MONOWHITE,541 AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_MONOWHITE,
541 AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P,542 AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P,
libavcodec/version.h+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
30 30
31#define LIBAVCODEC_VERSION_MAJOR 5631#define LIBAVCODEC_VERSION_MAJOR 56
32#define LIBAVCODEC_VERSION_MINOR 632#define LIBAVCODEC_VERSION_MINOR 6
33#define LIBAVCODEC_VERSION_MICRO 033#define LIBAVCODEC_VERSION_MICRO 1
34 34
35#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \35#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
36 LIBAVCODEC_VERSION_MINOR, \36 LIBAVCODEC_VERSION_MINOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t