diff options
author | Paul B Mahol <onemda@gmail.com> | 2019-08-31 21:14:28 +0200 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2019-09-02 09:26:53 +0200 |
commit | cae29820777f9a41d56c94cadec14de948c85f62 (patch) | |
tree | ea20b3dc15fcae611b55085ff2c7f4ad073bcdbf /libavcodec/tiff.c | |
parent | d7529b03bac49370aa4369b39a0dbf16724334d2 (diff) | |
download | ffmpeg-cae29820777f9a41d56c94cadec14de948c85f62.tar.gz |
avcodec/tiff: rewrite lut handling
Remove endianess hack.
Diffstat (limited to 'libavcodec/tiff.c')
-rw-r--r-- | libavcodec/tiff.c | 60 |
1 files changed, 12 insertions, 48 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 61ba99a192..9f24796a88 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -84,7 +84,7 @@ typedef struct TiffContext { uint8_t pattern[4]; unsigned black_level; unsigned white_level; - const uint16_t *dng_lut; // Pointer to DNG linearization table + uint16_t dng_lut[65536]; uint32_t sub_ifd; uint16_t cur_page; @@ -1079,50 +1079,19 @@ static int init_image(TiffContext *s, ThreadFrame *frame) case 10101: case 10121: case 10141: - switch (AV_RL32(s->pattern)) { - case 0x02010100: - s->avctx->pix_fmt = s->le ? AV_PIX_FMT_BAYER_RGGB16LE : AV_PIX_FMT_BAYER_RGGB16BE; - break; - case 0x00010102: - s->avctx->pix_fmt = s->le ? AV_PIX_FMT_BAYER_BGGR16LE : AV_PIX_FMT_BAYER_BGGR16BE; - break; - case 0x01000201: - s->avctx->pix_fmt = s->le ? AV_PIX_FMT_BAYER_GBRG16LE : AV_PIX_FMT_BAYER_GBRG16BE; - break; - case 0x01020001: - s->avctx->pix_fmt = s->le ? AV_PIX_FMT_BAYER_GRBG16LE : AV_PIX_FMT_BAYER_GRBG16BE; - break; - default: - av_log(s->avctx, AV_LOG_ERROR, "Unsupported Bayer pattern: 0x%X\n", - AV_RL32(s->pattern)); - return AVERROR_PATCHWELCOME; - } - /* Force endianness as mentioned in 'DNG Specification: Chapter 3: BitsPerSample' - NOTE: The spec actually specifies big-endian, not sure why we need little-endian, but - such images don't work otherwise. Examples are images produced by Zenmuse X7. */ - if ((s->tiff_type == TIFF_TYPE_DNG || s->tiff_type == TIFF_TYPE_CINEMADNG) - && (s->bpp != 8 && s->bpp != 16 && s->bpp != 32)) { - switch (s->avctx->pix_fmt) { - case AV_PIX_FMT_BAYER_RGGB16BE: s->avctx->pix_fmt = AV_PIX_FMT_BAYER_RGGB16LE; break; - case AV_PIX_FMT_BAYER_BGGR16BE: s->avctx->pix_fmt = AV_PIX_FMT_BAYER_BGGR16LE; break; - case AV_PIX_FMT_BAYER_GBRG16BE: s->avctx->pix_fmt = AV_PIX_FMT_BAYER_GBRG16LE; break; - case AV_PIX_FMT_BAYER_GRBG16BE: s->avctx->pix_fmt = AV_PIX_FMT_BAYER_GRBG16LE; break; - } - } - break; case 10161: switch (AV_RL32(s->pattern)) { case 0x02010100: - s->avctx->pix_fmt = s->le ? AV_PIX_FMT_BAYER_RGGB16LE : AV_PIX_FMT_BAYER_RGGB16BE; + s->avctx->pix_fmt = AV_PIX_FMT_BAYER_RGGB16; break; case 0x00010102: - s->avctx->pix_fmt = s->le ? AV_PIX_FMT_BAYER_BGGR16LE : AV_PIX_FMT_BAYER_BGGR16BE; + s->avctx->pix_fmt = AV_PIX_FMT_BAYER_BGGR16; break; case 0x01000201: - s->avctx->pix_fmt = s->le ? AV_PIX_FMT_BAYER_GBRG16LE : AV_PIX_FMT_BAYER_GBRG16BE; + s->avctx->pix_fmt = AV_PIX_FMT_BAYER_GBRG16; break; case 0x01020001: - s->avctx->pix_fmt = s->le ? AV_PIX_FMT_BAYER_GRBG16LE : AV_PIX_FMT_BAYER_GRBG16BE; + s->avctx->pix_fmt = AV_PIX_FMT_BAYER_GRBG16; break; default: av_log(s->avctx, AV_LOG_ERROR, "Unsupported Bayer pattern: 0x%X\n", @@ -1435,18 +1404,10 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) else if (count > 1) s->sub_ifd = ff_tget(&s->gb, TIFF_LONG, s->le); /** Only get the first SubIFD */ break; - case DNG_LINEARIZATION_TABLE: { - uint32_t lut_offset = value; - uint32_t lut_size = count; - uint32_t lut_wanted_size = 1 << s->bpp; - if (lut_wanted_size != lut_size) - av_log(s->avctx, AV_LOG_WARNING, "DNG contains LUT with invalid size (%"PRIu32"), disabling LUT\n", lut_size); - else if (lut_offset >= bytestream2_size(&s->gb)) - av_log(s->avctx, AV_LOG_WARNING, "DNG contains LUT with invalid offset (%"PRIu32"), disabling LUT\n", lut_offset); - else - s->dng_lut = (uint16_t*)(s->gb.buffer + lut_offset); + case DNG_LINEARIZATION_TABLE: + for (int i = 0; i < FFMIN(count, 1 << s->bpp); i++) + s->dng_lut[i] = ff_tget(&s->gb, type, s->le); break; - } case DNG_BLACK_LEVEL: if (count > 1) { /* Use the first value in the pattern (assume they're all the same) */ if (type == TIFF_RATIONAL) { @@ -1794,7 +1755,10 @@ again: s->is_tiled = 0; s->is_jpeg = 0; s->cur_page = 0; - s->dng_lut = NULL; + + for (i = 0; i < 65536; i++) + s->dng_lut[i] = i; + free_geotags(s); // Reset these offsets so we can tell if they were set this frame |