*/
#include "avcodec.h"
+#include "bytestream.h"
#if CONFIG_ZLIB
#include <zlib.h>
#endif
#include "lzw.h"
#include "tiff.h"
+#include "tiff_data.h"
#include "faxcompr.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h"
+#include "libavutil/avstring.h"
typedef struct TiffContext {
AVCodecContext *avctx;
AVFrame picture;
+ GetByteContext gb;
int width, height;
unsigned int bpp, bppcount;
int strips, rps, sstype;
int sot;
- const uint8_t *stripdata;
- const uint8_t *stripsizes;
- int stripsize, stripoff;
+ int stripsizesoff, stripsize, stripoff, strippos;
LZWState *lzw;
+
+ int geotag_count;
+ TiffGeoTag *geotags;
} TiffContext;
-static unsigned tget_short(const uint8_t **p, int le)
+static unsigned tget_short(GetByteContext *gb, int le)
{
- unsigned v = le ? AV_RL16(*p) : AV_RB16(*p);
- *p += 2;
+ unsigned v = le ? bytestream2_get_le16u(gb) : bytestream2_get_be16u(gb);
return v;
}
-static unsigned tget_long(const uint8_t **p, int le)
+static unsigned tget_long(GetByteContext *gb, int le)
{
- unsigned v = le ? AV_RL32(*p) : AV_RB32(*p);
- *p += 4;
+ unsigned v = le ? bytestream2_get_le32u(gb) : bytestream2_get_be32u(gb);
return v;
}
-static unsigned tget(const uint8_t **p, int type, int le)
+static double tget_double(GetByteContext *gb, int le)
+{
+ av_alias64 i = { .u64 = le ? bytestream2_get_le64u(gb) : bytestream2_get_be64u(gb)};
+ return i.f64;
+}
+
+static unsigned tget(GetByteContext *gb, 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);
+ case TIFF_BYTE : return bytestream2_get_byteu(gb);
+ case TIFF_SHORT: return tget_short(gb, le);
+ case TIFF_LONG : return tget_long(gb, le);
default : return UINT_MAX;
}
}
+static void free_geotags(TiffContext *const s)
+{
+ int i;
+ for (i = 0; i < s->geotag_count; i++) {
+ if (s->geotags[i].val)
+ av_freep(&s->geotags[i].val);
+ }
+ av_freep(&s->geotags);
+}
+
+#define RET_GEOKEY(TYPE, array, element)\
+ if (key >= TIFF_##TYPE##_KEY_ID_OFFSET &&\
+ key - TIFF_##TYPE##_KEY_ID_OFFSET < FF_ARRAY_ELEMS(ff_tiff_##array##_name_type_map))\
+ return ff_tiff_##array##_name_type_map[key - TIFF_##TYPE##_KEY_ID_OFFSET].element;
+
+static const char *get_geokey_name(int key)
+{
+ RET_GEOKEY(VERT, vert, name);
+ RET_GEOKEY(PROJ, proj, name);
+ RET_GEOKEY(GEOG, geog, name);
+ RET_GEOKEY(CONF, conf, name);
+
+ return NULL;
+}
+
+static int get_geokey_type(int key)
+{
+ RET_GEOKEY(VERT, vert, type);
+ RET_GEOKEY(PROJ, proj, type);
+ RET_GEOKEY(GEOG, geog, type);
+ RET_GEOKEY(CONF, conf, type);
+
+ return AVERROR_INVALIDDATA;
+}
+
+static int cmp_id_key(const void *id, const void *k)
+{
+ return *(const int*)id - ((const TiffGeoTagKeyName*)k)->key;
+}
+
+static const char *search_keyval(const TiffGeoTagKeyName *keys, int n, int id)
+{
+ return ((TiffGeoTagKeyName*)bsearch(&id, keys, n, sizeof(keys[0]), cmp_id_key))->name;
+}
+
+static char *get_geokey_val(int key, int val)
+{
+ char *ap;
+
+ if (val == TIFF_GEO_KEY_UNDEFINED)
+ return av_strdup("undefined");
+ if (val == TIFF_GEO_KEY_USER_DEFINED)
+ return av_strdup("User-Defined");
+
+#define RET_GEOKEY_VAL(TYPE, array)\
+ if (val >= TIFF_##TYPE##_OFFSET &&\
+ val - TIFF_##TYPE##_OFFSET < FF_ARRAY_ELEMS(ff_tiff_##array##_codes))\
+ return av_strdup(ff_tiff_##array##_codes[val - TIFF_##TYPE##_OFFSET]);
+
+ switch (key) {
+ case TIFF_GT_MODEL_TYPE_GEOKEY:
+ RET_GEOKEY_VAL(GT_MODEL_TYPE, gt_model_type);
+ break;
+ case TIFF_GT_RASTER_TYPE_GEOKEY:
+ RET_GEOKEY_VAL(GT_RASTER_TYPE, gt_raster_type);
+ break;
+ case TIFF_GEOG_LINEAR_UNITS_GEOKEY:
+ case TIFF_PROJ_LINEAR_UNITS_GEOKEY:
+ case TIFF_VERTICAL_UNITS_GEOKEY:
+ RET_GEOKEY_VAL(LINEAR_UNIT, linear_unit);
+ break;
+ case TIFF_GEOG_ANGULAR_UNITS_GEOKEY:
+ case TIFF_GEOG_AZIMUTH_UNITS_GEOKEY:
+ RET_GEOKEY_VAL(ANGULAR_UNIT, angular_unit);
+ break;
+ case TIFF_GEOGRAPHIC_TYPE_GEOKEY:
+ RET_GEOKEY_VAL(GCS_TYPE, gcs_type);
+ RET_GEOKEY_VAL(GCSE_TYPE, gcse_type);
+ break;
+ case TIFF_GEOG_GEODETIC_DATUM_GEOKEY:
+ RET_GEOKEY_VAL(GEODETIC_DATUM, geodetic_datum);
+ RET_GEOKEY_VAL(GEODETIC_DATUM_E, geodetic_datum_e);
+ break;
+ case TIFF_GEOG_ELLIPSOID_GEOKEY:
+ RET_GEOKEY_VAL(ELLIPSOID, ellipsoid);
+ break;
+ case TIFF_GEOG_PRIME_MERIDIAN_GEOKEY:
+ RET_GEOKEY_VAL(PRIME_MERIDIAN, prime_meridian);
+ break;
+ case TIFF_PROJECTED_CS_TYPE_GEOKEY:
+ return av_strdup(search_keyval(ff_tiff_proj_cs_type_codes, FF_ARRAY_ELEMS(ff_tiff_proj_cs_type_codes), val));
+ break;
+ case TIFF_PROJECTION_GEOKEY:
+ return av_strdup(search_keyval(ff_tiff_projection_codes, FF_ARRAY_ELEMS(ff_tiff_projection_codes), val));
+ break;
+ case TIFF_PROJ_COORD_TRANS_GEOKEY:
+ RET_GEOKEY_VAL(COORD_TRANS, coord_trans);
+ break;
+ case TIFF_VERTICAL_CS_TYPE_GEOKEY:
+ RET_GEOKEY_VAL(VERT_CS, vert_cs);
+ RET_GEOKEY_VAL(ORTHO_VERT_CS, ortho_vert_cs);
+ break;
+
+ }
+
+ ap = av_malloc(14);
+ if (ap)
+ snprintf(ap, 14, "Unknown-%d", val);
+ return ap;
+}
+
+static char *doubles2str(double *dp, int count, const char *sep)
+{
+ int i;
+ char *ap, *ap0;
+ if (!sep) sep = ", ";
+ ap = av_malloc((15 + strlen(sep)) * count);
+ if (!ap)
+ return NULL;
+ ap0 = ap;
+ ap[0] = '\0';
+ for (i = 0; i < count; i++) {
+ int l = snprintf(ap, 15 + strlen(sep), "%f%s", dp[i], sep);
+ ap += l;
+ }
+ ap0[strlen(ap0) - strlen(sep)] = '\0';
+ return ap0;
+}
+
+static char *shorts2str(int16_t *sp, int count, const char *sep)
+{
+ int i;
+ char *ap, *ap0;
+ if (!sep) sep = ", ";
+ ap = av_malloc((5 + strlen(sep)) * count);
+ if (!ap)
+ return NULL;
+ ap0 = ap;
+ ap[0] = '\0';
+ for (i = 0; i < count; i++) {
+ int l = snprintf(ap, 5 + strlen(sep), "%d%s", sp[i], sep);
+ ap += l;
+ }
+ ap0[strlen(ap0) - strlen(sep)] = '\0';
+ return ap0;
+}
+
+static int add_doubles_metadata(int count,
+ const char *name, const char *sep,
+ TiffContext *s)
+{
+ char *ap;
+ int i;
+ double *dp;
+
+ if (count >= INT_MAX / sizeof(int64_t))
+ return AVERROR_INVALIDDATA;
+ if (bytestream2_get_bytes_left(&s->gb) < count * sizeof(int64_t))
+ return AVERROR_INVALIDDATA;
+
+ dp = av_malloc(count * sizeof(double));
+ if (!dp)
+ return AVERROR(ENOMEM);
+
+ for (i = 0; i < count; i++)
+ dp[i] = tget_double(&s->gb, s->le);
+ ap = doubles2str(dp, count, sep);
+ av_freep(&dp);
+ if (!ap)
+ return AVERROR(ENOMEM);
+ av_dict_set(&s->picture.metadata, name, ap, AV_DICT_DONT_STRDUP_VAL);
+ return 0;
+}
+
+static int add_shorts_metadata(int count, const char *name,
+ const char *sep, TiffContext *s)
+{
+ char *ap;
+ int i;
+ int16_t *sp;
+
+ if (count >= INT_MAX / sizeof(int16_t))
+ return AVERROR_INVALIDDATA;
+ if (bytestream2_get_bytes_left(&s->gb) < count * sizeof(int16_t))
+ return AVERROR_INVALIDDATA;
+
+ sp = av_malloc(count * sizeof(int16_t));
+ if (!sp)
+ return AVERROR(ENOMEM);
+
+ for (i = 0; i < count; i++)
+ sp[i] = tget_short(&s->gb, s->le);
+ ap = shorts2str(sp, count, sep);
+ av_freep(&sp);
+ if (!ap)
+ return AVERROR(ENOMEM);
+ av_dict_set(&s->picture.metadata, name, ap, AV_DICT_DONT_STRDUP_VAL);
+ return 0;
+}
+
+static int add_string_metadata(int count, const char *name,
+ TiffContext *s)
+{
+ char *value;
+
+ if (bytestream2_get_bytes_left(&s->gb) < count)
+ return AVERROR_INVALIDDATA;
+
+ value = av_malloc(count + 1);
+ if (!value)
+ return AVERROR(ENOMEM);
+
+ bytestream2_get_bufferu(&s->gb, value, count);
+ value[count] = 0;
+
+ av_dict_set(&s->picture.metadata, name, value, AV_DICT_DONT_STRDUP_VAL);
+ return 0;
+}
+
+static int add_metadata(int count, int type,
+ const char *name, const char *sep, TiffContext *s)
+{
+ switch(type) {
+ case TIFF_DOUBLE: return add_doubles_metadata(count, name, sep, s);
+ case TIFF_SHORT : return add_shorts_metadata(count, name, sep, s);
+ case TIFF_STRING: return add_string_metadata(count, name, s);
+ default : return AVERROR_INVALIDDATA;
+ };
+}
+
#if CONFIG_ZLIB
static int tiff_uncompress(uint8_t *dst, unsigned long *len, const uint8_t *src,
int size)
return 0;
}
-static int tiff_decode_tag(TiffContext *s, const uint8_t *start,
- const uint8_t *buf, const uint8_t *end_buf)
+static int tiff_decode_tag(TiffContext *s)
{
unsigned tag, type, count, off, value = 0;
- int i, j;
+ int i, j, k, pos, start;
+ int ret;
uint32_t *pal;
- const uint8_t *rp, *gp, *bp;
+ double *dp;
- if (end_buf - buf < 12)
- return -1;
- tag = tget_short(&buf, s->le);
- type = tget_short(&buf, s->le);
- count = tget_long(&buf, s->le);
- off = tget_long(&buf, s->le);
+ tag = tget_short(&s->gb, s->le);
+ type = tget_short(&s->gb, s->le);
+ count = tget_long(&s->gb, s->le);
+ off = tget_long(&s->gb, s->le);
+ start = bytestream2_tell(&s->gb);
if (type == 0 || type >= FF_ARRAY_ELEMS(type_sizes)) {
av_log(s->avctx, AV_LOG_DEBUG, "Unknown tiff type (%u) encountered\n",
switch (type) {
case TIFF_BYTE:
case TIFF_SHORT:
- buf -= 4;
- value = tget(&buf, type, s->le);
- buf = NULL;
+ bytestream2_seek(&s->gb, -4, SEEK_CUR);
+ value = tget(&s->gb, type, s->le);
break;
case TIFF_LONG:
value = off;
- buf = NULL;
break;
case TIFF_STRING:
if (count <= 4) {
- buf -= 4;
+ bytestream2_seek(&s->gb, -4, SEEK_CUR);
break;
}
default:
value = UINT_MAX;
- buf = start + off;
+ bytestream2_seek(&s->gb, off, SEEK_SET);
}
} else {
if (count <= 4 && type_sizes[type] * count <= 4) {
- buf -= 4;
+ bytestream2_seek(&s->gb, -4, SEEK_CUR);
} else {
- buf = start + off;
+ bytestream2_seek(&s->gb, off, SEEK_SET);
}
}
- 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;
case TIFF_SHORT:
case TIFF_LONG:
s->bpp = 0;
- for (i = 0; i < count && buf < end_buf; i++)
- s->bpp += tget(&buf, type, s->le);
+ if (bytestream2_get_bytes_left(&s->gb) < type_sizes[type] * count)
+ return -1;
+ for (i = 0; i < count; i++)
+ s->bpp += tget(&s->gb, type, s->le);
break;
default:
s->bpp = -1;
break;
case TIFF_STRIP_OFFS:
if (count == 1) {
- s->stripdata = NULL;
+ s->strippos = 0;
s->stripoff = value;
} else
- s->stripdata = start + off;
+ s->strippos = off;
s->strips = count;
if (s->strips == 1)
s->rps = s->height;
s->sot = type;
- if (s->stripdata > end_buf) {
+ if (s->strippos > bytestream2_size(&s->gb)) {
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->stripsizesoff = 0;
s->stripsize = value;
s->strips = 1;
} else {
- s->stripsizes = start + off;
+ s->stripsizesoff = off;
}
s->strips = count;
s->sstype = type;
- if (s->stripsizes > end_buf) {
+ if (s->stripsizesoff > bytestream2_size(&s->gb)) {
av_log(s->avctx, AV_LOG_ERROR,
"Tag referencing position outside the image\n");
return -1;
case TIFF_PAL:
pal = (uint32_t *) s->palette;
off = type_sizes[type];
- if (count / 3 > 256 || end_buf - buf < count / 3 * off * 3)
+ if (count / 3 > 256 || bytestream2_get_bytes_left(&s->gb) < count / 3 * off * 3)
return -1;
- 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 = 0xff << 24;
- 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;
+ for (k = 2; k >= 0; k--) {
+ for (i = 0; i < count / 3; i++) {
+ if (k == 2)
+ pal[i] = 0xff << 24;
+ j = (tget(&s->gb, type, s->le) >> off) << (k * 8);
+ pal[i] |= j;
+ }
}
s->palette_is_set = 1;
break;
if (s->compr == TIFF_G4)
s->fax_opts = value;
break;
+#define ADD_METADATA(count, name, sep)\
+ if (ret = add_metadata(count, type, name, sep, s) < 0) {\
+ av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");\
+ return ret;\
+ }
+ case TIFF_MODEL_PIXEL_SCALE:
+ ADD_METADATA(count, "ModelPixelScaleTag", NULL);
+ break;
+ case TIFF_MODEL_TRANSFORMATION:
+ ADD_METADATA(count, "ModelTransformationTag", NULL);
+ break;
+ case TIFF_MODEL_TIEPOINT:
+ ADD_METADATA(count, "ModelTiepointTag", NULL);
+ break;
+ case TIFF_GEO_KEY_DIRECTORY:
+ ADD_METADATA(1, "GeoTIFF_Version", NULL);
+ ADD_METADATA(2, "GeoTIFF_Key_Revision", ".");
+ s->geotag_count = tget_short(&s->gb, s->le);
+ if (s->geotag_count > count / 4 - 1) {
+ s->geotag_count = count / 4 - 1;
+ av_log(s->avctx, AV_LOG_WARNING, "GeoTIFF key directory buffer shorter than specified\n");
+ }
+ if (bytestream2_get_bytes_left(&s->gb) < s->geotag_count * sizeof(int16_t) * 4)
+ return -1;
+ s->geotags = av_mallocz(sizeof(TiffGeoTag) * s->geotag_count);
+ if (!s->geotags) {
+ av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
+ return AVERROR(ENOMEM);
+ }
+ for (i = 0; i < s->geotag_count; i++) {
+ s->geotags[i].key = tget_short(&s->gb, s->le);
+ s->geotags[i].type = tget_short(&s->gb, s->le);
+ s->geotags[i].count = tget_short(&s->gb, s->le);
+
+ if (!s->geotags[i].type)
+ s->geotags[i].val = get_geokey_val(s->geotags[i].key, tget_short(&s->gb, s->le));
+ else
+ s->geotags[i].offset = tget_short(&s->gb, s->le);
+ }
+ break;
+ case TIFF_GEO_DOUBLE_PARAMS:
+ if (count >= INT_MAX / sizeof(int64_t))
+ return AVERROR_INVALIDDATA;
+ if (bytestream2_get_bytes_left(&s->gb) < count * sizeof(int64_t))
+ return AVERROR_INVALIDDATA;
+ dp = av_malloc(count * sizeof(double));
+ if (!dp) {
+ av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
+ return AVERROR(ENOMEM);
+ }
+ for (i = 0; i < count; i++)
+ dp[i] = tget_double(&s->gb, s->le);
+ for (i = 0; i < s->geotag_count; i++) {
+ if (s->geotags[i].type == TIFF_GEO_DOUBLE_PARAMS) {
+ if (s->geotags[i].count == 0
+ || s->geotags[i].offset + s->geotags[i].count > count) {
+ av_log(s->avctx, AV_LOG_WARNING, "Invalid GeoTIFF key %d\n", s->geotags[i].key);
+ } else {
+ char *ap = doubles2str(&dp[s->geotags[i].offset], s->geotags[i].count, ", ");
+ if (!ap) {
+ av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
+ av_freep(&dp);
+ return AVERROR(ENOMEM);
+ }
+ s->geotags[i].val = ap;
+ }
+ }
+ }
+ av_freep(&dp);
+ break;
+ case TIFF_GEO_ASCII_PARAMS:
+ pos = bytestream2_tell(&s->gb);
+ for (i = 0; i < s->geotag_count; i++) {
+ if (s->geotags[i].type == TIFF_GEO_ASCII_PARAMS) {
+ if (s->geotags[i].count == 0
+ || s->geotags[i].offset + s->geotags[i].count > count) {
+ av_log(s->avctx, AV_LOG_WARNING, "Invalid GeoTIFF key %d\n", s->geotags[i].key);
+ } else {
+ char *ap;
+
+ bytestream2_seek(&s->gb, pos + s->geotags[i].offset, SEEK_SET);
+ if (bytestream2_get_bytes_left(&s->gb) < s->geotags[i].count)
+ return -1;
+ ap = av_malloc(s->geotags[i].count);
+ if (!ap) {
+ av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
+ return AVERROR(ENOMEM);
+ }
+ bytestream2_get_bufferu(&s->gb, ap, s->geotags[i].count);
+ ap[s->geotags[i].count - 1] = '\0'; //replace the "|" delimiter with a 0 byte
+ s->geotags[i].val = ap;
+ }
+ }
+ }
+ break;
+ case TIFF_ARTIST:
+ ADD_METADATA(count, "artist", NULL);
+ break;
+ case TIFF_COPYRIGHT:
+ ADD_METADATA(count, "copyright", NULL);
+ break;
+ case TIFF_DATE:
+ ADD_METADATA(count, "date", NULL);
+ break;
+ case TIFF_DOCUMENT_NAME:
+ ADD_METADATA(count, "document_name", NULL);
+ break;
+ case TIFF_HOST_COMPUTER:
+ ADD_METADATA(count, "computer", NULL);
+ break;
+ case TIFF_IMAGE_DESCRIPTION:
+ ADD_METADATA(count, "description", NULL);
+ break;
+ case TIFF_MAKE:
+ ADD_METADATA(count, "make", NULL);
+ break;
+ case TIFF_MODEL:
+ ADD_METADATA(count, "model", NULL);
+ break;
+ case TIFF_PAGE_NAME:
+ ADD_METADATA(count, "page_name", NULL);
+ break;
+ case TIFF_PAGE_NUMBER:
+ ADD_METADATA(count, "page_number", " / ");
+ break;
+ case TIFF_SOFTWARE_NAME:
+ ADD_METADATA(count, "software", NULL);
+ break;
default:
av_log(s->avctx, AV_LOG_DEBUG, "Unknown or unsupported tag %d/0X%0X\n",
tag, tag);
}
+ bytestream2_seek(&s->gb, start, SEEK_SET);
return 0;
}
static int decode_frame(AVCodecContext *avctx,
void *data, int *data_size, AVPacket *avpkt)
{
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
TiffContext *const s = avctx->priv_data;
AVFrame *picture = data;
AVFrame *const p = &s->picture;
- const uint8_t *orig_buf = buf, *end_buf = buf + buf_size;
unsigned off;
int id, le, ret;
int i, j, entries;
int stride;
unsigned soff, ssize;
uint8_t *dst;
+ GetByteContext stripsizes;
+ GetByteContext stripdata;
+
+ bytestream2_init(&s->gb, avpkt->data, avpkt->size);
//parse image header
- if (end_buf - buf < 8)
+ if (avpkt->size < 8)
return AVERROR_INVALIDDATA;
- id = AV_RL16(buf);
- buf += 2;
+ id = bytestream2_get_le16u(&s->gb);
if (id == 0x4949)
le = 1;
else if (id == 0x4D4D)
s->invert = 0;
s->compr = TIFF_RAW;
s->fill_order = 0;
+ free_geotags(s);
+ /* free existing metadata */
+ av_dict_free(&s->picture.metadata);
+
// 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) {
+ if (tget_short(&s->gb, le) != 42) {
av_log(avctx, AV_LOG_ERROR,
"The answer to life, universe and everything is not correct!\n");
return -1;
}
- // Reset these pointers so we can tell if they were set this frame
- s->stripsizes = s->stripdata = NULL;
+ // Reset these offsets so we can tell if they were set this frame
+ s->stripsizesoff = s->strippos = 0;
/* parse image file directory */
- off = tget_long(&buf, le);
- if (off >= UINT_MAX - 14 || end_buf - orig_buf < off + 14) {
+ off = tget_long(&s->gb, le);
+ if (off >= UINT_MAX - 14 || avpkt->size < off + 14) {
av_log(avctx, AV_LOG_ERROR, "IFD offset is greater than image size\n");
return AVERROR_INVALIDDATA;
}
- buf = orig_buf + off;
- entries = tget_short(&buf, le);
+ bytestream2_seek(&s->gb, off, SEEK_SET);
+ entries = tget_short(&s->gb, le);
+ if (bytestream2_get_bytes_left(&s->gb) < entries * 12)
+ return AVERROR_INVALIDDATA;
for (i = 0; i < entries; i++) {
- if (tiff_decode_tag(s, orig_buf, buf, end_buf) < 0)
+ if (tiff_decode_tag(s) < 0)
return -1;
- buf += 12;
}
- if (!s->stripdata && !s->stripoff) {
+
+ for (i = 0; i<s->geotag_count; i++) {
+ const char *keyname = get_geokey_name(s->geotags[i].key);
+ if (!keyname) {
+ av_log(avctx, AV_LOG_WARNING, "Unknown or unsupported GeoTIFF key %d\n", s->geotags[i].key);
+ continue;
+ }
+ if (get_geokey_type(s->geotags[i].key) != s->geotags[i].type) {
+ av_log(avctx, AV_LOG_WARNING, "Type of GeoTIFF key %d is wrong\n", s->geotags[i].key);
+ continue;
+ }
+ ret = av_dict_set(&s->picture.metadata, keyname, s->geotags[i].val, 0);
+ if (ret<0) {
+ av_log(avctx, AV_LOG_ERROR, "Writing metadata with key '%s' failed\n", keyname);
+ return ret;
+ }
+ }
+
+ if (!s->strippos && !s->stripoff) {
av_log(avctx, AV_LOG_ERROR, "Image data is missing\n");
return -1;
}
if (s->strips == 1 && !s->stripsize) {
av_log(avctx, AV_LOG_WARNING, "Image data size missing\n");
- s->stripsize = buf_size - s->stripoff;
+ s->stripsize = avpkt->size - s->stripoff;
}
stride = p->linesize[0];
dst = p->data[0];
+
+ if (s->stripsizesoff) {
+ if (s->stripsizesoff >= avpkt->size)
+ return AVERROR_INVALIDDATA;
+ bytestream2_init(&stripsizes, avpkt->data + s->stripsizesoff, avpkt->size - s->stripsizesoff);
+ }
+ if (s->strippos) {
+ if (s->strippos >= avpkt->size)
+ return AVERROR_INVALIDDATA;
+ bytestream2_init(&stripdata, avpkt->data + s->strippos, avpkt->size - s->strippos);
+ }
+
for (i = 0; i < s->height; i += s->rps) {
- if (s->stripsizes) {
- if (s->stripsizes >= end_buf)
- return AVERROR_INVALIDDATA;
- ssize = tget(&s->stripsizes, s->sstype, s->le);
- } else
+ if (s->stripsizesoff)
+ ssize = tget(&stripsizes, s->sstype, s->le);
+ else
ssize = s->stripsize;
- if (s->stripdata) {
- if (s->stripdata >= end_buf)
- return AVERROR_INVALIDDATA;
- soff = tget(&s->stripdata, s->sot, s->le);
- } else
+ if (s->strippos)
+ soff = tget(&stripdata, s->sot, s->le);
+ else
soff = s->stripoff;
- if (soff > buf_size || ssize > buf_size - soff) {
+ if (soff > avpkt->size || ssize > avpkt->size - soff) {
av_log(avctx, AV_LOG_ERROR, "Invalid strip size/offset\n");
return -1;
}
- if (tiff_unpack_strip(s, dst, stride, orig_buf + soff, ssize,
+ if (tiff_unpack_strip(s, dst, stride, avpkt->data + soff, ssize,
FFMIN(s->rps, s->height - i)) < 0)
break;
dst += s->rps * stride;
*picture = s->picture;
*data_size = sizeof(AVPicture);
- return buf_size;
+ return avpkt->size;
}
static av_cold int tiff_init(AVCodecContext *avctx)
{
TiffContext *const s = avctx->priv_data;
+ free_geotags(s);
+ if (avctx->coded_frame && avctx->coded_frame->metadata)
+ av_dict_free(&avctx->coded_frame->metadata);
+
ff_lzw_decode_close(&s->lzw);
if (s->picture.data[0])
avctx->release_buffer(avctx, &s->picture);
AVCodec ff_tiff_decoder = {
.name = "tiff",
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_TIFF,
+ .id = AV_CODEC_ID_TIFF,
.priv_data_size = sizeof(TiffContext),
.init = tiff_init,
.close = tiff_end,
projects / ffmpeg / blobdiff