Skip to content

F
ffmpeg.wasm-core
Commit 7cb5467a authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '46ce9ded' 

* commit '46ce9ded':
  tiff: K&R formatting cosmetics

Conflicts:
	libavcodec/tiff.c
	libavcodec/tiff.h
	libavcodec/tiffenc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2976e2a1 46ce9ded
Hide whitespace changes
Inline Side-by-side
Showing with 237 additions and 228 deletions
libavcodec/tiff.c
View file @ 7cb5467a
...@@ -24,22 +24,23 @@ ...@@ -24,22 +24,23 @@
* @author Konstantin Shishkov * @author Konstantin Shishkov
*/ */
#include "avcodec.h"
#include "bytestream.h"
#include "config.h" #include "config.h"
#if CONFIG_ZLIB #if CONFIG_ZLIB
#include <zlib.h> #include <zlib.h>
#endif #endif
#include "lzw.h"
#include "tiff.h"
#include "tiff_data.h"
#include "faxcompr.h"
#include "internal.h"
#include "mathops.h"
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/avstring.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/avstring.h" #include "avcodec.h"
#include "bytestream.h"
#include "faxcompr.h"
#include "internal.h"
#include "lzw.h"
#include "mathops.h"
#include "tiff.h"
#include "tiff_data.h"
typedef struct TiffContext { typedef struct TiffContext {
AVCodecContext *avctx; AVCodecContext *avctx;
...@@ -90,10 +91,14 @@ static double tget_double(GetByteContext *gb, int le) ...@@ -90,10 +91,14 @@ static double tget_double(GetByteContext *gb, int le)
static unsigned tget(GetByteContext *gb, int type, int le) static unsigned tget(GetByteContext *gb, int type, int le)
{ {
switch (type) { switch (type) {
case TIFF_BYTE : return bytestream2_get_byte(gb); case TIFF_BYTE:
case TIFF_SHORT: return tget_short(gb, le); return bytestream2_get_byte(gb);
case TIFF_LONG : return tget_long(gb, le); case TIFF_SHORT:
default : return UINT_MAX; return tget_short(gb, le);
case TIFF_LONG:
return tget_long(gb, le);
default:
return UINT_MAX;
} }
} }
...@@ -356,11 +361,11 @@ static int tiff_uncompress(uint8_t *dst, unsigned long *len, const uint8_t *src, ...@@ -356,11 +361,11 @@ static int tiff_uncompress(uint8_t *dst, unsigned long *len, const uint8_t *src,
z_stream zstream = { 0 }; z_stream zstream = { 0 };
int zret; int zret;
zstream.next_in = (uint8_t *)src; zstream.next_in = (uint8_t *)src;
zstream.avail_in = size; zstream.avail_in = size;
zstream.next_out = dst; zstream.next_out = dst;
zstream.avail_out = *len; zstream.avail_out = *len;
zret = inflateInit(&zstream); zret = inflateInit(&zstream);
if (zret != Z_OK) { if (zret != Z_OK) {
av_log(NULL, AV_LOG_ERROR, "Inflate init error: %d\n", zret); av_log(NULL, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
return zret; return zret;
...@@ -430,7 +435,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride, ...@@ -430,7 +435,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
{ {
int c, line, pixels, code, ret; int c, line, pixels, code, ret;
const uint8_t *ssrc = src; const uint8_t *ssrc = src;
int width = ((s->width * s->bpp) + 7) >> 3; int width = ((s->width * s->bpp) + 7) >> 3;
if (s->planar) if (s->planar)
width /= s->bppcount; width /= s->bppcount;
...@@ -444,7 +449,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride, ...@@ -444,7 +449,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
unsigned long outlen; unsigned long outlen;
int ret; int ret;
outlen = width * lines; outlen = width * lines;
zbuf = av_malloc(outlen); zbuf = av_malloc(outlen);
if (!zbuf) if (!zbuf)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (s->fill_order) { if (s->fill_order) {
...@@ -462,7 +467,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride, ...@@ -462,7 +467,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
} }
src = zbuf; src = zbuf;
for (line = 0; line < lines; line++) { for (line = 0; line < lines; line++) {
if(s->bpp < 8 && s->avctx->pix_fmt == AV_PIX_FMT_PAL8){ if(s->bpp < 8 && s->avctx->pix_fmt == AV_PIX_FMT_PAL8) {
horizontal_fill(s->bpp, dst, 1, src, 0, width, 0); horizontal_fill(s->bpp, dst, 1, src, 0, width, 0);
}else{ }else{
memcpy(dst, src, width); memcpy(dst, src, width);
...@@ -488,8 +493,9 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride, ...@@ -488,8 +493,9 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
return ret; return ret;
} }
} }
if (s->compr == TIFF_CCITT_RLE || s->compr == TIFF_G3 if (s->compr == TIFF_CCITT_RLE ||
|| s->compr == TIFF_G4) { s->compr == TIFF_G3 ||
s->compr == TIFF_G4) {
int i, ret = 0; int i, ret = 0;
uint8_t *src2 = av_malloc((unsigned)size + uint8_t *src2 = av_malloc((unsigned)size +
FF_INPUT_BUFFER_PADDING_SIZE); FF_INPUT_BUFFER_PADDING_SIZE);
...@@ -567,7 +573,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride, ...@@ -567,7 +573,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
} }
horizontal_fill(s->bpp * (s->avctx->pix_fmt == AV_PIX_FMT_PAL8), horizontal_fill(s->bpp * (s->avctx->pix_fmt == AV_PIX_FMT_PAL8),
dst, 1, src, 0, code, pixels); dst, 1, src, 0, code, pixels);
src += code; src += code;
pixels += code; pixels += code;
} else if (code != -128) { // -127..-1 } else if (code != -128) { // -127..-1
code = (-code) + 1; code = (-code) + 1;
...@@ -706,11 +712,10 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) ...@@ -706,11 +712,10 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
bytestream2_seek(&s->gb, off, SEEK_SET); bytestream2_seek(&s->gb, off, SEEK_SET);
} }
} else { } else {
if (count <= 4 && type_sizes[type] * count <= 4) { if (count <= 4 && type_sizes[type] * count <= 4)
bytestream2_seek(&s->gb, -4, SEEK_CUR); bytestream2_seek(&s->gb, -4, SEEK_CUR);
} else { else
bytestream2_seek(&s->gb, off, SEEK_SET); bytestream2_seek(&s->gb, off, SEEK_SET);
}
} }
switch (tag) { switch (tag) {
...@@ -765,7 +770,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) ...@@ -765,7 +770,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
s->bppcount = value; s->bppcount = value;
break; break;
case TIFF_COMPR: case TIFF_COMPR:
s->compr = value; s->compr = value;
s->predictor = 0; s->predictor = 0;
switch (s->compr) { switch (s->compr) {
case TIFF_RAW: case TIFF_RAW:
...@@ -808,8 +813,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) ...@@ -808,8 +813,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
break; break;
case TIFF_STRIP_OFFS: case TIFF_STRIP_OFFS:
if (count == 1) { if (count == 1) {
s->strippos = 0; s->strippos = 0;
s->stripoff = value; s->stripoff = value;
} else } else
s->strippos = off; s->strippos = off;
s->strips = count; s->strips = count;
...@@ -825,8 +830,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) ...@@ -825,8 +830,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
case TIFF_STRIP_SIZE: case TIFF_STRIP_SIZE:
if (count == 1) { if (count == 1) {
s->stripsizesoff = 0; s->stripsizesoff = 0;
s->stripsize = value; s->stripsize = value;
s->strips = 1; s->strips = 1;
} else { } else {
s->stripsizesoff = off; s->stripsizesoff = off;
} }
...@@ -1046,8 +1051,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -1046,8 +1051,7 @@ static int decode_frame(AVCodecContext *avctx,
AVFrame *const p = data; AVFrame *const p = data;
unsigned off; unsigned off;
int id, le, ret, plane, planes; int id, le, ret, plane, planes;
int i, j, entries; int i, j, entries, stride;
int stride;
unsigned soff, ssize; unsigned soff, ssize;
uint8_t *dst; uint8_t *dst;
GetByteContext stripsizes; GetByteContext stripsizes;
...@@ -1055,10 +1059,10 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -1055,10 +1059,10 @@ static int decode_frame(AVCodecContext *avctx,
bytestream2_init(&s->gb, avpkt->data, avpkt->size); bytestream2_init(&s->gb, avpkt->data, avpkt->size);
//parse image header // parse image header
if (avpkt->size < 8) if (avpkt->size < 8)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
id = bytestream2_get_le16u(&s->gb); id = bytestream2_get_le16u(&s->gb);
if (id == 0x4949) if (id == 0x4949)
le = 1; le = 1;
else if (id == 0x4D4D) else if (id == 0x4D4D)
...@@ -1067,11 +1071,11 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -1067,11 +1071,11 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "TIFF header not found\n"); av_log(avctx, AV_LOG_ERROR, "TIFF header not found\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
s->le = le; s->le = le;
// TIFF_BPP is not a required tag and defaults to 1 // TIFF_BPP is not a required tag and defaults to 1
s->bppcount = s->bpp = 1; s->bppcount = s->bpp = 1;
s->invert = 0; s->invert = 0;
s->compr = TIFF_RAW; s->compr = TIFF_RAW;
s->fill_order = 0; s->fill_order = 0;
free_geotags(s); free_geotags(s);
...@@ -1148,7 +1152,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -1148,7 +1152,7 @@ static int decode_frame(AVCodecContext *avctx,
planes = s->planar ? s->bppcount : 1; planes = s->planar ? s->bppcount : 1;
for (plane = 0; plane < planes; plane++) { for (plane = 0; plane < planes; plane++) {
stride = p->linesize[plane]; stride = p->linesize[plane];
dst = p->data[plane]; dst = p->data[plane];
for (i = 0; i < s->height; i += s->rps) { for (i = 0; i < s->height; i += s->rps) {
if (s->stripsizesoff) if (s->stripsizesoff)
ssize = tget(&stripsizes, s->sstype, s->le); ssize = tget(&stripsizes, s->sstype, s->le);
...@@ -1170,8 +1174,8 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -1170,8 +1174,8 @@ static int decode_frame(AVCodecContext *avctx,
dst += s->rps * stride; dst += s->rps * stride;
} }
if (s->predictor == 2) { if (s->predictor == 2) {
dst = p->data[plane]; dst = p->data[plane];
soff = s->bpp >> 3; soff = s->bpp >> 3;
ssize = s->width * soff; ssize = s->width * soff;
if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE || if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE ||
s->avctx->pix_fmt == AV_PIX_FMT_RGBA64LE) { s->avctx->pix_fmt == AV_PIX_FMT_RGBA64LE) {
...@@ -1222,9 +1226,9 @@ static av_cold int tiff_init(AVCodecContext *avctx) ...@@ -1222,9 +1226,9 @@ static av_cold int tiff_init(AVCodecContext *avctx)
{ {
TiffContext *s = avctx->priv_data; TiffContext *s = avctx->priv_data;
s->width = 0; s->width = 0;
s->height = 0; s->height = 0;
s->avctx = avctx; s->avctx = avctx;
ff_lzw_decode_open(&s->lzw); ff_lzw_decode_open(&s->lzw);
ff_ccitt_unpack_init(); ff_ccitt_unpack_init();
...@@ -1244,6 +1248,7 @@ static av_cold int tiff_end(AVCodecContext *avctx) ...@@ -1244,6 +1248,7 @@ static av_cold int tiff_end(AVCodecContext *avctx)
AVCodec ff_tiff_decoder = { AVCodec ff_tiff_decoder = {
.name = "tiff", .name = "tiff",
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_TIFF, .id = AV_CODEC_ID_TIFF,
.priv_data_size = sizeof(TiffContext), .priv_data_size = sizeof(TiffContext),
...@@ -1251,5 +1256,4 @@ AVCodec ff_tiff_decoder = { ...@@ -1251,5 +1256,4 @@ AVCodec ff_tiff_decoder = {
.close = tiff_end, .close = tiff_end,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
}; };
libavcodec/tiff.h
View file @ 7cb5467a
...@@ -33,58 +33,58 @@ ...@@ -33,58 +33,58 @@
#include <stdint.h> #include <stdint.h>
/** abridged list of TIFF tags */ /** abridged list of TIFF tags */
enum TiffTags{ enum TiffTags {
TIFF_SUBFILE = 0xfe, TIFF_SUBFILE = 0xfe,
TIFF_WIDTH = 0x100, TIFF_WIDTH = 0x100,
TIFF_HEIGHT, TIFF_HEIGHT,
TIFF_BPP, TIFF_BPP,
TIFF_COMPR, TIFF_COMPR,
TIFF_INVERT = 0x106, TIFF_INVERT = 0x106,
TIFF_FILL_ORDER = 0x10A, TIFF_FILL_ORDER = 0x10A,
TIFF_DOCUMENT_NAME = 0x10D, TIFF_DOCUMENT_NAME = 0x10D,
TIFF_IMAGE_DESCRIPTION = 0x10E, TIFF_IMAGE_DESCRIPTION = 0x10E,
TIFF_MAKE = 0x10F, TIFF_MAKE = 0x10F,
TIFF_MODEL = 0x110, TIFF_MODEL = 0x110,
TIFF_STRIP_OFFS = 0x111, TIFF_STRIP_OFFS = 0x111,
TIFF_SAMPLES_PER_PIXEL = 0x115, TIFF_SAMPLES_PER_PIXEL = 0x115,
TIFF_ROWSPERSTRIP = 0x116, TIFF_ROWSPERSTRIP = 0x116,
TIFF_STRIP_SIZE, TIFF_STRIP_SIZE,
TIFF_XRES = 0x11A, TIFF_XRES = 0x11A,
TIFF_YRES = 0x11B, TIFF_YRES = 0x11B,
TIFF_PLANAR = 0x11C, TIFF_PLANAR = 0x11C,
TIFF_PAGE_NAME = 0x11D, TIFF_PAGE_NAME = 0x11D,
TIFF_XPOS = 0x11E, TIFF_XPOS = 0x11E,
TIFF_YPOS = 0x11F, TIFF_YPOS = 0x11F,
TIFF_T4OPTIONS = 0x124, TIFF_T4OPTIONS = 0x124,
TIFF_T6OPTIONS, TIFF_T6OPTIONS,
TIFF_RES_UNIT = 0x128, TIFF_RES_UNIT = 0x128,
TIFF_PAGE_NUMBER = 0x129, TIFF_PAGE_NUMBER = 0x129,
TIFF_SOFTWARE_NAME = 0x131, TIFF_SOFTWARE_NAME = 0x131,
TIFF_DATE = 0x132, TIFF_DATE = 0x132,
TIFF_ARTIST = 0x13B, TIFF_ARTIST = 0x13B,
TIFF_HOST_COMPUTER = 0x13C, TIFF_HOST_COMPUTER = 0x13C,
TIFF_PREDICTOR = 0x13D, TIFF_PREDICTOR = 0x13D,
TIFF_PAL = 0x140, TIFF_PAL = 0x140,
TIFF_TILE_WIDTH = 0x142, TIFF_TILE_WIDTH = 0x142,
TIFF_TILE_LENGTH = 0x143, TIFF_TILE_LENGTH = 0x143,
TIFF_TILE_OFFSETS = 0x144, TIFF_TILE_OFFSETS = 0x144,
TIFF_TILE_BYTE_COUNTS = 0x145, TIFF_TILE_BYTE_COUNTS = 0x145,
TIFF_EXTRASAMPLES = 0x152, TIFF_EXTRASAMPLES = 0x152,
TIFF_YCBCR_COEFFICIENTS = 0x211, TIFF_YCBCR_COEFFICIENTS = 0x211,
TIFF_YCBCR_SUBSAMPLING = 0x212, TIFF_YCBCR_SUBSAMPLING = 0x212,
TIFF_YCBCR_POSITIONING = 0x213, TIFF_YCBCR_POSITIONING = 0x213,
TIFF_REFERENCE_BW = 0x214, TIFF_REFERENCE_BW = 0x214,
TIFF_COPYRIGHT = 0x8298, TIFF_COPYRIGHT = 0x8298,
TIFF_MODEL_TIEPOINT = 0x8482, TIFF_MODEL_TIEPOINT = 0x8482,
TIFF_MODEL_PIXEL_SCALE = 0x830E, TIFF_MODEL_PIXEL_SCALE = 0x830E,
TIFF_MODEL_TRANSFORMATION = 0x8480, TIFF_MODEL_TRANSFORMATION= 0x8480,
TIFF_GEO_KEY_DIRECTORY = 0x87AF, TIFF_GEO_KEY_DIRECTORY = 0x87AF,
TIFF_GEO_DOUBLE_PARAMS = 0x87B0, TIFF_GEO_DOUBLE_PARAMS = 0x87B0,
TIFF_GEO_ASCII_PARAMS = 0x87B1 TIFF_GEO_ASCII_PARAMS = 0x87B1
}; };
/** list of TIFF compression types */ /** list of TIFF compression types */
enum TiffCompr{ enum TiffCompr {
TIFF_RAW = 1, TIFF_RAW = 1,
TIFF_CCITT_RLE, TIFF_CCITT_RLE,
TIFF_G3, TIFF_G3,
...@@ -94,10 +94,10 @@ enum TiffCompr{ ...@@ -94,10 +94,10 @@ enum TiffCompr{
TIFF_NEWJPEG, TIFF_NEWJPEG,
TIFF_ADOBE_DEFLATE, TIFF_ADOBE_DEFLATE,
TIFF_PACKBITS = 0x8005, TIFF_PACKBITS = 0x8005,
TIFF_DEFLATE = 0x80B2 TIFF_DEFLATE = 0x80B2
}; };
enum TiffTypes{ enum TiffTypes {
TIFF_BYTE = 1, TIFF_BYTE = 1,
TIFF_STRING, TIFF_STRING,
TIFF_SHORT, TIFF_SHORT,
......
libavcodec/tiffenc.c
View file @ 7cb5467a
...@@ -25,22 +25,22 @@ ...@@ -25,22 +25,22 @@
* @author Bartlomiej Wolowiec * @author Bartlomiej Wolowiec
*/ */
#include "config.h"
#if CONFIG_ZLIB
#include <zlib.h>
#endif
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "avcodec.h" #include "avcodec.h"
#include "config.h"
#if CONFIG_ZLIB
#include <zlib.h>
#endif
#include "bytestream.h" #include "bytestream.h"
#include "internal.h" #include "internal.h"
#include "tiff.h"
#include "rle.h"
#include "lzw.h" #include "lzw.h"
#include "put_bits.h" #include "put_bits.h"
#include "rle.h"
#include "tiff.h"
#define TIFF_MAX_ENTRY 32 #define TIFF_MAX_ENTRY 32
...@@ -50,35 +50,34 @@ static const uint8_t type_sizes2[14] = { ...@@ -50,35 +50,34 @@ static const uint8_t type_sizes2[14] = {
}; };
typedef struct TiffEncoderContext { typedef struct TiffEncoderContext {
AVClass *class; ///< for private options AVClass *class; ///< for private options
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame picture; AVFrame picture;
int width; ///< picture width int width; ///< picture width
int height; ///< picture height int height; ///< picture height
unsigned int bpp; ///< bits per pixel unsigned int bpp; ///< bits per pixel
int compr; ///< compression level int compr; ///< compression level
int bpp_tab_size; ///< bpp_tab size int bpp_tab_size; ///< bpp_tab size
int photometric_interpretation; ///< photometric interpretation int photometric_interpretation; ///< photometric interpretation
int strips; ///< number of strips int strips; ///< number of strips
uint32_t *strip_sizes; uint32_t *strip_sizes;
unsigned int strip_sizes_size; unsigned int strip_sizes_size;
uint32_t *strip_offsets; uint32_t *strip_offsets;
unsigned int strip_offsets_size; unsigned int strip_offsets_size;
uint8_t *yuv_line; uint8_t *yuv_line;
unsigned int yuv_line_size; unsigned int yuv_line_size;
int rps; ///< row per strip int rps; ///< row per strip
uint8_t entries[TIFF_MAX_ENTRY*12]; ///< entires in header uint8_t entries[TIFF_MAX_ENTRY * 12]; ///< entries in header
int num_entries; ///< number of entires int num_entries; ///< number of entries
uint8_t **buf; ///< actual position in buffer uint8_t **buf; ///< actual position in buffer
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 struct LZWEncodeState *lzws; ///< LZW encode state
uint32_t dpi; ///< image resolution in DPI uint32_t dpi; ///< image resolution in DPI
} TiffEncoderContext; } TiffEncoderContext;
/** /**
* Check free space in buffer. * Check free space in buffer.
* *
...@@ -86,7 +85,7 @@ typedef struct TiffEncoderContext { ...@@ -86,7 +85,7 @@ typedef struct TiffEncoderContext {
* @param need Needed bytes * @param need Needed bytes
* @return 0 - ok, 1 - no free space * @return 0 - ok, 1 - no free space
*/ */
static inline 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) { if (s->buf_size < *s->buf - s->buf_start + need) {
*s->buf = s->buf_start + s->buf_size + 1; *s->buf = s->buf_start + s->buf_size + 1;
...@@ -105,12 +104,12 @@ static inline int check_size(TiffEncoderContext * s, uint64_t need) ...@@ -105,12 +104,12 @@ static inline int check_size(TiffEncoderContext * s, uint64_t need)
* @param type type of values * @param type type of values
* @param flip = 0 - normal copy, >0 - flip * @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 flip)
{ {
int i; int i;
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
flip ^= ((int[]) {0, 0, 0, 1, 3, 3})[type]; flip ^= ((int[]) { 0, 0, 0, 1, 3, 3 })[type];
#endif #endif
for (i = 0; i < n * type_sizes2[type]; i++) for (i = 0; i < n * type_sizes2[type]; i++)
*(*p)++ = val[i ^ flip]; *(*p)++ = val[i ^ flip];
...@@ -125,9 +124,8 @@ static void tnput(uint8_t ** p, int n, const uint8_t * val, enum TiffTypes type, ...@@ -125,9 +124,8 @@ static void tnput(uint8_t ** p, int n, const uint8_t * val, enum TiffTypes type,
* @param count the number of values * @param count the number of values
* @param ptr_val pointer to values * @param ptr_val pointer to values
*/ */
static void add_entry(TiffEncoderContext * s, static void add_entry(TiffEncoderContext *s, enum TiffTags tag,
enum TiffTags tag, enum TiffTypes type, int count, enum TiffTypes type, int count, const void *ptr_val)
const void *ptr_val)
{ {
uint8_t *entries_ptr = s->entries + 12 * s->num_entries; uint8_t *entries_ptr = s->entries + 12 * s->num_entries;
...@@ -148,10 +146,11 @@ static void add_entry(TiffEncoderContext * s, ...@@ -148,10 +146,11 @@ static void add_entry(TiffEncoderContext * s,
s->num_entries++; s->num_entries++;
} }
static void add_entry1(TiffEncoderContext * s, static void add_entry1(TiffEncoderContext *s,
enum TiffTags tag, enum TiffTypes type, int val){ enum TiffTags tag, enum TiffTypes type, int val)
uint16_t w = val; {
uint32_t dw= val; uint16_t w = val;
uint32_t dw = val;
add_entry(s, tag, type, 1, type == TIFF_SHORT ? (void *)&w : (void *)&dw); add_entry(s, tag, type, 1, type == TIFF_SHORT ? (void *)&w : (void *)&dw);
} }
...@@ -165,22 +164,21 @@ static void add_entry1(TiffEncoderContext * s, ...@@ -165,22 +164,21 @@ static void add_entry1(TiffEncoderContext * s,
* @param compr compression method * @param compr compression method
* @return number of output bytes. If an output error is encountered, -1 is returned * @return number of output bytes. If an output error is encountered, -1 is returned
*/ */
static int encode_strip(TiffEncoderContext * s, const int8_t * src, static int encode_strip(TiffEncoderContext *s, const int8_t *src,
uint8_t * dst, int n, int compr) uint8_t *dst, int n, int compr)
{ {
switch (compr) { switch (compr) {
#if CONFIG_ZLIB #if CONFIG_ZLIB
case TIFF_DEFLATE: case TIFF_DEFLATE:
case TIFF_ADOBE_DEFLATE: case TIFF_ADOBE_DEFLATE:
{ {
unsigned long zlen = s->buf_size - (*s->buf - s->buf_start); unsigned long zlen = s->buf_size - (*s->buf - s->buf_start);
if (compress(dst, &zlen, src, n) != Z_OK) { if (compress(dst, &zlen, src, n) != Z_OK) {
av_log(s->avctx, AV_LOG_ERROR, "Compressing failed\n"); av_log(s->avctx, AV_LOG_ERROR, "Compressing failed\n");
return -1; return -1;
}
return zlen;
} }
return zlen;
}
#endif #endif
case TIFF_RAW: case TIFF_RAW:
if (check_size(s, n)) if (check_size(s, n))
...@@ -188,7 +186,8 @@ static int encode_strip(TiffEncoderContext * s, const int8_t * src, ...@@ -188,7 +186,8 @@ static int encode_strip(TiffEncoderContext * s, const int8_t * src,
memcpy(dst, src, n); memcpy(dst, src, n);
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: case TIFF_LZW:
return ff_lzw_encode(s->lzws, src, n); return ff_lzw_encode(s->lzws, src, n);
default: default:
...@@ -196,15 +195,15 @@ static int encode_strip(TiffEncoderContext * s, const int8_t * src, ...@@ -196,15 +195,15 @@ 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, uint8_t *dst, int lnum)
{ {
AVFrame *p = &s->picture; AVFrame *p = &s->picture;
int i, j, k; 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 *pu = &p->data[1][lnum / s->subsampling[1] * p->linesize[1]];
uint8_t *pv = &p->data[2][lnum / s->subsampling[1] * p->linesize[2]]; uint8_t *pv = &p->data[2][lnum / s->subsampling[1] * p->linesize[2]];
if(s->width % s->subsampling[0] || s->height % s->subsampling[1]){ if (s->width % s->subsampling[0] || s->height % s->subsampling[1]) {
for (i = 0; i < w; i++){ for (i = 0; i < w; i++) {
for (j = 0; j < s->subsampling[1]; j++) for (j = 0; j < s->subsampling[1]; j++)
for (k = 0; k < s->subsampling[0]; k++) for (k = 0; k < s->subsampling[0]; k++)
*dst++ = p->data[0][FFMIN(lnum + j, s->height-1) * p->linesize[0] + *dst++ = p->data[0][FFMIN(lnum + j, s->height-1) * p->linesize[0] +
...@@ -213,7 +212,7 @@ static void pack_yuv(TiffEncoderContext * s, uint8_t * dst, int lnum) ...@@ -213,7 +212,7 @@ static void pack_yuv(TiffEncoderContext * s, uint8_t * dst, int lnum)
*dst++ = *pv++; *dst++ = *pv++;
} }
}else{ }else{
for (i = 0; i < w; i++){ for (i = 0; i < w; i++) {
for (j = 0; j < s->subsampling[1]; j++) for (j = 0; j < s->subsampling[1]; j++)
for (k = 0; k < s->subsampling[0]; k++) for (k = 0; k < s->subsampling[0]; k++)
*dst++ = p->data[0][(lnum + j) * p->linesize[0] + *dst++ = p->data[0][(lnum + j) * p->linesize[0] +
...@@ -228,7 +227,7 @@ static av_cold int encode_init(AVCodecContext *avctx) ...@@ -228,7 +227,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
{ {
TiffEncoderContext *s = avctx->priv_data; TiffEncoderContext *s = avctx->priv_data;
avctx->coded_frame= &s->picture; avctx->coded_frame = &s->picture;
avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
avctx->coded_frame->key_frame = 1; avctx->coded_frame->key_frame = 1;
s->avctx = avctx; s->avctx = avctx;
...@@ -236,7 +235,7 @@ static av_cold int encode_init(AVCodecContext *avctx) ...@@ -236,7 +235,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet) const AVFrame *pict, int *got_packet)
{ {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
...@@ -247,7 +246,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, ...@@ -247,7 +246,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
uint8_t *offset; uint8_t *offset;
uint32_t strips; uint32_t strips;
int bytes_per_row; int bytes_per_row;
uint32_t res[2] = { s->dpi, 1 }; // image resolution (72/1) uint32_t res[2] = { s->dpi, 1 }; // image resolution (72/1)
uint16_t bpp_tab[4]; uint16_t bpp_tab[4];
int ret = -1; int ret = -1;
int is_yuv = 0, alpha = 0; int is_yuv = 0, alpha = 0;
...@@ -255,13 +254,13 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, ...@@ -255,13 +254,13 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
*p = *pict; *p = *pict;
s->width = avctx->width; s->width = avctx->width;
s->height = avctx->height; s->height = avctx->height;
s->subsampling[0] = 1; s->subsampling[0] = 1;
s->subsampling[1] = 1; s->subsampling[1] = 1;
avctx->bits_per_coded_sample = avctx->bits_per_coded_sample =
s->bpp = av_get_bits_per_pixel(desc); s->bpp = av_get_bits_per_pixel(desc);
s->bpp_tab_size = desc->nb_components; s->bpp_tab_size = desc->nb_components;
switch (avctx->pix_fmt) { switch (avctx->pix_fmt) {
...@@ -292,11 +291,11 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, ...@@ -292,11 +291,11 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
case AV_PIX_FMT_YUV444P: case AV_PIX_FMT_YUV444P:
case AV_PIX_FMT_YUV410P: case AV_PIX_FMT_YUV410P:
case AV_PIX_FMT_YUV411P: case AV_PIX_FMT_YUV411P:
av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v);
s->photometric_interpretation = 6; s->photometric_interpretation = 6;
avcodec_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v); s->subsampling[0] = 1 << shift_h;
s->subsampling[0] = 1 << shift_h; s->subsampling[1] = 1 << shift_v;
s->subsampling[1] = 1 << shift_v; is_yuv = 1;
is_yuv = 1;
break; break;
default: default:
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
...@@ -307,17 +306,22 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, ...@@ -307,17 +306,22 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
for (i = 0; i < s->bpp_tab_size; i++) for (i = 0; i < s->bpp_tab_size; i++)
bpp_tab[i] = desc->comp[i].depth_minus1 + 1; bpp_tab[i] = desc->comp[i].depth_minus1 + 1;
if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE || s->compr == TIFF_LZW) if (s->compr == TIFF_DEFLATE ||
//best choose for DEFLATE s->compr == TIFF_ADOBE_DEFLATE ||
s->compr == TIFF_LZW)
// best choice for DEFLATE
s->rps = s->height; s->rps = s->height;
else else
s->rps = FFMAX(8192 / (((s->width * s->bpp) >> 3) + 1), 1); // suggest size of strip // suggest size of strip
s->rps = ((s->rps - 1) / s->subsampling[1] + 1) * s->subsampling[1]; // round rps up 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; strips = (s->height - 1) / s->rps + 1;
if ((ret = ff_alloc_packet2(avctx, pkt, avctx->width * avctx->height * s->bpp * 2 + if ((ret = ff_alloc_packet2(avctx, pkt,
avctx->height * 4 + FF_MIN_BUFFER_SIZE)) < 0) avctx->width * avctx->height * s->bpp * 2 +
avctx->height * 4 + FF_MIN_BUFFER_SIZE)) < 0)
return ret; return ret;
ptr = pkt->data; ptr = pkt->data;
s->buf_start = pkt->data; s->buf_start = pkt->data;
...@@ -334,7 +338,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, ...@@ -334,7 +338,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
offset = ptr; offset = ptr;
bytestream_put_le32(&ptr, 0); bytestream_put_le32(&ptr, 0);
av_fast_padded_mallocz(&s->strip_sizes, &s->strip_sizes_size, sizeof(s->strip_sizes[0]) * strips); av_fast_padded_mallocz(&s->strip_sizes , &s->strip_sizes_size , sizeof(s->strip_sizes [0]) * strips);
av_fast_padded_mallocz(&s->strip_offsets, &s->strip_offsets_size, sizeof(s->strip_offsets[0]) * strips); av_fast_padded_mallocz(&s->strip_offsets, &s->strip_offsets_size, sizeof(s->strip_offsets[0]) * strips);
if (!s->strip_sizes || !s->strip_offsets) { if (!s->strip_sizes || !s->strip_offsets) {
...@@ -342,11 +346,11 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, ...@@ -342,11 +346,11 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
goto fail; goto fail;
} }
bytes_per_row = (((s->width - 1)/s->subsampling[0] + 1) * s->bpp bytes_per_row = (((s->width - 1) / s->subsampling[0] + 1) * s->bpp *
* s->subsampling[0] * s->subsampling[1] + 7) >> 3; s->subsampling[0] * s->subsampling[1] + 7) >> 3;
if (is_yuv){ if (is_yuv) {
av_fast_padded_malloc(&s->yuv_line, &s->yuv_line_size, bytes_per_row); av_fast_padded_malloc(&s->yuv_line, &s->yuv_line_size, bytes_per_row);
if (s->yuv_line == NULL){ if (s->yuv_line == NULL) {
av_log(s->avctx, AV_LOG_ERROR, "Not enough memory\n"); av_log(s->avctx, AV_LOG_ERROR, "Not enough memory\n");
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
...@@ -366,14 +370,13 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, ...@@ -366,14 +370,13 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
goto fail; goto fail;
} }
s->strip_offsets[0] = ptr - pkt->data; s->strip_offsets[0] = ptr - pkt->data;
zn = 0; zn = 0;
for (j = 0; j < s->rps; j++) { for (j = 0; j < s->rps; j++) {
if (is_yuv){ if (is_yuv) {
pack_yuv(s, s->yuv_line, j); pack_yuv(s, s->yuv_line, j);
memcpy(zbuf + zn, s->yuv_line, bytes_per_row); memcpy(zbuf + zn, s->yuv_line, bytes_per_row);
j += s->subsampling[1] - 1; j += s->subsampling[1] - 1;
} } else
else
memcpy(zbuf + j * bytes_per_row, memcpy(zbuf + j * bytes_per_row,
p->data[0] + j * p->linesize[0], bytes_per_row); p->data[0] + j * p->linesize[0], bytes_per_row);
zn += bytes_per_row; zn += bytes_per_row;
...@@ -384,97 +387,99 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, ...@@ -384,97 +387,99 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
av_log(s->avctx, AV_LOG_ERROR, "Encode strip failed\n"); av_log(s->avctx, AV_LOG_ERROR, "Encode strip failed\n");
goto fail; goto fail;
} }
ptr += ret; ptr += ret;
s->strip_sizes[0] = ptr - pkt->data - s->strip_offsets[0]; s->strip_sizes[0] = ptr - pkt->data - s->strip_offsets[0];
} else } else
#endif #endif
{ {
if (s->compr == TIFF_LZW) { if (s->compr == TIFF_LZW) {
s->lzws = av_malloc(ff_lzw_encode_state_size); s->lzws = av_malloc(ff_lzw_encode_state_size);
if (!s->lzws) { if (!s->lzws) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
}
} }
for (i = 0; i < s->height; i++) { }
if (s->strip_sizes[i / s->rps] == 0) { for (i = 0; i < s->height; i++) {
if(s->compr == TIFF_LZW){ if (s->strip_sizes[i / s->rps] == 0) {
ff_lzw_encode_init(s->lzws, ptr, s->buf_size - (*s->buf - s->buf_start), if (s->compr == TIFF_LZW) {
12, FF_LZW_TIFF, put_bits); ff_lzw_encode_init(s->lzws, ptr,
} s->buf_size - (*s->buf - s->buf_start),
s->strip_offsets[i / s->rps] = ptr - pkt->data; 12, FF_LZW_TIFF, put_bits);
}
if (is_yuv){
pack_yuv(s, s->yuv_line, i);
ret = encode_strip(s, 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;
}
s->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);
s->strip_sizes[(i / s->rps )] += ret ;
ptr += ret;
} }
s->strip_offsets[i / s->rps] = ptr - pkt->data;
}
if (is_yuv) {
pack_yuv(s, s->yuv_line, i);
ret = encode_strip(s, 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;
} }
if(s->compr == TIFF_LZW) s->strip_sizes[i / s->rps] += ret;
av_free(s->lzws); 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);
s->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;
add_entry1(s,TIFF_SUBFILE, TIFF_LONG, 0); add_entry1(s, TIFF_SUBFILE, TIFF_LONG, 0);
add_entry1(s,TIFF_WIDTH, TIFF_LONG, s->width); add_entry1(s, TIFF_WIDTH, TIFF_LONG, s->width);
add_entry1(s,TIFF_HEIGHT, TIFF_LONG, s->height); add_entry1(s, TIFF_HEIGHT, TIFF_LONG, s->height);
if (s->bpp_tab_size) 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_COMPR, TIFF_SHORT, s->compr);
add_entry1(s,TIFF_INVERT, TIFF_SHORT, s->photometric_interpretation); add_entry1(s, TIFF_INVERT, TIFF_SHORT, s->photometric_interpretation);
add_entry(s, TIFF_STRIP_OFFS, TIFF_LONG, strips, s->strip_offsets); add_entry(s, TIFF_STRIP_OFFS, TIFF_LONG, strips, s->strip_offsets);
if (s->bpp_tab_size) 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_entry1(s, TIFF_ROWSPERSTRIP, TIFF_LONG, s->rps);
add_entry(s, TIFF_STRIP_SIZE, TIFF_LONG, strips, s->strip_sizes); add_entry(s, TIFF_STRIP_SIZE, TIFF_LONG, strips, s->strip_sizes);
add_entry(s, TIFF_XRES, TIFF_RATIONAL, 1, res); add_entry(s, TIFF_XRES, TIFF_RATIONAL, 1, res);
add_entry(s, TIFF_YRES, 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_RES_UNIT, TIFF_SHORT, 2);
if(!(avctx->flags & CODEC_FLAG_BITEXACT)) if (!(avctx->flags & CODEC_FLAG_BITEXACT))
add_entry(s, TIFF_SOFTWARE_NAME, TIFF_STRING, add_entry(s, TIFF_SOFTWARE_NAME, TIFF_STRING,
strlen(LIBAVCODEC_IDENT) + 1, LIBAVCODEC_IDENT); strlen(LIBAVCODEC_IDENT) + 1, LIBAVCODEC_IDENT);
if (avctx->pix_fmt == AV_PIX_FMT_PAL8) { if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
uint16_t pal[256 * 3]; uint16_t pal[256 * 3];
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
uint32_t rgb = *(uint32_t *) (p->data[1] + i * 4); uint32_t rgb = *(uint32_t *) (p->data[1] + i * 4);
pal[i] = ((rgb >> 16) & 0xff) * 257; pal[i] = ((rgb >> 16) & 0xff) * 257;
pal[i + 256] = ((rgb >> 8 ) & 0xff) * 257; pal[i + 256] = ((rgb >> 8) & 0xff) * 257;
pal[i + 512] = ( rgb & 0xff) * 257; pal[i + 512] = (rgb & 0xff) * 257;
} }
add_entry(s, TIFF_PAL, TIFF_SHORT, 256 * 3, pal); add_entry(s, TIFF_PAL, TIFF_SHORT, 256 * 3, pal);
} }
if (alpha) if (alpha)
add_entry1(s,TIFF_EXTRASAMPLES, TIFF_SHORT, 2); add_entry1(s,TIFF_EXTRASAMPLES, TIFF_SHORT, 2);
if (is_yuv){ if (is_yuv) {
/** according to CCIR Recommendation 601.1 */ /** 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_YCBCR_SUBSAMPLING, TIFF_SHORT, 2, s->subsampling);
if (avctx->chroma_sample_location == AVCHROMA_LOC_TOPLEFT) if (avctx->chroma_sample_location == AVCHROMA_LOC_TOPLEFT)
add_entry1(s, TIFF_YCBCR_POSITIONING, TIFF_SHORT, 2); add_entry1(s, TIFF_YCBCR_POSITIONING, TIFF_SHORT, 2);
add_entry(s, TIFF_REFERENCE_BW, TIFF_RATIONAL, 6, refbw); add_entry(s, TIFF_REFERENCE_BW, TIFF_RATIONAL, 6, refbw);
} }
bytestream_put_le32(&offset, ptr - pkt->data); // 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); ret = AVERROR(EINVAL);
...@@ -507,12 +512,12 @@ static av_cold int encode_close(AVCodecContext *avctx) ...@@ -507,12 +512,12 @@ static av_cold int encode_close(AVCodecContext *avctx)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {
{"dpi", "set the image resolution (in dpi)", OFFSET(dpi), AV_OPT_TYPE_INT, {.i64 = 72}, 1, 0x10000, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_ENCODING_PARAM}, {"dpi", "set the image resolution (in dpi)", OFFSET(dpi), AV_OPT_TYPE_INT, {.i64 = 72}, 1, 0x10000, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_ENCODING_PARAM},
{ "compression_algo", NULL, OFFSET(compr), AV_OPT_TYPE_INT, {.i64 = TIFF_PACKBITS}, TIFF_RAW, TIFF_DEFLATE, VE, "compression_algo" }, { "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" }, { "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" }, { "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" }, { "lzw", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_LZW }, 0, 0, VE, "compression_algo" },
#if CONFIG_ZLIB #if CONFIG_ZLIB
{ "deflate", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = TIFF_DEFLATE}, 0, 0, VE, "compression_algo" }, { "deflate", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_DEFLATE }, 0, 0, VE, "compression_algo" },
#endif #endif
{ NULL }, { NULL },
}; };
...@@ -526,6 +531,7 @@ static const AVClass tiffenc_class = { ...@@ -526,6 +531,7 @@ static const AVClass tiffenc_class = {
AVCodec ff_tiff_encoder = { AVCodec ff_tiff_encoder = {
.name = "tiff", .name = "tiff",
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_TIFF, .id = AV_CODEC_ID_TIFF,
.priv_data_size = sizeof(TiffEncoderContext), .priv_data_size = sizeof(TiffEncoderContext),
...@@ -541,6 +547,5 @@ AVCodec ff_tiff_encoder = { ...@@ -541,6 +547,5 @@ AVCodec ff_tiff_encoder = {
AV_PIX_FMT_RGBA, AV_PIX_FMT_RGBA64LE, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGBA64LE,
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}, },
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
.priv_class = &tiffenc_class, .priv_class = &tiffenc_class,
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment