X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ftiffenc.c;h=4cbc51746d1ea2331154aae2b9e2863a0a71aeda;hb=17a63ff0cd187b9e50e4a47862750295976853b1;hp=1ec27efe207dcde40135b6f22901d6a6e7f09d00;hpb=e2d09b65e8166d6f3880bdf7195069e09d470a99;p=ffmpeg diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 1ec27efe207..4cbc51746d1 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -2,36 +2,43 @@ * TIFF image encoder * Copyright (c) 2007 Bartlomiej Wolowiec * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** + * @file * TIFF image encoder - * @file tiffenc.c * @author Bartlomiej Wolowiec */ -#include "avcodec.h" -#ifdef CONFIG_ZLIB + +#include "config.h" +#if CONFIG_ZLIB #include #endif + +#include "libavutil/log.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "avcodec.h" #include "bytestream.h" -#include "tiff.h" -#include "rle.h" #include "lzw.h" +#include "put_bits.h" +#include "rle.h" +#include "tiff.h" #define TIFF_MAX_ENTRY 32 @@ -41,26 +48,25 @@ static const uint8_t type_sizes2[6] = { }; typedef struct TiffEncoderContext { + AVClass *class; ///< for private options AVCodecContext *avctx; - AVFrame picture; - - int width; ///< picture width - int height; ///< picture height - unsigned int bpp; ///< bits per pixel - int compr; ///< compression level - int bpp_tab_size; ///< bpp_tab size - int photometric_interpretation; ///< photometric interpretation - int strips; ///< number of strips - int rps; ///< row per strip - uint8_t entries[TIFF_MAX_ENTRY*12]; ///< entires in header - int num_entries; ///< number of entires - uint8_t **buf; ///< actual position in buffer - uint8_t *buf_start; ///< pointer to first byte in buffer - int buf_size; ///< buffer size - uint16_t subsampling[2]; ///< YUV subsampling factors - struct LZWEncodeState *lzws; ///< LZW Encode state -} TiffEncoderContext; + int width; ///< picture width + int height; ///< picture height + unsigned int bpp; ///< bits per pixel + int compr; ///< compression level + int bpp_tab_size; ///< bpp_tab size + int photometric_interpretation; ///< photometric interpretation + int strips; ///< number of strips + int rps; ///< row per strip + uint8_t entries[TIFF_MAX_ENTRY * 12]; ///< entries in header + int num_entries; ///< number of entries + uint8_t **buf; ///< actual position in buffer + uint8_t *buf_start; ///< pointer to first byte in buffer + int buf_size; ///< buffer size + uint16_t subsampling[2]; ///< YUV subsampling factors + struct LZWEncodeState *lzws; ///< LZW encode state +} TiffEncoderContext; /** * Check free space in buffer @@ -68,7 +74,7 @@ typedef struct TiffEncoderContext { * @param need Needed bytes * @return 0 - ok, 1 - no free space */ -inline static int check_size(TiffEncoderContext * s, uint64_t need) +static inline int check_size(TiffEncoderContext *s, uint64_t need) { if (s->buf_size < *s->buf - s->buf_start + need) { *s->buf = s->buf_start + s->buf_size + 1; @@ -87,12 +93,12 @@ inline static int check_size(TiffEncoderContext * s, uint64_t need) * @param type Type of values * @param flip =0 - normal copy, >0 - flip */ -static void tnput(uint8_t ** p, int n, const uint8_t * val, enum TiffTypes type, +static void tnput(uint8_t **p, int n, const uint8_t *val, enum TiffTypes type, int flip) { int i; -#ifdef WORDS_BIGENDIAN - flip ^= ((int[]) {0, 0, 0, 1, 3, 3})[type]; +#if HAVE_BIGENDIAN + flip ^= ((int[]) { 0, 0, 0, 1, 3, 3 })[type]; #endif for (i = 0; i < n * type_sizes2[type]; i++) *(*p)++ = val[i ^ flip]; @@ -106,9 +112,8 @@ static void tnput(uint8_t ** p, int n, const uint8_t * val, enum TiffTypes type, * @param count The number of values * @param ptr_val Pointer to values */ -static void add_entry(TiffEncoderContext * s, - enum TiffTags tag, enum TiffTypes type, int count, - const void *ptr_val) +static void add_entry(TiffEncoderContext *s, enum TiffTags tag, + enum TiffTypes type, int count, const void *ptr_val) { uint8_t *entries_ptr = s->entries + 12 * s->num_entries; @@ -129,10 +134,11 @@ static void add_entry(TiffEncoderContext * s, s->num_entries++; } -static void add_entry1(TiffEncoderContext * s, - enum TiffTags tag, enum TiffTypes type, int val){ - uint16_t w = val; - uint32_t dw= val; +static void add_entry1(TiffEncoderContext *s, + enum TiffTags tag, enum TiffTypes type, int val) +{ + uint16_t w = val; + uint32_t dw = val; add_entry(s, tag, type, 1, type == TIFF_SHORT ? (void *)&w : (void *)&dw); } @@ -146,22 +152,21 @@ static void add_entry1(TiffEncoderContext * s, * @param compr Compression method * @return Number of output bytes. If an output error is encountered, -1 returned */ -static int encode_strip(TiffEncoderContext * s, const int8_t * src, - uint8_t * dst, int n, int compr) +static int encode_strip(TiffEncoderContext *s, const int8_t *src, + uint8_t *dst, int n, int compr) { - switch (compr) { -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB case TIFF_DEFLATE: case TIFF_ADOBE_DEFLATE: - { - unsigned long zlen = s->buf_size - (*s->buf - s->buf_start); - if (compress(dst, &zlen, src, n) != Z_OK) { - av_log(s->avctx, AV_LOG_ERROR, "Compressing failed\n"); - return -1; - } - return zlen; + { + unsigned long zlen = s->buf_size - (*s->buf - s->buf_start); + if (compress(dst, &zlen, src, n) != Z_OK) { + av_log(s->avctx, AV_LOG_ERROR, "Compressing failed\n"); + return -1; } + return zlen; + } #endif case TIFF_RAW: if (check_size(s, n)) @@ -169,7 +174,8 @@ static int encode_strip(TiffEncoderContext * s, const int8_t * src, memcpy(dst, src, n); return n; case TIFF_PACKBITS: - return ff_rle_encode(dst, s->buf_size - (*s->buf - s->buf_start), src, 1, n, 2, 0xff, -1, 0); + return ff_rle_encode(dst, s->buf_size - (*s->buf - s->buf_start), + src, 1, n, 2, 0xff, -1, 0); case TIFF_LZW: return ff_lzw_encode(s->lzws, src, n); default: @@ -177,14 +183,14 @@ static int encode_strip(TiffEncoderContext * s, const int8_t * src, } } -static void pack_yuv(TiffEncoderContext * s, uint8_t * dst, int lnum) +static void pack_yuv(TiffEncoderContext *s, const AVFrame *p, + uint8_t *dst, int lnum) { - AVFrame *p = &s->picture; int i, j, k; - int w = (s->width - 1) / s->subsampling[0] + 1; + int w = (s->width - 1) / s->subsampling[0] + 1; uint8_t *pu = &p->data[1][lnum / s->subsampling[1] * p->linesize[1]]; uint8_t *pv = &p->data[2][lnum / s->subsampling[1] * p->linesize[2]]; - for (i = 0; i < w; i++){ + for (i = 0; i < w; i++) { for (j = 0; j < s->subsampling[1]; j++) for (k = 0; k < s->subsampling[0]; k++) *dst++ = p->data[0][(lnum + j) * p->linesize[0] + @@ -194,104 +200,105 @@ static void pack_yuv(TiffEncoderContext * s, uint8_t * dst, int lnum) } } -static int encode_frame(AVCodecContext * avctx, unsigned char *buf, - int buf_size, void *data) +static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *pict, int *got_packet) { TiffEncoderContext *s = avctx->priv_data; - AVFrame *pict = data; - AVFrame *const p = (AVFrame *) & s->picture; + const AVFrame *const p = pict; int i; - int n; - uint8_t *ptr = buf; + uint8_t *ptr; uint8_t *offset; uint32_t strips; - uint32_t *strip_sizes = NULL; + uint32_t *strip_sizes = NULL; 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 }; - int ret = -1; + uint32_t res[2] = { 72, 1 }; // image resolution (72/1) + uint16_t bpp_tab[] = { 8, 8, 8, 8 }; + int ret; int is_yuv = 0; uint8_t *yuv_line = NULL; int shift_h, shift_v; + const AVPixFmtDescriptor *pfd; - s->buf_start = buf; - s->buf = &ptr; - s->buf_size = buf_size; - - *p = *pict; - p->pict_type = FF_I_TYPE; - p->key_frame = 1; - avctx->coded_frame= &s->picture; - - s->compr = TIFF_PACKBITS; - if (avctx->compression_level == 0) { - s->compr = TIFF_RAW; - } else if(avctx->compression_level == 2) { - s->compr = TIFF_LZW; -#ifdef CONFIG_ZLIB - } else if ((avctx->compression_level >= 3)) { - s->compr = TIFF_DEFLATE; -#endif - } + s->avctx = avctx; - s->width = avctx->width; - s->height = avctx->height; + s->width = avctx->width; + s->height = avctx->height; s->subsampling[0] = 1; s->subsampling[1] = 1; switch (avctx->pix_fmt) { - case PIX_FMT_RGB24: - s->bpp = 24; - s->photometric_interpretation = 2; - break; - case PIX_FMT_GRAY8: - s->bpp = 8; - s->photometric_interpretation = 1; - break; - case PIX_FMT_PAL8: - s->bpp = 8; - s->photometric_interpretation = 3; + case AV_PIX_FMT_RGB48LE: + case AV_PIX_FMT_GRAY16LE: + case AV_PIX_FMT_RGB24: + case AV_PIX_FMT_GRAY8: + case AV_PIX_FMT_PAL8: + pfd = av_pix_fmt_desc_get(avctx->pix_fmt); + s->bpp = av_get_bits_per_pixel(pfd); + if (pfd->flags & AV_PIX_FMT_FLAG_PAL) + s->photometric_interpretation = 3; + else if (pfd->flags & AV_PIX_FMT_FLAG_RGB) + s->photometric_interpretation = 2; + else + s->photometric_interpretation = 1; + s->bpp_tab_size = pfd->nb_components; + for (i = 0; i < s->bpp_tab_size; i++) + bpp_tab[i] = s->bpp / s->bpp_tab_size; break; - case PIX_FMT_MONOBLACK: - s->bpp = 1; + case AV_PIX_FMT_MONOBLACK: + s->bpp = 1; s->photometric_interpretation = 1; + s->bpp_tab_size = 0; break; - case PIX_FMT_MONOWHITE: - s->bpp = 1; + case AV_PIX_FMT_MONOWHITE: + s->bpp = 1; s->photometric_interpretation = 0; + s->bpp_tab_size = 0; break; - case PIX_FMT_YUV420P: - case PIX_FMT_YUV422P: - case PIX_FMT_YUV444P: - case PIX_FMT_YUV410P: - case PIX_FMT_YUV411P: + case AV_PIX_FMT_YUV420P: + case AV_PIX_FMT_YUV422P: + case AV_PIX_FMT_YUV444P: + case AV_PIX_FMT_YUV410P: + case AV_PIX_FMT_YUV411P: + av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v); s->photometric_interpretation = 6; - avcodec_get_chroma_sub_sample(avctx->pix_fmt, - &shift_h, &shift_v); - s->bpp = 8 + (16 >> (shift_h + shift_v)); - s->subsampling[0] = 1 << shift_h; - s->subsampling[1] = 1 << shift_v; - s->bpp_tab_size = 3; - is_yuv = 1; + s->bpp = 8 + (16 >> (shift_h + shift_v)); + s->subsampling[0] = 1 << shift_h; + s->subsampling[1] = 1 << shift_v; + s->bpp_tab_size = 3; + is_yuv = 1; break; default: av_log(s->avctx, AV_LOG_ERROR, "This colors format is not supported\n"); return -1; } - if (!is_yuv) - s->bpp_tab_size = (s->bpp >> 3); - if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE || s->compr == TIFF_LZW) - //best choose for DEFLATE + if (s->compr == TIFF_DEFLATE || + s->compr == TIFF_ADOBE_DEFLATE || + s->compr == TIFF_LZW) + // best choice for DEFLATE s->rps = s->height; else - s->rps = FFMAX(8192 / (((s->width * s->bpp) >> 3) + 1), 1); // suggest size of strip - s->rps = ((s->rps - 1) / s->subsampling[1] + 1) * s->subsampling[1]; // round rps up + // suggest size of strip + s->rps = FFMAX(8192 / (((s->width * s->bpp) >> 3) + 1), 1); + // round rps up + s->rps = ((s->rps - 1) / s->subsampling[1] + 1) * s->subsampling[1]; strips = (s->height - 1) / s->rps + 1; + if (!pkt->data && + (ret = av_new_packet(pkt, + avctx->width * avctx->height * s->bpp * 2 + + avctx->height * 4 + FF_MIN_BUFFER_SIZE)) < 0) { + av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); + return ret; + } + ptr = pkt->data; + s->buf_start = pkt->data; + s->buf = &ptr; + s->buf_size = pkt->size; + if (check_size(s, 8)) goto fail; @@ -302,20 +309,25 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf, offset = ptr; bytestream_put_le32(&ptr, 0); - strip_sizes = av_mallocz(sizeof(*strip_sizes) * strips); + strip_sizes = av_mallocz(sizeof(*strip_sizes) * strips); strip_offsets = av_mallocz(sizeof(*strip_offsets) * strips); + if (!strip_sizes || !strip_offsets) { + ret = AVERROR(ENOMEM); + goto fail; + } - bytes_per_row = (((s->width - 1)/s->subsampling[0] + 1) * s->bpp - * s->subsampling[0] * s->subsampling[1] + 7) >> 3; - if (is_yuv){ + bytes_per_row = (((s->width - 1) / s->subsampling[0] + 1) * s->bpp * + s->subsampling[0] * s->subsampling[1] + 7) >> 3; + if (is_yuv) { yuv_line = av_malloc(bytes_per_row); - if (yuv_line == NULL){ + if (yuv_line == NULL) { av_log(s->avctx, AV_LOG_ERROR, "Not enough memory\n"); + ret = AVERROR(ENOMEM); goto fail; } } -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE) { uint8_t *zbuf; int zlen, zn; @@ -323,115 +335,127 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf, zlen = bytes_per_row * s->rps; zbuf = av_malloc(zlen); - strip_offsets[0] = ptr - buf; - zn = 0; + if (!zbuf) { + ret = AVERROR(ENOMEM); + goto fail; + } + strip_offsets[0] = ptr - pkt->data; + zn = 0; for (j = 0; j < s->rps; j++) { - if (is_yuv){ - pack_yuv(s, yuv_line, j); + if (is_yuv) { + pack_yuv(s, p, yuv_line, j); memcpy(zbuf + zn, yuv_line, bytes_per_row); j += s->subsampling[1] - 1; - } - else + } else memcpy(zbuf + j * bytes_per_row, p->data[0] + j * p->linesize[0], bytes_per_row); zn += bytes_per_row; } - n = encode_strip(s, zbuf, ptr, zn, s->compr); + ret = encode_strip(s, zbuf, ptr, zn, s->compr); av_free(zbuf); - if (n<0) { + if (ret < 0) { av_log(s->avctx, AV_LOG_ERROR, "Encode strip failed\n"); goto fail; } - ptr += n; - strip_sizes[0] = ptr - buf - strip_offsets[0]; + ptr += ret; + strip_sizes[0] = ptr - pkt->data - strip_offsets[0]; } else #endif - { - if(s->compr == TIFF_LZW) - s->lzws = av_malloc(ff_lzw_encode_state_size); - for (i = 0; i < s->height; i++) { - if (strip_sizes[i / s->rps] == 0) { - if(s->compr == TIFF_LZW){ - ff_lzw_encode_init(s->lzws, ptr, s->buf_size - (*s->buf - s->buf_start), 12); - } - strip_offsets[i / s->rps] = ptr - buf; - } - if (is_yuv){ - pack_yuv(s, yuv_line, i); - n = encode_strip(s, yuv_line, ptr, bytes_per_row, s->compr); - i += s->subsampling[1] - 1; - } - else - n = encode_strip(s, p->data[0] + i * p->linesize[0], - ptr, bytes_per_row, s->compr); - if (n < 0) { - av_log(s->avctx, AV_LOG_ERROR, "Encode strip failed\n"); - goto fail; - } - strip_sizes[i / s->rps] += n; - ptr += n; - if(s->compr == TIFF_LZW && (i==s->height-1 || i%s->rps == s->rps-1)){ - int ret; - ret = ff_lzw_encode_flush(s->lzws); - strip_sizes[(i / s->rps )] += ret ; - ptr += ret; + if (s->compr == TIFF_LZW) { + s->lzws = av_malloc(ff_lzw_encode_state_size); + if (!s->lzws) { + ret = AVERROR(ENOMEM); + goto fail; + } + } + for (i = 0; i < s->height; i++) { + if (strip_sizes[i / s->rps] == 0) { + if (s->compr == TIFF_LZW) { + ff_lzw_encode_init(s->lzws, ptr, + s->buf_size - (*s->buf - s->buf_start), + 12, FF_LZW_TIFF, put_bits); } + strip_offsets[i / s->rps] = ptr - pkt->data; + } + if (is_yuv) { + pack_yuv(s, p, yuv_line, i); + ret = encode_strip(s, yuv_line, ptr, bytes_per_row, s->compr); + i += s->subsampling[1] - 1; + } else + ret = encode_strip(s, p->data[0] + i * p->linesize[0], + ptr, bytes_per_row, s->compr); + if (ret < 0) { + av_log(s->avctx, AV_LOG_ERROR, "Encode strip failed\n"); + goto fail; + } + strip_sizes[i / s->rps] += ret; + ptr += ret; + if (s->compr == TIFF_LZW && + (i == s->height - 1 || i % s->rps == s->rps - 1)) { + ret = ff_lzw_encode_flush(s->lzws, flush_put_bits); + strip_sizes[(i / s->rps)] += ret; + ptr += ret; } - if(s->compr == TIFF_LZW) - av_free(s->lzws); } + if (s->compr == TIFF_LZW) + av_free(s->lzws); s->num_entries = 0; - add_entry1(s,TIFF_SUBFILE, TIFF_LONG, 0); - add_entry1(s,TIFF_WIDTH, TIFF_LONG, s->width); - add_entry1(s,TIFF_HEIGHT, TIFF_LONG, s->height); + add_entry1(s, TIFF_SUBFILE, TIFF_LONG, 0); + add_entry1(s, TIFF_WIDTH, TIFF_LONG, s->width); + add_entry1(s, TIFF_HEIGHT, TIFF_LONG, s->height); if (s->bpp_tab_size) - add_entry(s, TIFF_BPP, TIFF_SHORT, s->bpp_tab_size, bpp_tab); + add_entry(s, TIFF_BPP, TIFF_SHORT, s->bpp_tab_size, bpp_tab); - add_entry1(s,TIFF_COMPR, TIFF_SHORT, s->compr); - add_entry1(s,TIFF_INVERT, TIFF_SHORT, s->photometric_interpretation); - add_entry(s, TIFF_STRIP_OFFS, TIFF_LONG, strips, strip_offsets); + add_entry1(s, TIFF_COMPR, TIFF_SHORT, s->compr); + add_entry1(s, TIFF_INVERT, TIFF_SHORT, s->photometric_interpretation); + add_entry(s, TIFF_STRIP_OFFS, TIFF_LONG, strips, strip_offsets); if (s->bpp_tab_size) - add_entry1(s,TIFF_SAMPLES_PER_PIXEL, TIFF_SHORT, s->bpp_tab_size); + add_entry1(s, TIFF_SAMPLES_PER_PIXEL, TIFF_SHORT, s->bpp_tab_size); - add_entry1(s,TIFF_ROWSPERSTRIP, TIFF_LONG, s->rps); - add_entry(s, TIFF_STRIP_SIZE, TIFF_LONG, strips, strip_sizes); - add_entry(s, TIFF_XRES, TIFF_RATIONAL, 1, res); - add_entry(s, TIFF_YRES, TIFF_RATIONAL, 1, res); - add_entry1(s,TIFF_RES_UNIT, TIFF_SHORT, 2); + add_entry1(s, TIFF_ROWSPERSTRIP, TIFF_LONG, s->rps); + add_entry(s, TIFF_STRIP_SIZE, TIFF_LONG, strips, strip_sizes); + add_entry(s, TIFF_XRES, TIFF_RATIONAL, 1, res); + add_entry(s, TIFF_YRES, TIFF_RATIONAL, 1, res); + add_entry1(s, TIFF_RES_UNIT, TIFF_SHORT, 2); - if(!(avctx->flags & CODEC_FLAG_BITEXACT)) - add_entry(s, TIFF_SOFTWARE_NAME, TIFF_STRING, - strlen(LIBAVCODEC_IDENT) + 1, LIBAVCODEC_IDENT); + if (!(avctx->flags & CODEC_FLAG_BITEXACT)) + add_entry(s, TIFF_SOFTWARE_NAME, TIFF_STRING, + strlen(LIBAVCODEC_IDENT) + 1, LIBAVCODEC_IDENT); - if (avctx->pix_fmt == PIX_FMT_PAL8) { + if (avctx->pix_fmt == AV_PIX_FMT_PAL8) { uint16_t pal[256 * 3]; for (i = 0; i < 256; i++) { uint32_t rgb = *(uint32_t *) (p->data[1] + i * 4); pal[i] = ((rgb >> 16) & 0xff) * 257; - pal[i + 256] = ((rgb >> 8 ) & 0xff) * 257; - pal[i + 512] = ( rgb & 0xff) * 257; + pal[i + 256] = ((rgb >> 8) & 0xff) * 257; + pal[i + 512] = (rgb & 0xff) * 257; } add_entry(s, TIFF_PAL, TIFF_SHORT, 256 * 3, pal); } - if (is_yuv){ + if (is_yuv) { /** according to CCIR Recommendation 601.1 */ - uint32_t refbw[12] = {15, 1, 235, 1, 128, 1, 240, 1, 128, 1, 240, 1}; + uint32_t refbw[12] = { 15, 1, 235, 1, 128, 1, 240, 1, 128, 1, 240, 1 }; add_entry(s, TIFF_YCBCR_SUBSAMPLING, TIFF_SHORT, 2, s->subsampling); add_entry(s, TIFF_REFERENCE_BW, TIFF_RATIONAL, 6, refbw); } - bytestream_put_le32(&offset, ptr - buf); // write offset to dir + // write offset to dir + bytestream_put_le32(&offset, ptr - pkt->data); - if (check_size(s, 6 + s->num_entries * 12)) + if (check_size(s, 6 + s->num_entries * 12)) { + ret = AVERROR(EINVAL); goto fail; + } bytestream_put_le16(&ptr, s->num_entries); // write tag count bytestream_put_buffer(&ptr, s->entries, s->num_entries * 12); bytestream_put_le32(&ptr, 0); - ret = ptr - buf; + pkt->size = ptr - pkt->data; + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; fail: av_free(strip_sizes); @@ -440,23 +464,60 @@ fail: return ret; } -AVCodec tiff_encoder = { - "tiff", - CODEC_TYPE_VIDEO, - CODEC_ID_TIFF, - sizeof(TiffEncoderContext), - NULL, - encode_frame, - NULL, - NULL, - 0, - NULL, - .pix_fmts = - (enum PixelFormat[]) {PIX_FMT_RGB24, PIX_FMT_PAL8, PIX_FMT_GRAY8, - PIX_FMT_MONOBLACK, PIX_FMT_MONOWHITE, - PIX_FMT_YUV420P, PIX_FMT_YUV422P, - PIX_FMT_YUV444P, PIX_FMT_YUV410P, - PIX_FMT_YUV411P, - PIX_FMT_NONE}, - .long_name = "TIFF image", +static av_cold int encode_init(AVCodecContext *avctx) +{ + avctx->coded_frame = av_frame_alloc(); + if (!avctx->coded_frame) + return AVERROR(ENOMEM); + + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; + avctx->coded_frame->key_frame = 1; + + return 0; +} + +static av_cold int encode_close(AVCodecContext *avctx) +{ + av_frame_free(&avctx->coded_frame); + return 0; +} + +#define OFFSET(x) offsetof(TiffEncoderContext, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM +static const AVOption options[] = { + { "compression_algo", NULL, OFFSET(compr), AV_OPT_TYPE_INT, { .i64 = TIFF_PACKBITS }, TIFF_RAW, TIFF_DEFLATE, VE, "compression_algo" }, + { "packbits", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_PACKBITS }, 0, 0, VE, "compression_algo" }, + { "raw", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_RAW }, 0, 0, VE, "compression_algo" }, + { "lzw", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_LZW }, 0, 0, VE, "compression_algo" }, +#if CONFIG_ZLIB + { "deflate", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_DEFLATE }, 0, 0, VE, "compression_algo" }, +#endif + { NULL }, +}; + +static const AVClass tiffenc_class = { + .class_name = "TIFF encoder", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVCodec ff_tiff_encoder = { + .name = "tiff", + .long_name = NULL_IF_CONFIG_SMALL("TIFF image"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_TIFF, + .priv_data_size = sizeof(TiffEncoderContext), + .init = encode_init, + .close = encode_close, + .encode2 = encode_frame, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48LE, AV_PIX_FMT_PAL8, + AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16LE, + AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_MONOWHITE, + AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, + AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, + AV_PIX_FMT_NONE + }, + .priv_class = &tiffenc_class, };