From patchwork Tue Apr 5 00:42:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 15619 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 4AD96C326D for ; Tue, 5 Apr 2022 00:42:28 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0BF2565653; Tue, 5 Apr 2022 02:42:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1649119347; bh=InSS1aMS9uqLW8CBU1NK5f37YyIWVBJAMr5et4FWe74=; 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=PVnmM+d3MjZ1otbsofazWkwfY55Txg03JMUMyh2oRfQzdjPvuGPjdB+xFLtaFDqyE 15Z/fXCygxgOy1stfgJ2ZlzIZIdjDqA40Uv357josBnWb7RkRjFL0JCkCfhDs3VAdG YtS9H4drb2RrJrrJRhwl6mdzPe4LtirTLG6PkX5QfJG3dDC/vtbnAB/qyY49sVy2e2 6HYYKnrboEQFfqtBPFbxTy8bqaYulEJ1mPJ6gYdDH+4uwCmTOyp/a7mAQ0QWWcW9HM Xsh5QP0Y5j/O/DK6cHK2ghfyMkPFFBuTgqn9DOIzyNq04Kv+UMZZFI5wPyOgA0OLT+ kiRFDdIL50GKw== Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 86ABC65643 for ; Tue, 5 Apr 2022 02:42:23 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="LunkeF+K"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1649119343; bh=InSS1aMS9uqLW8CBU1NK5f37YyIWVBJAMr5et4FWe74=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=LunkeF+KQH4wmDK6kuNXpIWV9dFTKElc5fXDLSnuuJAllFlzgaMrrRMBct/rGYiLy Om37U6bGcSPwLT1FrGRwjiKdPedeOVS2SeNxRBoSoDoGqahtYYHS7M2c6hSPxi4/SM N0CNU9sMttP/rjkbP3lrX49fH5nIf8kMXObNNO8A= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([92.10.251.63]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M3DNt-1naAtO0cQf-003coA; Tue, 05 Apr 2022 02:42:23 +0200 To: libcamera-devel@lists.libcamera.org Date: Tue, 5 Apr 2022 01:42:15 +0100 Message-Id: <20220405004215.86340-6-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220405004215.86340-1-Rauch.Christian@gmx.de> References: <20220405004215.86340-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:X4tywJo2l37GzmXeLnZj98FTq+P/cO53w5zinK0BInia9gjAW3v DPeNaame2MtaL816+75TLOv5AMSICMWc0igRC6olRzDVchFwVafGOlxfEvng9asY86ch4Xn 2yHW/99ATK1h2NBM1Qi/zw5PkLgWNpsRCKH5ypIfG3h1qiATKnMlKCpHo7j8kIwIJpAHHAQ Hakw/nGwWkdjIqdxYIRkA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:qs35K/Gqh+A=:SbCzE4TtN1AbTap5d9TeW8 lbCWIk52sg/+kfui90/PaCoV5IJzJLmT36SSZ0ggVhwjLhM1RKcHPHdTchw9qZCRlKB25sdTe 2Ss2LGY+yFPannla3b0uQE9tl2m+MrGQ3GmH5dN1O0jyG1avRYaxVnTPBKvdTH6vzj1qbuM5n vCm1Tf4DEquMcy6AUAbw4g+msvnMSmU23zNvnM3lzqBd4562kxJEj2DSW1IYF84tpu6LS2jXy Nbe3Zehj2HxBCESpVsawtN4WAAyRgEuMJa7PcC9zMCRlNOBNSRPdkbvcOvoEmx1UaVeueV7p2 HRP44mKat/Djj1bAyly3w/DWSDoFhEzs2rsWj8qHl3f3bdIrSCDkwAMClXNfC21x63ZI6fFJ2 yp1HNnMQcr2POsyhafF/9fZ8hjWrdb/05xW+i1M8Bpv0D7WToFgkIuIbGPO/0qyIVRBlzvoe5 smyKbRgXdXGOBmX4c0ptMQjM36p1P3lFUvYgXdihrvaDfKfsQnxkO/wE5NiEjIRJ8Mx/6Ee7s cXj1G1escGGO5rdPOJ072MB/llATUsI4arcpBTPRk6s3wJkum/zQx95XJj46PS8YpMEeYZGMC as1EOJo/RkZh4zVsL7LIs7qMtQkddFnxohDOi1AD2J2Uu9OdYEb5PS2dyXhUz0P5kXefWILxW /K07GmLbPbqiKZxMphbagxr91dv9G6jUiowOqMnHID4VrddKmbjoymGSLxMpMx7fMg3vZ6AaM 5CwRPElIMgIceZFpBqax8KuAVKFr1XHT+BY4gp1MpPbHtvyKlzKhOAr6vSV2PEU54JORMBJEs S2BA3YftS1O3Dd84ICto9rDXoPjmdcp9zIuOvchKE7nJVFHqfitrUzN1PgAGkF8n91DhGZW3d qQXYKJMY88Bc+o4ef9vYOtz4ZkQe15MFjdCqWVsC8YOw551aDE6AtrhrSHmpt7X51HkAPCHsf zC9udNq6PaIrHZ2PCak5QMGGSeKSiMcLj8+sTkpqJZHcgkIGfV0KEodYuf/VK4xMXpsjpmYEQ 9SuGRdp4d5Q2dYFKQBEJmcHvPjolKHCbwntLSw7fS8egBpxO+ee+aFvFLP0Q48bjCBe13TIUf slhvX0WH+f6ASA= Subject: [libcamera-devel] [PATCH v2 5/5] apply explicit fixed-sized Span type casts 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: Christian Rauch via libcamera-devel From: Christian Rauch Reply-To: Christian Rauch Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The change of types of some Controls from variable- to fixed-sized requires explicit casting of FrameDurationLimits, ColourGains and SensorBlackLevels. Signed-off-by: Christian Rauch --- src/ipa/raspberrypi/raspberrypi.cpp | 18 +++++++++--------- .../pipeline/raspberrypi/raspberrypi.cpp | 2 +- src/qcam/dng_writer.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) -- 2.25.1 diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 926b3185..c27c897f 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -499,18 +499,18 @@ void IPARPi::reportMetadata() AwbStatus *awbStatus = rpiMetadata_.GetLocked("awb.status"); if (awbStatus) { - libcameraMetadata_.set(controls::ColourGains, { static_cast(awbStatus->gain_r), - static_cast(awbStatus->gain_b) }); + libcameraMetadata_.set(controls::ColourGains, Span({ static_cast(awbStatus->gain_r), + static_cast(awbStatus->gain_b) })); libcameraMetadata_.set(controls::ColourTemperature, awbStatus->temperature_K); } BlackLevelStatus *blackLevelStatus = rpiMetadata_.GetLocked("black_level.status"); if (blackLevelStatus) libcameraMetadata_.set(controls::SensorBlackLevels, - { static_cast(blackLevelStatus->black_level_r), - static_cast(blackLevelStatus->black_level_g), - static_cast(blackLevelStatus->black_level_g), - static_cast(blackLevelStatus->black_level_b) }); + Span({ static_cast(blackLevelStatus->black_level_r), + static_cast(blackLevelStatus->black_level_g), + static_cast(blackLevelStatus->black_level_g), + static_cast(blackLevelStatus->black_level_b) })); FocusStatus *focusStatus = rpiMetadata_.GetLocked("focus.status"); if (focusStatus && focusStatus->num == 12) { @@ -815,7 +815,7 @@ void IPARPi::queueRequest(const ControlList &controls) if (gains[0] != 0.0f && gains[1] != 0.0f) /* A gain of 0.0f will switch back to auto mode. */ libcameraMetadata_.set(controls::ColourGains, - { gains[0], gains[1] }); + Span({ gains[0], gains[1] })); break; } @@ -1099,8 +1099,8 @@ void IPARPi::applyFrameDurations(Duration minFrameDuration, Duration maxFrameDur /* Return the validated limits via metadata. */ libcameraMetadata_.set(controls::FrameDurationLimits, - { static_cast(minFrameDuration_.get()), - static_cast(maxFrameDuration_.get()) }); + Span({ static_cast(minFrameDuration_.get()), + static_cast(maxFrameDuration_.get()) })); /* * Calculate the maximum exposure time possible for the AGC to use. diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 34d9f4c4..7d4142cf 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -1692,7 +1692,7 @@ void RPiCameraData::statsMetadataComplete(uint32_t bufferId, const ControlList & * V4L2_CID_NOTIFY_GAINS control (which means notifyGainsUnity_ is set). */ if (notifyGainsUnity_ && controls.contains(libcamera::controls::ColourGains)) { - libcamera::Span colourGains = controls.get(libcamera::controls::ColourGains); + libcamera::Span colourGains = controls.get(libcamera::controls::ColourGains); /* The control wants linear gains in the order B, Gb, Gr, R. */ ControlList ctrls(sensor_->controls()); std::array gains{ diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp index a7dd30f8..d712dab2 100644 --- a/src/qcam/dng_writer.cpp +++ b/src/qcam/dng_writer.cpp @@ -437,7 +437,7 @@ int DNGWriter::write(const char *filename, const Camera *camera, const double eps = 1e-2; if (metadata.contains(controls::ColourGains)) { - Span const &colourGains = metadata.get(controls::ColourGains); + Span const &colourGains = metadata.get(controls::ColourGains); if (colourGains[0] > eps && colourGains[1] > eps) { wbGain = Matrix3d::diag(colourGains[0], 1, colourGains[1]); neutral[0] = 1.0 / colourGains[0]; /* red */