From patchwork Sun Aug 11 14:45:42 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: 14424 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 DBC5A448588 for ; Sun, 11 Aug 2019 17:46:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C733768AC8D; Sun, 11 Aug 2019 17:46:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4111E68AC71 for ; Sun, 11 Aug 2019 17:46:41 +0300 (EEST) Received: by mail-wr1-f42.google.com with SMTP id r3so8705136wrt.3 for ; Sun, 11 Aug 2019 07:46:41 -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=7S7MpPIeXYtQP0zga5qSRvnD7esIo8rp8xQ6fmc1BfY=; b=gW/ybe72qPi0JUrkhxLsfXHexdXeX9eKGhcON/arjqqFsVJhHuha3lss+clPWVnBsS TZwjjk5ZknZSqgWRrm78+4RHt/IarDWF/jauYy8ONJel/wNQ9qD7XU+A59SiqluY/4bg U37jmfa5b074q+iICuIptfIKvjMBfnHO4aZAui/AO4ECjHSpdvipZrqhkyN+tKP2wrRg xa0UxTz2KIdzUwhrCH+mvegAUUGfHzeW35l1bi15EFLwkZ4EnkYiL/GCjIUcv+WYqRqf KKQaa5EmwU+SJfUK56IWqnl/OzLxDvS98lMh3bpSHaDsXZRKu36Tc+CZUw2B+odxBFex dj7Q== 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=7S7MpPIeXYtQP0zga5qSRvnD7esIo8rp8xQ6fmc1BfY=; b=WRFM0F3R3Hn2fO3n/jd3gXJH4bD5L3Vt5CIk1pQcXfCCXotbz1Vipk0uMcHBBfzGRy jM9cEeStlQhQ6kyd/BCMMq0cdKYOzLpNgyRg69dJDSeTo6HENB0nDP61Lq/t/Aox/r0W s389RG+ZsWq/B0CfRYIEz8HWvtTud17iL+hVLG+CEmkDg5RkqrAevhGxC1g8/PvMS3Gu tmlrNlw4008oxap5MWBnyJTvscIP2NbD5a0ENBnvaTZGpiLpiRaHp99fqwKV0e4GpMOi P4aNnh0SRYcKLmKqBTMVIQZvHamJB0Gyhwf+KNjdM7atFkKmX48EEE7jSMYSszLBNsy/ dzdQ== X-Gm-Message-State: APjAAAUHjL9nOOnco/HKGeebxTJGldYVnf9mK1eV9KnqpcU21spzL1Bo sXoXzKmIYZq87/UAud0srDGfyL0qI4g= X-Google-Smtp-Source: APXvYqyQE4eJqY7lmj8pCFHGzvcR0GB9OG0ifH8ral1r/IrrgokFJyIcKoRR6WC6eYFGYuNppP6kYw== X-Received: by 2002:adf:fdd0:: with SMTP id i16mr21767989wrs.260.1565534800526; Sun, 11 Aug 2019 07:46:40 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:94bc:d60f:d153:ccb1]) by smtp.gmail.com with ESMTPSA id f10sm8376360wrm.31.2019.08.11.07.46.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Aug 2019 07:46:39 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 17:45:42 +0300 Message-Id: <20190811144542.11704-14-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190811144542.11704-1-velocityra@gmail.com> References: <20190811073641.GZ3219@michaelspb> <20190811144542.11704-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v14 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 | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index b9aa4efd02..9cf593e092 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,22 @@ again: } } + if (is_dng) { + 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 +1910,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 +2068,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->white_level && s->bpp == 16 && !is_dng) { uint16_t *dst = (uint16_t *)p->data[0]; for (i = 0; i < s->height; i++) { for (j = 0; j < s->width; j++)