* 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
+#if CONFIG_ZLIB
#include <zlib.h>
#endif
#include "bytestream.h"
#include "tiff.h"
#include "rle.h"
+#include "lzw.h"
+#include "put_bits.h"
#define TIFF_MAX_ENTRY 32
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 flip)
{
int i;
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
flip ^= ((int[]) {0, 0, 0, 1, 3, 3})[type];
#endif
for (i = 0; i < n * type_sizes2[type]; i++)
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 ? &w : &dw);
+ add_entry(s, tag, type, 1, type == TIFF_SHORT ? (void *)&w : (void *)&dw);
}
/**
{
switch (compr) {
-#ifdef CONFIG_ZLIB
+#if CONFIG_ZLIB
case TIFF_DEFLATE:
case TIFF_ADOBE_DEFLATE:
{
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);
+ case TIFF_LZW:
+ return ff_lzw_encode(s->lzws, src, n);
default:
return -1;
}
uint8_t *yuv_line = NULL;
int shift_h, shift_v;
+ s->avctx = avctx;
s->buf_start = buf;
s->buf = &ptr;
s->buf_size = buf_size;
*p = *pict;
- p->pict_type = FF_I_TYPE;
+ p->pict_type = AV_PICTURE_TYPE_I;
p->key_frame = 1;
+ avctx->coded_frame= &s->picture;
s->compr = TIFF_PACKBITS;
if (avctx->compression_level == 0) {
s->compr = TIFF_RAW;
-#ifdef CONFIG_ZLIB
- } else if ((avctx->compression_level > 2)) {
+ } else if(avctx->compression_level == 2) {
+ s->compr = TIFF_LZW;
+#if CONFIG_ZLIB
+ } else if ((avctx->compression_level >= 3)) {
s->compr = TIFF_DEFLATE;
#endif
}
return -1;
}
if (!is_yuv)
- s->bpp_tab_size = (s->bpp >> 3);
+ s->bpp_tab_size = (s->bpp >> 3);
- if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE)
+ if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE || s->compr == TIFF_LZW)
//best choose for DEFLATE
s->rps = s->height;
else
}
}
-#ifdef CONFIG_ZLIB
+#if CONFIG_ZLIB
if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE) {
uint8_t *zbuf;
int zlen, zn;
j += s->subsampling[1] - 1;
}
else
- memcpy(zbuf + j * bytes_per_row,
- p->data[0] + j * p->linesize[0], bytes_per_row);
+ 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);
} 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, FF_LZW_TIFF, put_bits);
+ }
strip_offsets[i / s->rps] = ptr - buf;
}
if (is_yuv){
}
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, flush_put_bits);
+ strip_sizes[(i / s->rps )] += ret ;
+ ptr += ret;
+ }
}
+ if(s->compr == TIFF_LZW)
+ av_free(s->lzws);
}
s->num_entries = 0;
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);
return ret;
}
-AVCodec tiff_encoder = {
- "tiff",
- CODEC_TYPE_VIDEO,
- CODEC_ID_TIFF,
- sizeof(TiffEncoderContext),
- NULL,
- encode_frame,
- NULL,
- NULL,
- 0,
- NULL,
+AVCodec ff_tiff_encoder = {
+ .name = "tiff",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_TIFF,
+ .priv_data_size = sizeof(TiffEncoderContext),
+ .encode = encode_frame,
.pix_fmts =
- (enum PixelFormat[]) {PIX_FMT_RGB24, PIX_FMT_PAL8, PIX_FMT_GRAY8,
+ (const 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
- -1}
-
+ PIX_FMT_YUV411P,
+ PIX_FMT_NONE},
+ .long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
};
projects / ffmpeg / blobdiff