On 09/19/2012 01:20 PM, Alex Converse wrote:
> ---
> libavcodec/tiffenc.c | 22 +++++++++++++++++++---
> 1 files changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
> index 1bf7adc..96a6f0b 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,
LGTM
-Justin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
