From patchwork Wed Jul 6 10:18:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 16564 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id DC28FC3274 for ; Wed, 6 Jul 2022 10:18:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0349A6330C; Wed, 6 Jul 2022 12:18:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1657102726; bh=RQ8wvOavvrjqraqVzxUjFxKxPzWH7QDhqyNY3EjH6MA=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=fj069aNg2nMYIIR5nTuhr9lfK97peL7m3r3Eg/U0AJU1I+KBxrM83E+yd5jCT1jcr RXJx9Qkke44UHpYPbH0WHwkejORw2SEocEAVOLmDs4n22YtBUf+o/iLiSVXAcZcRMn HoGhSTQE01xULI98IGYZ7r2zzREufuEQsEn92g9fumrD2xyBirjXNpHpXLrxtPODAW 2wsg6udvghfZHkE+77pk7byPLfCtgnUhaQxfFcgpY6Ds0lbDO7Ho3FVrv9Jef14qXj 3YZ1L/hySCtlUmV0TB/MtMDSRXSVhWC4vb3vvfX7kZAUmCrWuc9L4xw0NjaP+EXES2 BvuV1mjybD9cg== Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 368976330C for ; Wed, 6 Jul 2022 12:18:43 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="hCkXx4zu"; dkim-atps=neutral Received: by mail-wr1-x430.google.com with SMTP id s1so21355145wra.9 for ; Wed, 06 Jul 2022 03:18:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ssYnUC4vEKEUNpb7OK9FxfyCRxXfp/cJaoAdu/dquFw=; b=hCkXx4zub2f7GzjVONoU/A5Gtum6uHBQ1ANdmW41l7PBpyxTSqJNmEqlU77NWmASuf B/7C1lWAMCYXObDkBn066RuXlPaJUZSm3A8Zjbu72qTYVgZfiiogpdvIT8HafrH1oktP f3gYxy1POGCWU0lbY0RqOtHPLfQbenDPopuBbz5mpnDUNuI8C8uL+HrmKXUJpGr4E6AN P2nj+cQt79Gs/X7IXwWmNSCRKvI0wUN9G/Hu9v3JLkyFOLAW0hoQ4+XapvLi5sFW+XBU /dyIPp7UQXrrrTLWMezprF5eGsXrOW4+WeOTB7WhbZAeSYxroyW8I1cBEZAfJaMa0jU7 Wvxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ssYnUC4vEKEUNpb7OK9FxfyCRxXfp/cJaoAdu/dquFw=; b=lxCryYcLx0J9mwRFw6JacpMZBc6CTouFo+mHrqJ0n86zdNTAgHoyzNlW74jqEAFl18 ZPfthDtt+LXhuzDPPpPNP9sQ1cP4Ktpbhs5m9EltVwRrs2FAcADoGeiBmMrgbZow97IR KdNMz0rz38D2vQLtnmOTTd1b2usqN4TYnd/husPTDeqDNYMneIhHDm0g8RY289TmaFrE YvfTw+cD+YdMQN2vqvQBAhWT+IH4FOC1cyEC7NET/qF8/uMdDWToLInZAh+xExnzGXQ5 WSQP12zfnR8JnbEPqNHhfhP3SIqfO7W73qmcu05+mcdavEmz+WPkP62NyVj+3znVFC/H YRUQ== X-Gm-Message-State: AJIora9M5LvWUiCUFFJnWy80Wxp0sjonCs/mb3g00X9z/JqDUFCMjVz/ ORfhO4e/sZj2hkRfjKicrRBPLMRDKF1h1A== X-Google-Smtp-Source: AGRyM1tUGfhU8gYKD0BA+MMX1cb7dNTaznpyeEflgI32ClYM6gH+pZD2aP3Pi4+jIvAhBvLk9RhXMQ== X-Received: by 2002:adf:f345:0:b0:21d:6a26:6d8f with SMTP id e5-20020adff345000000b0021d6a266d8fmr15208313wrp.538.1657102722645; Wed, 06 Jul 2022 03:18:42 -0700 (PDT) Received: from pi4-davidp.pitowers.org ([2a00:1098:3142:14:e4a2:3070:eea4:e434]) by smtp.gmail.com with ESMTPSA id i1-20020adffc01000000b0021b5861eaf7sm35950820wrr.3.2022.07.06.03.18.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 03:18:42 -0700 (PDT) To: libcamera-devel@lists.libcamera.org, william.vinnicombe@raspberrypi.com Date: Wed, 6 Jul 2022 11:18:36 +0100 Message-Id: <20220706101836.20153-4-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220706101836.20153-1-david.plowman@raspberrypi.com> References: <20220706101836.20153-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/3] utils: raspberrypi: ctt: dng_load_image: Work with DNG files from Picamera2 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Plowman via libcamera-devel From: David Plowman Reply-To: David Plowman Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: William Vinnicombe The exif tags are different between raw files from libcamera-apps and from Picamera2, causing issues loading data. Add code to identify which tags are being used, and then load the metadata from the correct tags. Signed-off-by: William Vinnicombe Reviewed-by: David Plowman Reviewed-by: Naushir Patuck --- utils/raspberrypi/ctt/ctt_image_load.py | 26 ++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/utils/raspberrypi/ctt/ctt_image_load.py b/utils/raspberrypi/ctt/ctt_image_load.py index 934db123..29c17581 100644 --- a/utils/raspberrypi/ctt/ctt_image_load.py +++ b/utils/raspberrypi/ctt/ctt_image_load.py @@ -301,17 +301,29 @@ def dng_load_image(Cam, im_str): metadata.read() Img.ver = 100 # random value - Img.w = metadata['Exif.SubImage1.ImageWidth'].value + """ + libcamera-apps create a separate Exif.Subimage1 for the picture + picamera2 stores everything under Exif.Image + this code detects which one is being used, and therefore extracts the correct values + """ + try: + Img.w = metadata['Exif.SubImage1.ImageWidth'].value + subimage = "SubImage1" + photo = "Photo" + except KeyError: + Img.w = metadata['Exif.Image.ImageWidth'].value + subimage = "Image" + photo = "Image" Img.pad = 0 - Img.h = metadata['Exif.SubImage1.ImageLength'].value - white = metadata['Exif.SubImage1.WhiteLevel'].value + Img.h = metadata[f'Exif.{subimage}.ImageLength'].value + white = metadata[f'Exif.{subimage}.WhiteLevel'].value Img.sigbits = int(white).bit_length() Img.fmt = (Img.sigbits - 4) // 2 - Img.exposure = int(metadata['Exif.Photo.ExposureTime'].value*1000000) - Img.againQ8 = metadata['Exif.Photo.ISOSpeedRatings'].value*256/100 + Img.exposure = int(metadata[f'Exif.{photo}.ExposureTime'].value*1000000) + Img.againQ8 = metadata[f'Exif.{photo}.ISOSpeedRatings'].value*256/100 Img.againQ8_norm = Img.againQ8 / 256 Img.camName = metadata['Exif.Image.Model'].value - Img.blacklevel = int(metadata['Exif.SubImage1.BlackLevel'].value[0]) + Img.blacklevel = int(metadata[f'Exif.{subimage}.BlackLevel'].value[0]) Img.blacklevel_16 = Img.blacklevel << (16 - Img.sigbits) bayer_case = { '0 1 1 2': (0, (0, 1, 2, 3)), @@ -319,7 +331,7 @@ def dng_load_image(Cam, im_str): '2 1 1 0': (2, (3, 2, 1, 0)), '1 0 2 1': (3, (1, 0, 3, 2)) } - cfa_pattern = metadata['Exif.SubImage1.CFAPattern'].value + cfa_pattern = metadata[f'Exif.{subimage}.CFAPattern'].value Img.pattern = bayer_case[cfa_pattern][0] Img.order = bayer_case[cfa_pattern][1]