[FFmpeg-devel,v13,14/14] lavc/tiff: Default-initialize WhiteLevel DNG tag value

Submitted by velocityra@gmail.com on Aug. 10, 2019, 10:19 p.m.

Details

Message ID 20190810221934.44996-14-velocityra@gmail.com
State New
Headers show

Commit Message

velocityra@gmail.com Aug. 10, 2019, 10:19 p.m.
From: Nick Renieris <velocityra@gmail.com>

Initialized to `(2 ^ BitsPerSample) - 1` as per the DNG Specification.

Also make sure that `BlackLevel < WhiteLevel`.

This fixes decoding for "X7 CinemaDNG" samples here:
- https://www.dji.com/gr/zenmuse-x7/info#downloads

Signed-off-by: Nick Renieris <velocityra@gmail.com>
---
 libavcodec/tiff.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

Comments

Michael Niedermayer Aug. 11, 2019, 7:36 a.m.
On Sun, Aug 11, 2019 at 01:19:34AM +0300, Nick Renieris wrote:
> From: Nick Renieris <velocityra@gmail.com>
> 
> Initialized to `(2 ^ BitsPerSample) - 1` as per the DNG Specification.
> 
> Also make sure that `BlackLevel < WhiteLevel`.
> 
> This fixes decoding for "X7 CinemaDNG" samples here:
> - https://www.dji.com/gr/zenmuse-x7/info#downloads
> 
> Signed-off-by: Nick Renieris <velocityra@gmail.com>
> ---
>  libavcodec/tiff.c | 20 +++++++++++++++++---
>  1 file changed, 17 insertions(+), 3 deletions(-)

This breaks
./ffplay https://samples.ffmpeg.org/image-samples/flower-separated-contig-16.tif

[...]

Patch hide | download patch | download mbox

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index b9aa4efd02..b985f19fe2 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -1773,6 +1773,7 @@  static int decode_frame(AVCodecContext *avctx,
     GetByteContext stripsizes;
     GetByteContext stripdata;
     int retry_for_subifd, retry_for_page;
+    int is_dng;
 
     bytestream2_init(&s->gb, avpkt->data, avpkt->size);
 
@@ -1841,6 +1842,10 @@  again:
         goto again;
     }
 
+    /* At this point we've decided on which (Sub)IFD to process */
+
+    is_dng = (s->tiff_type == TIFF_TYPE_DNG || s->tiff_type == TIFF_TYPE_CINEMADNG);
+
     for (i = 0; i<s->geotag_count; i++) {
         const char *keyname = get_geokey_name(s->geotags[i].key);
         if (!keyname) {
@@ -1858,10 +1863,20 @@  again:
         }
     }
 
+    if (s->white_level == 0)
+        s->white_level = (1 << s->bpp) - 1; /* Default value as per the spec */
+
+    if (s->white_level <= s->black_level) {
+        av_log(avctx, AV_LOG_ERROR, "BlackLevel (%"PRId32") must be less than WhiteLevel (%"PRId32")\n",
+               s->black_level, s->white_level);
+        return AVERROR_INVALIDDATA;
+    }
+
     if (!s->is_tiled && !s->strippos && !s->stripoff) {
         av_log(avctx, AV_LOG_ERROR, "Image data is missing\n");
         return AVERROR_INVALIDDATA;
     }
+
     /* now we have the data and may start decoding */
     if ((ret = init_image(s, &frame)) < 0)
         return ret;
@@ -1893,7 +1908,7 @@  again:
 
     /* Handle DNG images with JPEG-compressed tiles */
 
-    if ((s->tiff_type == TIFF_TYPE_DNG || s->tiff_type == TIFF_TYPE_CINEMADNG) && s->is_tiled) {
+    if (is_dng && s->is_tiled) {
         if (!s->is_jpeg) {
             avpriv_report_missing_feature(avctx, "DNG uncompressed tiled images");
             return AVERROR_PATCHWELCOME;
@@ -2051,8 +2066,7 @@  again:
         FFSWAP(int,      p->linesize[0], p->linesize[1]);
     }
 
-    if (s->is_bayer && s->white_level && s->bpp == 16 &&
-        !(s->tiff_type == TIFF_TYPE_DNG || s->tiff_type == TIFF_TYPE_CINEMADNG)) {
+    if (s->is_bayer && s->bpp == 16 && !is_dng && (s->white_level != (1 << s->bpp) - 1)) {
         uint16_t *dst = (uint16_t *)p->data[0];
         for (i = 0; i < s->height; i++) {
             for (j = 0; j < s->width; j++)