[Ffmpeg-cvslog] r8608 - in trunk: Changelog doc/ffmpeg-doc.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/tiff.c libavcodec/tiff.h libavcodec/tiffenc.c
michael
subversion
Tue Apr 3 15:43:58 CEST 2007
Author: michael
Date: Tue Apr 3 15:43:57 2007
New Revision: 8608
Added:
trunk/libavcodec/tiff.h
- copied, changed from r8597, /trunk/libavcodec/tiff.c
trunk/libavcodec/tiffenc.c
Modified:
trunk/Changelog
trunk/doc/ffmpeg-doc.texi
trunk/libavcodec/Makefile
trunk/libavcodec/allcodecs.c
trunk/libavcodec/avcodec.h
trunk/libavcodec/tiff.c
Log:
tiff encoder by (Bartlomiej Wolowiec b.wolowiec students mimuw edu pl)
Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog (original)
+++ trunk/Changelog Tue Apr 3 15:43:57 2007
@@ -63,7 +63,7 @@ version <next>
- Delphine Software .cin demuxer/audio and video decoder
- Tiertex .seq demuxer/video decoder
- MTV demuxer
-- TIFF picture decoder
+- TIFF picture encoder and decoder
- GIF picture decoder
- Intel Music decoder
- Musepack decoder
Modified: trunk/doc/ffmpeg-doc.texi
==============================================================================
--- trunk/doc/ffmpeg-doc.texi (original)
+++ trunk/doc/ffmpeg-doc.texi Tue Apr 3 15:43:57 2007
@@ -922,7 +922,7 @@ following image formats are supported:
@item animated GIF @tab X @tab X @tab Only uncompressed GIFs are generated.
@item PNG @tab X @tab X @tab 2 bit and 4 bit/pixel not supported yet.
@item Targa @tab @tab X @tab Targa (.TGA) image format.
- at item TIFF @tab @tab X @tab Only 24 bit/pixel images are supported.
+ at item TIFF @tab X @tab X @tab YUV, JPEG and some extension is not supported yet.
@item SGI @tab X @tab X @tab SGI RGB image format
@end multitable
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile (original)
+++ trunk/libavcodec/Makefile Tue Apr 3 15:43:57 2007
@@ -144,6 +144,7 @@ OBJS-$(CONFIG_TARGA_ENCODER) +
OBJS-$(CONFIG_THEORA_DECODER) += vp3.o xiph.o
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o
+OBJS-$(CONFIG_TIFF_ENCODER) += tiffenc.o rle.o
OBJS-$(CONFIG_TRUEMOTION1_DECODER) += truemotion1.o
OBJS-$(CONFIG_TRUEMOTION2_DECODER) += truemotion2.o
OBJS-$(CONFIG_TRUESPEECH_DECODER) += truespeech.o
Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c (original)
+++ trunk/libavcodec/allcodecs.c Tue Apr 3 15:43:57 2007
@@ -132,7 +132,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(THEORA, theora);
REGISTER_DECODER(THP, thp);
REGISTER_DECODER(TIERTEXSEQVIDEO, tiertexseqvideo);
- REGISTER_DECODER(TIFF, tiff);
+ REGISTER_ENCDEC (TIFF, tiff);
REGISTER_DECODER(TRUEMOTION1, truemotion1);
REGISTER_DECODER(TRUEMOTION2, truemotion2);
REGISTER_DECODER(TSCC, tscc);
Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h (original)
+++ trunk/libavcodec/avcodec.h Tue Apr 3 15:43:57 2007
@@ -2222,6 +2222,7 @@ extern AVCodec sonic_encoder;
extern AVCodec sonic_ls_encoder;
extern AVCodec svq1_encoder;
extern AVCodec targa_encoder;
+extern AVCodec tiff_encoder;
extern AVCodec vcr1_encoder;
extern AVCodec vorbis_encoder;
extern AVCodec wmav1_encoder;
Modified: trunk/libavcodec/tiff.c
==============================================================================
--- trunk/libavcodec/tiff.c (original)
+++ trunk/libavcodec/tiff.c Tue Apr 3 15:43:57 2007
@@ -24,49 +24,8 @@
#include <zlib.h>
#endif
#include "lzw.h"
+#include "tiff.h"
-/* abridged list of TIFF tags */
-enum TiffTags{
- TIFF_WIDTH = 0x100,
- TIFF_HEIGHT,
- TIFF_BPP,
- TIFF_COMPR,
- TIFF_INVERT = 0x106,
- TIFF_STRIP_OFFS = 0x111,
- TIFF_ROWSPERSTRIP = 0x116,
- TIFF_STRIP_SIZE,
- TIFF_PLANAR = 0x11C,
- TIFF_XPOS = 0x11E,
- TIFF_YPOS = 0x11F,
- TIFF_PREDICTOR = 0x13D,
- TIFF_PAL = 0x140
-};
-
-enum TiffCompr{
- TIFF_RAW = 1,
- TIFF_CCITT_RLE,
- TIFF_G3,
- TIFF_G4,
- TIFF_LZW,
- TIFF_JPEG,
- TIFF_NEWJPEG,
- TIFF_ADOBE_DEFLATE,
- TIFF_PACKBITS = 0x8005,
- TIFF_DEFLATE = 0x80B2
-};
-
-enum TiffTypes{
- TIFF_BYTE = 1,
- TIFF_STRING,
- TIFF_SHORT,
- TIFF_LONG,
- TIFF_LONGLONG
-};
-
-/** sizes of various TIFF field types */
-static const int type_sizes[6] = {
- 0, 1, 100, 2, 4, 8
-};
typedef struct TiffContext {
AVCodecContext *avctx;
Copied: trunk/libavcodec/tiff.h (from r8597, /trunk/libavcodec/tiff.c)
==============================================================================
--- /trunk/libavcodec/tiff.c (original)
+++ trunk/libavcodec/tiff.h Tue Apr 3 15:43:57 2007
@@ -1,5 +1,5 @@
/*
- * TIFF image decoder
+ * TIFF tables
* Copyright (c) 2006 Konstantin Shishkov
*
* This file is part of FFmpeg.
@@ -19,27 +19,35 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
-#include "avcodec.h"
-#ifdef CONFIG_ZLIB
-#include <zlib.h>
-#endif
-#include "lzw.h"
+
+#ifndef TIFF_H
+#define TIFF_H
/* abridged list of TIFF tags */
enum TiffTags{
+ TIFF_SUBFILE = 0xfe,
TIFF_WIDTH = 0x100,
TIFF_HEIGHT,
TIFF_BPP,
TIFF_COMPR,
TIFF_INVERT = 0x106,
TIFF_STRIP_OFFS = 0x111,
+ TIFF_SAMPLES_PER_PIXEL = 0x115,
TIFF_ROWSPERSTRIP = 0x116,
TIFF_STRIP_SIZE,
+ TIFF_XRES = 0x11A,
+ TIFF_YRES = 0x11B,
TIFF_PLANAR = 0x11C,
TIFF_XPOS = 0x11E,
TIFF_YPOS = 0x11F,
+ TIFF_RES_UNIT = 0x128,
+ TIFF_SOFTWARE_NAME = 0x131,
TIFF_PREDICTOR = 0x13D,
- TIFF_PAL = 0x140
+ TIFF_PAL = 0x140,
+ TIFF_YCBCR_COEFFICIENTS = 0x211,
+ TIFF_YCBCR_SUBSAMPLING = 0x212,
+ TIFF_YCBCR_POSITIONING = 0x213,
+ TIFF_REFERENCE_BW = 0x214,
};
enum TiffCompr{
@@ -60,473 +68,12 @@ enum TiffTypes{
TIFF_STRING,
TIFF_SHORT,
TIFF_LONG,
- TIFF_LONGLONG
+ TIFF_RATIONAL,
};
-/** sizes of various TIFF field types */
-static const int type_sizes[6] = {
+/** sizes of various TIFF field types (string size = 100)*/
+static const uint8_t type_sizes[6] = {
0, 1, 100, 2, 4, 8
};
-typedef struct TiffContext {
- AVCodecContext *avctx;
- AVFrame picture;
-
- int width, height;
- unsigned int bpp;
- int le;
- int compr;
- int invert;
-
- int strips, rps;
- int sot;
- uint8_t* stripdata;
- uint8_t* stripsizes;
- int stripsize, stripoff;
- LZWState *lzw;
-} TiffContext;
-
-static int tget_short(uint8_t **p, int le){
- int v = le ? AV_RL16(*p) : AV_RB16(*p);
- *p += 2;
- return v;
-}
-
-static int tget_long(uint8_t **p, int le){
- int v = le ? AV_RL32(*p) : AV_RB32(*p);
- *p += 4;
- return v;
-}
-
-static int tget(uint8_t **p, int type, int le){
- switch(type){
- case TIFF_BYTE : return *(*p)++;
- case TIFF_SHORT: return tget_short(p, le);
- case TIFF_LONG : return tget_long (p, le);
- default : return -1;
- }
-}
-
-static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, uint8_t *src, int size, int lines){
- int c, line, pixels, code;
- uint8_t *ssrc = src;
- int width = s->width * (s->bpp / 8);
-#ifdef CONFIG_ZLIB
- uint8_t *zbuf; unsigned long outlen;
-
- if(s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE){
- outlen = width * lines;
- zbuf = av_malloc(outlen);
- if(uncompress(zbuf, &outlen, src, size) != Z_OK){
- av_log(s->avctx, AV_LOG_ERROR, "Uncompressing failed (%lu of %lu)\n", outlen, (unsigned long)width * lines);
- av_free(zbuf);
- return -1;
- }
- src = zbuf;
- for(line = 0; line < lines; line++){
- memcpy(dst, src, width);
- dst += stride;
- src += width;
- }
- av_free(zbuf);
- return 0;
- }
-#endif
- if(s->compr == TIFF_LZW){
- if(ff_lzw_decode_init(s->lzw, 8, src, size, FF_LZW_TIFF) < 0){
- av_log(s->avctx, AV_LOG_ERROR, "Error initializing LZW decoder\n");
- return -1;
- }
- }
- for(line = 0; line < lines; line++){
- if(src - ssrc > size){
- av_log(s->avctx, AV_LOG_ERROR, "Source data overread\n");
- return -1;
- }
- switch(s->compr){
- case TIFF_RAW:
- memcpy(dst, src, s->width * (s->bpp / 8));
- src += s->width * (s->bpp / 8);
- break;
- case TIFF_PACKBITS:
- for(pixels = 0; pixels < width;){
- code = (int8_t)*src++;
- if(code >= 0){
- code++;
- if(pixels + code > width){
- av_log(s->avctx, AV_LOG_ERROR, "Copy went out of bounds\n");
- return -1;
- }
- memcpy(dst + pixels, src, code);
- src += code;
- pixels += code;
- }else if(code != -128){ // -127..-1
- code = (-code) + 1;
- if(pixels + code > width){
- av_log(s->avctx, AV_LOG_ERROR, "Run went out of bounds\n");
- return -1;
- }
- c = *src++;
- memset(dst + pixels, c, code);
- pixels += code;
- }
- }
- break;
- case TIFF_LZW:
- pixels = ff_lzw_decode(s->lzw, dst, width);
- if(pixels < width){
- av_log(s->avctx, AV_LOG_ERROR, "Decoded only %i bytes of %i\n", pixels, width);
- return -1;
- }
- break;
- }
- dst += stride;
- }
- return 0;
-}
-
-
-static int tiff_decode_tag(TiffContext *s, uint8_t *start, uint8_t *buf, uint8_t *end_buf, AVFrame *pic)
-{
- int tag, type, count, off, value = 0;
- uint8_t *src, *dst;
- int i, j, ssize, soff, stride;
- int *pal, *rp, *gp, *bp;
-
- tag = tget_short(&buf, s->le);
- type = tget_short(&buf, s->le);
- count = tget_long(&buf, s->le);
- off = tget_long(&buf, s->le);
-
- if(count == 1){
- switch(type){
- case TIFF_BYTE:
- case TIFF_SHORT:
- buf -= 4;
- value = tget(&buf, type, s->le);
- buf = NULL;
- break;
- case TIFF_LONG:
- value = off;
- buf = NULL;
- break;
- default:
- value = -1;
- buf = start + off;
- }
- }else if(type_sizes[type] * count <= 4){
- buf -= 4;
- }else{
- buf = start + off;
- }
-
- if(buf && (buf < start || buf > end_buf)){
- av_log(s->avctx, AV_LOG_ERROR, "Tag referencing position outside the image\n");
- return -1;
- }
-
- switch(tag){
- case TIFF_WIDTH:
- s->width = value;
- break;
- case TIFF_HEIGHT:
- s->height = value;
- break;
- case TIFF_BPP:
- if(count == 1) s->bpp = value;
- else{
- switch(type){
- case TIFF_BYTE:
- s->bpp = (off & 0xFF) + ((off >> 8) & 0xFF) + ((off >> 16) & 0xFF) + ((off >> 24) & 0xFF);
- break;
- case TIFF_SHORT:
- case TIFF_LONG:
- s->bpp = 0;
- for(i = 0; i < count; i++) s->bpp += tget(&buf, type, s->le);
- break;
- default:
- s->bpp = -1;
- }
- }
- switch(s->bpp){
- case 8:
- s->avctx->pix_fmt = PIX_FMT_PAL8;
- break;
- case 24:
- s->avctx->pix_fmt = PIX_FMT_RGB24;
- break;
- case 16:
- if(count == 1){
- s->avctx->pix_fmt = PIX_FMT_GRAY16BE;
- }else{
- av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%i)\n", s->bpp);
- return -1;
- }
- break;
- default:
- av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%i)\n", s->bpp);
- return -1;
- }
- if(s->width != s->avctx->width || s->height != s->avctx->height){
- if(avcodec_check_dimensions(s->avctx, s->width, s->height))
- return -1;
- avcodec_set_dimensions(s->avctx, s->width, s->height);
- }
- if(s->picture.data[0])
- s->avctx->release_buffer(s->avctx, &s->picture);
- if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){
- av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
- }
- if(s->bpp == 8){
- /* make default grayscale pal */
- pal = s->picture.data[1];
- for(i = 0; i < 256; i++)
- pal[i] = i * 0x010101;
- }
- break;
- case TIFF_COMPR:
- s->compr = value;
- switch(s->compr){
- case TIFF_RAW:
- case TIFF_PACKBITS:
- case TIFF_LZW:
- break;
- case TIFF_DEFLATE:
- case TIFF_ADOBE_DEFLATE:
-#ifdef CONFIG_ZLIB
- break;
-#else
- av_log(s->avctx, AV_LOG_ERROR, "Deflate: ZLib not compiled in\n");
- return -1;
-#endif
- case TIFF_G3:
- av_log(s->avctx, AV_LOG_ERROR, "CCITT G3 compression is not supported\n");
- return -1;
- case TIFF_G4:
- av_log(s->avctx, AV_LOG_ERROR, "CCITT G4 compression is not supported\n");
- return -1;
- case TIFF_CCITT_RLE:
- av_log(s->avctx, AV_LOG_ERROR, "CCITT RLE compression is not supported\n");
- return -1;
- case TIFF_JPEG:
- case TIFF_NEWJPEG:
- av_log(s->avctx, AV_LOG_ERROR, "JPEG compression is not supported\n");
- return -1;
- default:
- av_log(s->avctx, AV_LOG_ERROR, "Unknown compression method %i\n", s->compr);
- return -1;
- }
- break;
- case TIFF_ROWSPERSTRIP:
- if(value < 1){
- av_log(s->avctx, AV_LOG_ERROR, "Incorrect value of rows per strip\n");
- return -1;
- }
- s->rps = value;
- break;
- case TIFF_STRIP_OFFS:
- if(count == 1){
- s->stripdata = NULL;
- s->stripoff = value;
- }else
- s->stripdata = start + off;
- s->strips = count;
- if(s->strips == 1) s->rps = s->height;
- s->sot = type;
- if(s->stripdata > end_buf){
- av_log(s->avctx, AV_LOG_ERROR, "Tag referencing position outside the image\n");
- return -1;
- }
- break;
- case TIFF_STRIP_SIZE:
- if(count == 1){
- s->stripsizes = NULL;
- s->stripsize = value;
- s->strips = 1;
- }else{
- s->stripsizes = start + off;
- }
- s->strips = count;
- if(s->stripsizes > end_buf){
- av_log(s->avctx, AV_LOG_ERROR, "Tag referencing position outside the image\n");
- return -1;
- }
- if(!pic->data[0]){
- av_log(s->avctx, AV_LOG_ERROR, "Picture initialization missing\n");
- return -1;
- }
- /* now we have the data and may start decoding */
- stride = pic->linesize[0];
- dst = pic->data[0];
- for(i = 0; i < s->height; i += s->rps){
- if(s->stripsizes)
- ssize = tget(&s->stripsizes, type, s->le);
- else
- ssize = s->stripsize;
-
- if(s->stripdata){
- soff = tget(&s->stripdata, s->sot, s->le);
- }else
- soff = s->stripoff;
- src = start + soff;
- if(tiff_unpack_strip(s, dst, stride, src, ssize, FFMIN(s->rps, s->height - i)) < 0)
- break;
- dst += s->rps * stride;
- }
- break;
- case TIFF_PREDICTOR:
- if(!pic->data[0]){
- av_log(s->avctx, AV_LOG_ERROR, "Picture initialization missing\n");
- return -1;
- }
- if(value == 2){
- src = pic->data[0];
- stride = pic->linesize[0];
- soff = s->bpp >> 3;
- ssize = s->width * soff;
- for(i = 0; i < s->height; i++) {
- for(j = soff; j < ssize; j++)
- src[j] += src[j - soff];
- src += stride;
- }
- }
- break;
- case TIFF_INVERT:
- switch(value){
- case 0:
- s->invert = 1;
- break;
- case 1:
- s->invert = 0;
- break;
- case 2:
- case 3:
- break;
- default:
- av_log(s->avctx, AV_LOG_ERROR, "Color mode %d is not supported\n", value);
- return -1;
- }
- break;
- case TIFF_PAL:
- if(s->avctx->pix_fmt != PIX_FMT_PAL8){
- av_log(s->avctx, AV_LOG_ERROR, "Palette met but this is not palettized format\n");
- return -1;
- }
- pal = s->picture.data[1];
- off = type_sizes[type];
- rp = buf;
- gp = buf + count / 3 * off;
- bp = buf + count / 3 * off * 2;
- off = (type_sizes[type] - 1) << 3;
- for(i = 0; i < count / 3; i++){
- j = (tget(&rp, type, s->le) >> off) << 16;
- j |= (tget(&gp, type, s->le) >> off) << 8;
- j |= tget(&bp, type, s->le) >> off;
- pal[i] = j;
- }
- break;
- case TIFF_PLANAR:
- if(value == 2){
- av_log(s->avctx, AV_LOG_ERROR, "Planar format is not supported\n");
- return -1;
- }
- break;
- }
- return 0;
-}
-
-static int decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
- uint8_t *buf, int buf_size)
-{
- TiffContext * const s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame * const p= (AVFrame*)&s->picture;
- uint8_t *orig_buf = buf, *end_buf = buf + buf_size;
- int id, le, off;
- int i, entries;
-
- //parse image header
- id = AV_RL16(buf); buf += 2;
- if(id == 0x4949) le = 1;
- else if(id == 0x4D4D) le = 0;
- else{
- av_log(avctx, AV_LOG_ERROR, "TIFF header not found\n");
- return -1;
- }
- s->le = le;
- s->invert = 0;
- // As TIFF 6.0 specification puts it "An arbitrary but carefully chosen number
- // that further identifies the file as a TIFF file"
- if(tget_short(&buf, le) != 42){
- av_log(avctx, AV_LOG_ERROR, "The answer to life, universe and everything is not correct!\n");
- return -1;
- }
- /* parse image file directory */
- off = tget_long(&buf, le);
- if(orig_buf + off + 14 >= end_buf){
- av_log(avctx, AV_LOG_ERROR, "IFD offset is greater than image size\n");
- return -1;
- }
- buf = orig_buf + off;
- entries = tget_short(&buf, le);
- for(i = 0; i < entries; i++){
- if(tiff_decode_tag(s, orig_buf, buf, end_buf, p) < 0)
- return -1;
- buf += 12;
- }
-
- if(s->invert){
- uint8_t *src;
- int j;
-
- src = s->picture.data[0];
- for(j = 0; j < s->height; j++){
- for(i = 0; i < s->picture.linesize[0]; i++)
- src[i] = 255 - src[i];
- src += s->picture.linesize[0];
- }
- }
- *picture= *(AVFrame*)&s->picture;
- *data_size = sizeof(AVPicture);
-
- return buf_size;
-}
-
-static int tiff_init(AVCodecContext *avctx){
- TiffContext *s = avctx->priv_data;
-
- s->width = 0;
- s->height = 0;
- s->avctx = avctx;
- avcodec_get_frame_defaults((AVFrame*)&s->picture);
- avctx->coded_frame= (AVFrame*)&s->picture;
- s->picture.data[0] = NULL;
- ff_lzw_decode_open(&s->lzw);
-
- return 0;
-}
-
-static int tiff_end(AVCodecContext *avctx)
-{
- TiffContext * const s = avctx->priv_data;
-
- ff_lzw_decode_close(&s->lzw);
- if(s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
- return 0;
-}
-
-AVCodec tiff_decoder = {
- "tiff",
- CODEC_TYPE_VIDEO,
- CODEC_ID_TIFF,
- sizeof(TiffContext),
- tiff_init,
- NULL,
- tiff_end,
- decode_frame,
- 0,
- NULL
-};
+#endif /* TIFF_H */
Added: trunk/libavcodec/tiffenc.c
==============================================================================
--- (empty file)
+++ trunk/libavcodec/tiffenc.c Tue Apr 3 15:43:57 2007
@@ -0,0 +1,359 @@
+/*
+ * TIFF image encoder
+ * Copyright (c) 2007 Bartlomiej Wolowiec
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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,
+ * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#include "avcodec.h"
+#ifdef CONFIG_ZLIB
+#include <zlib.h>
+#endif
+#include "bytestream.h"
+#include "tiff.h"
+#include "rle.h"
+
+#define TIFF_MAX_ENTRY 32
+
+/** sizes of various TIFF field types (string size = 1)*/
+static const uint8_t type_sizes2[6] = {
+ 0, 1, 1, 2, 4, 8
+};
+
+typedef struct TiffEncoderContext {
+ 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 invert; ///< 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
+} TiffEncoderContext;
+
+
+/**
+ * Check free space in buffer
+ * @param s Tiff context
+ * @param need Needed bytes
+ * @return 0 - ok, 1 - no free space
+ */
+inline static 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;
+ av_log(s->avctx, AV_LOG_ERROR, "Buffer is too small\n");
+ return 1;
+ }
+ return 0;
+}
+
+/**
+ * Put n values to buffer
+ *
+ * @param p Pointer to pointer to output buffer
+ * @param n Number of values
+ * @param val Pointer to values
+ * @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,
+ int flip)
+{
+ int i;
+#ifdef WORDS_BIGENDIAN
+ flip ^= ((int[]) {0, 0, 0, 1, 3, 3})[type];
+#endif
+ for (i = 0; i < n * type_sizes2[type]; i++)
+ *(*p)++ = val[i ^ flip];
+}
+
+/**
+ * Add entry to directory in tiff header.
+ * @param s Tiff context
+ * @param tag Tag that identifies the entry
+ * @param type Entry 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)
+{
+ uint8_t *entries_ptr = s->entries + 12 * s->num_entries;
+
+ assert(s->num_entries < TIFF_MAX_ENTRY);
+
+ bytestream_put_le16(&entries_ptr, tag);
+ bytestream_put_le16(&entries_ptr, type);
+ bytestream_put_le32(&entries_ptr, count);
+
+ if (type_sizes[type] * count <= 4) {
+ tnput(&entries_ptr, count, ptr_val, type, 0);
+ } else {
+ bytestream_put_le32(&entries_ptr, *s->buf - s->buf_start);
+ check_size(s, count * type_sizes2[type]);
+ tnput(s->buf, count, ptr_val, type, 0);
+ }
+
+ s->num_entries++;
+}
+
+/**
+ * Encode one strip in tiff file
+ *
+ * @param s Tiff context
+ * @param src Input buffer
+ * @param dst Output buffer
+ * @param n Size of input buffer
+ * @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)
+{
+
+ switch (compr) {
+#ifdef 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;
+ }
+#endif
+ case TIFF_RAW:
+ if (check_size(s, n))
+ return -1;
+ 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);
+ default:
+ return -1;
+ }
+}
+
+static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
+ int buf_size, void *data)
+{
+ TiffEncoderContext *s = avctx->priv_data;
+ AVFrame *pict = data;
+ AVFrame *const p = (AVFrame *) & s->picture;
+ int i;
+ int n;
+ uint8_t *ptr = buf;
+ uint8_t *offset;
+ uint32_t strips;
+ 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;
+
+ s->buf_start = buf;
+ s->buf = &ptr;
+ s->buf_size = buf_size;
+
+ *p = *pict;
+ p->pict_type = FF_I_TYPE;
+ p->key_frame = 1;
+
+ s->compr = TIFF_PACKBITS;
+ if (avctx->compression_level == 0) {
+ s->compr = TIFF_RAW;
+#ifdef CONFIG_ZLIB
+ } else if ((avctx->compression_level > 2)) {
+ s->compr = TIFF_DEFLATE;
+#endif
+ }
+
+ s->width = avctx->width;
+ s->height = avctx->height;
+
+ switch (avctx->pix_fmt) {
+ case PIX_FMT_RGB24:
+ s->bpp = 24;
+ s->invert = 2;
+ break;
+ case PIX_FMT_GRAY8:
+ s->bpp = 8;
+ s->invert = 1;
+ break;
+ case PIX_FMT_PAL8:
+ s->bpp = 8;
+ s->invert = 3;
+ break;
+ case PIX_FMT_MONOBLACK:
+ s->bpp = 1;
+ s->invert = 1;
+ break;
+ case PIX_FMT_MONOWHITE:
+ s->bpp = 1;
+ s->invert = 0;
+ break;
+ default:
+ av_log(s->avctx, AV_LOG_ERROR,
+ "This colors format is not supported\n");
+ return -1;
+ }
+ s->bpp_tab_size = (s->bpp >> 3);
+
+ if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE)
+ //best choose for DEFLATE
+ s->rps = s->height;
+ else
+ s->rps = FFMAX(8192 / (((s->width * s->bpp) >> 3) + 1), 1); // suggest size of strip
+
+ strips = (s->height - 1) / s->rps + 1;
+
+ if (check_size(s, 8))
+ goto fail;
+
+ // write header
+ bytestream_put_le16(&ptr, 0x4949);
+ bytestream_put_le16(&ptr, 42);
+
+ offset = ptr;
+ bytestream_put_le32(&ptr, 0);
+
+ strip_sizes = av_mallocz(sizeof(*strip_sizes) * strips);
+ strip_offsets = av_mallocz(sizeof(*strip_offsets) * strips);
+
+ bytes_per_row = (s->width * s->bpp + 7) >> 3;
+
+#ifdef CONFIG_ZLIB
+ if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE) {
+ uint8_t *zbuf;
+ int zlen, zn;
+ int j;
+
+ zlen = bytes_per_row * s->rps;
+ zbuf = av_malloc(zlen);
+ strip_offsets[0] = ptr - buf;
+ zn = 0;
+ for (j = 0; j < s->rps; j++) {
+ 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);
+ av_free(zbuf);
+ if (n<0) {
+ av_log(s->avctx, AV_LOG_ERROR, "Encode strip failed\n");
+ goto fail;
+ }
+ ptr += n;
+ strip_sizes[0] = ptr - buf - strip_offsets[0];
+ } else
+#endif
+ {
+ for (i = 0; i < s->height; i++) {
+ if (strip_sizes[i / s->rps] == 0) {
+ strip_offsets[i / s->rps] = ptr - buf;
+ }
+ if ((n = encode_strip(s, p->data[0] + i * p->linesize[0]
+ , ptr, bytes_per_row, s->compr)) < 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "Encode strip failed\n");
+ goto fail;
+ }
+ strip_sizes[i / s->rps] += n;
+ ptr += n;
+ }
+ }
+
+ s->num_entries = 0;
+
+ add_entry(s, TIFF_SUBFILE, TIFF_LONG, 1, (uint32_t[]) {0});
+ add_entry(s, TIFF_WIDTH, TIFF_LONG, 1, (uint32_t[]) {s->width});
+ add_entry(s, TIFF_HEIGHT, TIFF_LONG, 1, (uint32_t[]) {s->height});
+
+ if (s->bpp_tab_size)
+ add_entry(s, TIFF_BPP, TIFF_SHORT, s->bpp_tab_size, bpp_tab);
+
+ add_entry(s, TIFF_COMPR, TIFF_SHORT, 1, (uint16_t[]) {s->compr});
+ add_entry(s, TIFF_INVERT, TIFF_SHORT, 1, (uint16_t[]) {s->invert});
+ add_entry(s, TIFF_STRIP_OFFS, TIFF_LONG, strips, strip_offsets);
+
+ if (s->bpp_tab_size)
+ add_entry(s, TIFF_SAMPLES_PER_PIXEL, TIFF_SHORT, 1, (uint16_t[]) {s->bpp_tab_size});
+
+ add_entry(s, TIFF_ROWSPERSTRIP, TIFF_LONG, 1, (uint32_t[]) {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_entry(s, TIFF_RES_UNIT, TIFF_SHORT, 1, (uint16_t[]) {2});
+ add_entry(s, TIFF_SOFTWARE_NAME, TIFF_STRING,
+ strlen(LIBAVCODEC_IDENT) + 1, LIBAVCODEC_IDENT);
+
+ if (avctx->pix_fmt == 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;
+ }
+ add_entry(s, TIFF_PAL, TIFF_SHORT, 256 * 3, pal);
+ }
+ bytestream_put_le32(&offset, ptr - buf); // write offset to dir
+
+ if (check_size(s, 6 + s->num_entries * 12))
+ 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;
+
+fail:
+ av_free(strip_sizes);
+ av_free(strip_offsets);
+ 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,
+ -1}
+
+};
More information about the ffmpeg-cvslog
mailing list