har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tiffenc: add a private option for selecting compression algorithm

Browse Source
This commit is contained in:
Anton Khirnov 2011-11-23 19:45:39 +01:00
parent 50efd3cad8
commit a94c769dad
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavcodec/tiffenc.c
View File

@ -25,6 +25,9 @@
* @author Bartlomiej Wolowiec * @author Bartlomiej Wolowiec
*/ */
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
#if CONFIG_ZLIB #if CONFIG_ZLIB
#include <zlib.h> #include <zlib.h>
@ -43,6 +46,7 @@ static const uint8_t type_sizes2[6] = {
}; };
typedef struct TiffEncoderContext { typedef struct TiffEncoderContext {
AVClass *class; ///< for private options
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame picture; AVFrame picture;
@ -227,7 +231,6 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
p->key_frame = 1; p->key_frame = 1;
avctx->coded_frame= &s->picture; avctx->coded_frame= &s->picture;
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) { } else if(avctx->compression_level == 2) {
@ -444,6 +447,26 @@ fail:
return ret; return ret;
} }
#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, {TIFF_PACKBITS}, TIFF_RAW, TIFF_DEFLATE, VE, "compression_algo" },
{ "packbits", NULL, 0, AV_OPT_TYPE_CONST, {TIFF_PACKBITS}, 0, 0, VE, "compression_algo" },
{ "raw", NULL, 0, AV_OPT_TYPE_CONST, {TIFF_RAW}, 0, 0, VE, "compression_algo" },
{ "lzw", NULL, 0, AV_OPT_TYPE_CONST, {TIFF_LZW}, 0, 0, VE, "compression_algo" },
#if CONFIG_ZLIB
{ "deflate", NULL, 0, AV_OPT_TYPE_CONST, {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 = { AVCodec ff_tiff_encoder = {
.name = "tiff", .name = "tiff",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
@ -458,4 +481,5 @@ AVCodec ff_tiff_encoder = {
PIX_FMT_YUV411P, PIX_FMT_YUV411P,
PIX_FMT_NONE}, PIX_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"), .long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
.priv_class = &tiffenc_class,
}; };