diff options
| author | Alex Converse <alex.converse@gmail.com> | 2012-09-18 16:45:09 -0700 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2012-09-19 11:05:36 -0700 |
| commit | 298ed797e1f9b71d154d34d19177a2c8bef587e1 (patch) | |
| tree | d91a44ac0bbb075b98a622b08e26fce57f6b280f | |
| parent | 8701f4f8e8a7aa71c39f0917472d22bf6a1f0f43 (diff) | |
| download | ffmpeg-298ed797e1f9b71d154d34d19177a2c8bef587e1.tar.gz | |
tiffenc: Add support for little endian RGB48 and GRAY16
| -rw-r--r-- | libavcodec/tiffenc.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 1bf7adcd11..96a6f0b1f3 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -214,7 +214,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, uint32_t *strip_offsets = NULL; int bytes_per_row; uint32_t res[2] = { 72, 1 }; // image resolution (72/1) - static const uint16_t bpp_tab[] = { 8, 8, 8, 8 }; + uint16_t bpp_tab[] = { 8, 8, 8, 8 }; int ret; int is_yuv = 0; uint8_t *yuv_line = NULL; @@ -232,7 +232,22 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, s->subsampling[0] = 1; s->subsampling[1] = 1; + s->bpp_tab_size = 0; switch (avctx->pix_fmt) { + case PIX_FMT_RGB48LE: + s->bpp = 48; + s->photometric_interpretation = 2; + s->bpp_tab_size = 3; + for (i = 0; i < s->bpp_tab_size; i++) { + bpp_tab[i] = 16; + } + break; + case PIX_FMT_GRAY16LE: + s->bpp = 16; + s->photometric_interpretation = 1; + s->bpp_tab_size = 1; + bpp_tab[0] = 16; + break; case PIX_FMT_RGB24: s->bpp = 24; s->photometric_interpretation = 2; @@ -272,7 +287,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, "This colors format is not supported\n"); return -1; } - if (!is_yuv) + if (!s->bpp_tab_size) s->bpp_tab_size = (s->bpp >> 3); if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE || s->compr == TIFF_LZW) @@ -474,7 +489,8 @@ AVCodec ff_tiff_encoder = { .priv_data_size = sizeof(TiffEncoderContext), .encode2 = encode_frame, .pix_fmts = (const enum PixelFormat[]) { - PIX_FMT_RGB24, PIX_FMT_PAL8, PIX_FMT_GRAY8, + PIX_FMT_RGB24, PIX_FMT_RGB48LE, PIX_FMT_PAL8, + PIX_FMT_GRAY8, PIX_FMT_GRAY16LE, PIX_FMT_MONOBLACK, PIX_FMT_MONOWHITE, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_YUV410P, PIX_FMT_YUV411P, |