generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TIFF-LZW encoding support by (Bartlomiej Wolowiec b.wolowiec students mimuw edu pl)

Browse Source 
Originally committed as revision 8645 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-04-07 15:15:45 +00:00
parent f0790c59f4
commit efd2afc2ae
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/Makefile
View File

@ -147,7 +147,7 @@ OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o
OBJS-$(CONFIG_THEORA_DECODER) += vp3.o xiph.o OBJS-$(CONFIG_THEORA_DECODER) += vp3.o xiph.o
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o
OBJS-$(CONFIG_TIFF_ENCODER) += tiffenc.o rle.o OBJS-$(CONFIG_TIFF_ENCODER) += tiffenc.o rle.o lzwenc.o
OBJS-$(CONFIG_TRUEMOTION1_DECODER) += truemotion1.o OBJS-$(CONFIG_TRUEMOTION1_DECODER) += truemotion1.o
OBJS-$(CONFIG_TRUEMOTION2_DECODER) += truemotion2.o OBJS-$(CONFIG_TRUEMOTION2_DECODER) += truemotion2.o
OBJS-$(CONFIG_TRUESPEECH_DECODER) += truespeech.o OBJS-$(CONFIG_TRUESPEECH_DECODER) += truespeech.o

23
libavcodec/tiffenc.c
View File

@ -32,6 +32,7 @@
#include "bytestream.h" #include "bytestream.h"
#include "tiff.h" #include "tiff.h"
#include "rle.h" #include "rle.h"
#include "lzw.h"
#define TIFF_MAX_ENTRY 32 #define TIFF_MAX_ENTRY 32
@ -58,6 +59,7 @@ typedef struct TiffEncoderContext {
uint8_t *buf_start; ///< pointer to first byte in buffer uint8_t *buf_start; ///< pointer to first byte in buffer
int buf_size; ///< buffer size int buf_size; ///< buffer size
uint16_t subsampling[2]; ///< YUV subsampling factors uint16_t subsampling[2]; ///< YUV subsampling factors
struct LZWEncodeState *lzws; ///< LZW Encode state
} TiffEncoderContext; } TiffEncoderContext;
@ -169,6 +171,8 @@ static int encode_strip(TiffEncoderContext * s, const int8_t * src,
return n; return n;
case TIFF_PACKBITS: 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: default:
return -1; return -1;
} }
@ -223,8 +227,10 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
s->compr = TIFF_PACKBITS; s->compr = TIFF_PACKBITS;
if (avctx->compression_level == 0) { if (avctx->compression_level == 0) {
s->compr = TIFF_RAW; s->compr = TIFF_RAW;
} else if(avctx->compression_level == 2) {
s->compr = TIFF_LZW;
#ifdef CONFIG_ZLIB #ifdef CONFIG_ZLIB
} else if ((avctx->compression_level > 2)) { } else if ((avctx->compression_level >= 3)) {
s->compr = TIFF_DEFLATE; s->compr = TIFF_DEFLATE;
#endif #endif
} }
@ -277,7 +283,7 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
if (!is_yuv) 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 //best choose for DEFLATE
s->rps = s->height; s->rps = s->height;
else else
@ -341,8 +347,13 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
} else } else
#endif #endif
{ {
if(s->compr == TIFF_LZW)
s->lzws = av_malloc(ff_lzw_encode_state_size);
for (i = 0; i < s->height; i++) { for (i = 0; i < s->height; i++) {
if (strip_sizes[i / s->rps] == 0) { 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; strip_offsets[i / s->rps] = ptr - buf;
} }
if (is_yuv){ if (is_yuv){
@ -359,7 +370,15 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
} }
strip_sizes[i / s->rps] += n; strip_sizes[i / s->rps] += n;
ptr += 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)
av_free(s->lzws);
} }
s->num_entries = 0; s->num_entries = 0;