From patchwork Fri Aug 9 16:29:59 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: 14360 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 22B4544A01D for ; Fri, 9 Aug 2019 19:31:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E66168ABCC; Fri, 9 Aug 2019 19:31:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6202F68ABB1 for ; Fri, 9 Aug 2019 19:31:42 +0300 (EEST) Received: by mail-wr1-f48.google.com with SMTP id p17so98787013wrf.11 for ; Fri, 09 Aug 2019 09:31:42 -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=iHHdsYt+eFuhEYWu2++FKrP/uNw5XN1VC2EVY/nNyUI=; b=t1n58mLsysn2OtQbCgXRP2ivaeUEqkM6cmXRMt4xO7dttBvVB3LV+37R1rO6UPseJQ DonVLm4bSYQ+eE21FWJFCNgX4R/KqofeLZI8oQP75ggVe72Wk2IpeEnJwby6VN4h9yJ5 KdXyhjIyMNmoyVZrevKH1WtN90jUqpbufWK4M8qpD6Wv5eNpC30BBLrNGLA6iYQaFRm5 o0o4vr8vGek17P9svx6N1HHBOyFvMudNvztdcJsW7nIu7C1jrXjXMFBmLzGKAOPX2CzH AZjwVYQTCXWicr0gXi6OM9xP+E2kkRXN07FyYWnwNGiWaXdiZWwQ2+JNzpF3R4fILA/A UZqQ== 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=iHHdsYt+eFuhEYWu2++FKrP/uNw5XN1VC2EVY/nNyUI=; b=YQ1Auyvx8c/dMPNePdGXKJnjayopGhH5UDna/Ei0TafC46vdmC+/YnZUuSQclZ5FFs LorItAw+9X+4w9M/93veLQKPSLa1m0XczMdz7OZYfADFm7wmCSfb0lcMDNFK5df60PcW jrdMA6rM4OF/eadU7C+KjRyxX1l3ZxDMBE3ZwDNMr0wHtEr/hQKTDRjzZ8AmBtcCOehD kiOLPX5Mm/cNN/nunNI0BaFH70YTJbx1nut/2q7mOxa2w7WV0g+fprJi/npTKyb6gfR4 vAK9Edou8lEMcjr3Abu8l9Keq0vbkcZA+iLHoGM82BPOmnYDsqS9kOTg6DdYzYBXtlgG yFYQ== X-Gm-Message-State: APjAAAVpdm9QsGs1L2fbx8dYWadU7ALAeh44y+ltnrr5GsCzu9TbDolA 3nlDZwBRPa6tur8EtjA2cYTAl+nAfeY= X-Google-Smtp-Source: APXvYqygPCP1KS1jfnIOuQQ2hAhGhgnJ9ywXMWW/84RWd5iyF+lednQgW34+EiVyS06GhO8Zde/Inw== X-Received: by 2002:adf:eb4e:: with SMTP id u14mr24895828wrn.168.1565368301586; Fri, 09 Aug 2019 09:31:41 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:e9b3:b00d:2017:357c]) by smtp.gmail.com with ESMTPSA id u6sm6721745wml.9.2019.08.09.09.31.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 09:31:40 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Aug 2019 19:29:59 +0300 Message-Id: <20190809162959.17924-14-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190809162959.17924-1-velocityra@gmail.com> References: <20190808205233.16368-14-velocityra@gmail.com> <20190809162959.17924-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 14/14] lavc/tiff: 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 Inited to (2^BitsPerSample)-1 as per the DNG Specification 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 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index b9aa4efd02..aeb80a70a9 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,13 @@ again: } } + s->white_level = (1 << s->bpp) - 1; /* Default value as per the spec */ + 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 +1901,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 +2059,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++)