From patchwork Sat Aug 10 22:19:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: velocityra@gmail.com X-Patchwork-Id: 14403 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0E726448F16 for ; Sun, 11 Aug 2019 01:20:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F1E4B68AC05; Sun, 11 Aug 2019 01:20:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C9DA68AC15 for ; Sun, 11 Aug 2019 01:20:24 +0300 (EEST) Received: by mail-wr1-f52.google.com with SMTP id z1so101387879wru.13 for ; Sat, 10 Aug 2019 15:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HrZ7cDcBp7hsISf5ng6vdHA3iQ575us/eqGWTPSOADM=; b=VDFWHZF4FL9lEkQryrNxng1jQkDuKwcCI4NvLAwqwqRHdoklYUCgjcI+rdzGlGZYZx gv8n4F6bdJeiDiU1h+Zn94i7nIz5vxyswf1VM/BfoZFLNM97RP2wwS9kjRq9RFml/br2 wlLoRqpmg/q9nK/C/iUat4ieI7hoS7SIRoM35KJTUCPsJXTiSgITn50DZmWA1YIJIPn1 91UnIb81M27Fy6aCQiX2Rttm0QBJrsAexdsF91x954wefj3B76DJx4J19CzSbiiSvX11 Lx1Zp7hxk9u3Y+boqGN4EclFMZlMce1U6V7KJTLtnFeXZ26HU+MrbN0Jy91LMPyPfxUg OHGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HrZ7cDcBp7hsISf5ng6vdHA3iQ575us/eqGWTPSOADM=; b=r3rq3ZKmgY0NX59nZIDXtvYvBEZ7y8/5h5BJAg/VFU5cqQvyPB/i1RqU3yzQsyWYwB PcfgzLyugKv2JM4yqiju+CCTKwckRzC3PnIu8dTr+Rhv3CbsRh5iGV9SUdcjXiwdojfr papkalaMyk/SRDJjmwPKHZzXrrkuEyK/urRnee6m0AqQOlGSaWLr+xZtCzZRQdet/fc2 OG0y70gSs3HL5FSCH6lRPlYxaj4Z9BpQKvKG0OE9miixbqxBX6XaysyLynhfpzxl8B/G L8Px/uUHZeIaoVGVGaRTnXD4FlLOLJupGBspENaGXvJ4iGI8/jrx1ZuQ0MyvzVjnJ5iw FXoQ== X-Gm-Message-State: APjAAAW709CrJgQRq7L/IJs25WjZScsHbXD4wUtdnpklwqD2jHkv8EZw TCx0XlzInR+8jdehx1ajGEYucX9+ToM= X-Google-Smtp-Source: APXvYqzUgj8ksxJ6IZjgwpZEWw59HMpwIg+rpIVviygm4MdCfjvMDXp1aVhQdfrU5ZSeuxmZbflasA== X-Received: by 2002:adf:f28d:: with SMTP id k13mr14305221wro.19.1565475623189; Sat, 10 Aug 2019 15:20:23 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:5c0b:c2fa:5389:82dd]) by smtp.gmail.com with ESMTPSA id q20sm40403233wrc.79.2019.08.10.15.20.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Aug 2019 15:20:22 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 01:19:34 +0300 Message-Id: <20190810221934.44996-14-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190810221934.44996-1-velocityra@gmail.com> References: <20190810221934.44996-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v13 14/14] lavc/tiff: Default-initialize WhiteLevel DNG tag value X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Nick Renieris Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Nick Renieris 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 --- libavcodec/tiff.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) 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; igeotag_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++)