From patchwork Thu Aug 29 13:10:53 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: 14793 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 997A544A068 for ; Thu, 29 Aug 2019 16:12:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87C8A687F5C; Thu, 29 Aug 2019 16:12:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0433B687F43 for ; Thu, 29 Aug 2019 16:12:29 +0300 (EEST) Received: by mail-wm1-f50.google.com with SMTP id t9so3809100wmi.5 for ; Thu, 29 Aug 2019 06:12:29 -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=FlY8vCjKnulE9C6hsuJEF92KBj03SM1bNsYMvP+ys5w=; b=uud29OL/YOOVN/BMF7kjDmHgMYjTLVxTASuTl+xxeevGd0FR58JswlptPJ0aByMcRB 6QShiLVUUH+5PRXMjvF7pfW+YczsqWQTAnAwRa6Ifl7dMu+8cUquGavHRp20vh+Xem6m msPl9OCfOaeXAJHcqCvf2PkNvRB1a1PxjVHsRuZj1R06FnD+ejt9EAKe2W582J5A0vbD qzSyqiTkBwY2S6p9Q/HMTHzKpVSTzknMfVC3gp3oWpLuPruJ1erRSooY1gjKNVPJfYmN eCgM59ioPZG3Bsf8Nkc9SdY19zYEnXb6H6Czh6BuBltzqpP9NJ5XkSFVWkCMIYjhZUyW VFhA== 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=FlY8vCjKnulE9C6hsuJEF92KBj03SM1bNsYMvP+ys5w=; b=q7qjX1GR8LoytxDb1xFFmPIyhxtvL6g7LzZImdMN2AvITVtI5p8aar/2QSKMHKV2wl DSOgvRdSCcToV+KIFrX68tmsmPbeE9r721c0/UqwrwRXrblZyggQUfwWxTZr2rQDKoOz d9AkJV6pVtN/PuKKJmez3JrqdjYsKgsdR0osTiQUYMO6fUvkFZy2kthUOZEqqZuYpOV1 U+EWHmjRWDHJHT49qc1jAvl2kUzK8meJioakaOSnnLSoGIOXxGAYnuhts7vosQeEY+Ms nbxt41URPuR5wq/zluudfm+mHtwhPL0zzMR8nU48D/I/J13KjxvaXektnBepvtWyIurP xrpQ== X-Gm-Message-State: APjAAAX3Bz3QOuIYdr3Y9hSU/EPakzXt6EVrgonZ/AbdXLOfyXVa1hgN PfYmtE8HFngFHdb1sdGedWNcb6IO X-Google-Smtp-Source: APXvYqxT+wUpNhQDiuZ+xRohulTx9wuiMPs1VEt4syZIQgGBRHMss8p2MzlDw95e/xi4BYK1sV77XQ== X-Received: by 2002:a7b:c3d4:: with SMTP id t20mr11144526wmj.71.1567084348932; Thu, 29 Aug 2019 06:12:28 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:240d:9b00:4ca1:2ce9:2e6c:c246]) by smtp.gmail.com with ESMTPSA id m17sm1676644wrs.9.2019.08.29.06.12.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Aug 2019 06:12:28 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Aug 2019 16:10:53 +0300 Message-Id: <20190829131054.16404-14-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190829131054.16404-1-velocityra@gmail.com> References: <20190829131054.16404-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v17 14/15] 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 dfaef1927d..c927400a40 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1775,6 +1775,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); @@ -1843,6 +1844,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) { @@ -1860,10 +1865,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; @@ -1895,7 +1912,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; @@ -2053,8 +2070,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++)