From patchwork Fri Apr 1 00:06:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 15608 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 BD9F0C3265 for ; Fri, 1 Apr 2022 00:06:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 5B09665633; Fri, 1 Apr 2022 02:06:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648771610; 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=dlc4GYLFJucOUjUPM8xI9tWqOex9ot911BGAM14DT7TtcaCbNywdwhfv4FXXhhpaa OZtF+xiJ7F4qFgLu1zf6wK2xrP2uSgU+9qI8juQPeNI3tOxqWmZ5F5GJ0ITFzMPp1+ SJBuoc90JMVR5wdy92Z41rND048qXFern9q9vL2Rq9E1mqZ0QZ6CYFmuxemALuBgb6 cB10JwvBROnbNHsXEOW/KcDi9qnCjcf8pyMkI99g2hOjY1DVXZyQz0UzvyQUtZOEue mV/3GG9GHfZYJ01JN/SHXYsActHVlvP/KmW1YiRWmQmZreu5ZQzButf1zWxm5vF6q0 2Qc7BTt1BtG4A== Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5225065631 for ; Fri, 1 Apr 2022 02:06:46 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="idtxihlx"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648771606; bh=InSS1aMS9uqLW8CBU1NK5f37YyIWVBJAMr5et4FWe74=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=idtxihlxBvljrZktLcNmlYf+PsJw53hX280gUAiCdr4uc/ZFczNbJl8OV6UQuoexC XmI1tiB6ky0vpP7qrTaIDuMDo7v9YAmPTlsHFm5rjs/M/8G7ZgX8M6Ua4X5XpieNE+ Duuq2sYZnANnEzi1gnH+2AaH88wbPLDByT69LJ+U= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([92.10.251.63]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M7b6l-1nfslc3fy9-00819F; Fri, 01 Apr 2022 02:06:46 +0200 To: libcamera-devel@lists.libcamera.org Date: Fri, 1 Apr 2022 01:06:16 +0100 Message-Id: <20220401000616.12976-6-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220401000616.12976-1-Rauch.Christian@gmx.de> References: <20220401000616.12976-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:vXkxMZ+8ontAhJp4nZPjyQns8/gVfN3/OeS0+fz2uufrBb+t/tH sNezpoOtWoXwCxfzOeNorSsJ3KfyNKzWXL6REYkhH5LwZyJdS8Kz2a0mSC1Fnd4hhfT4Ck9 wf+G+9NLV5YcsvFKdHb6Ow7TP47UBiDnDz/MYFL8FKKms44k4LUpoZxIkW6DUS3Ipvl/wcg JYup68+7xf58gLecPoKAw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:SLycFwaQoXo=:1ti9+TILYjkBoxNIJQQudJ 01FhriWUUAYLL8vrIhEMp6m5Kk6f3tKtPrgvf/zT51mnWwLWoYLk2itg8BZ/7ky8Yll/XUMxb Fjr4Tg/wFwrIIQdWq1E9mjtUpC+Qgojb3U2ZXB8QCRfXRtaXLVfofBps29+kOs/vzq7a/xI0g 2C0EyYXsZ2R3rNIzyGWUah00jyP99K36naCLDEGcvU1JFrulg2v2kvJ1Ej6lcIUK3N+vL6XbM x0Kj0U90yE5NFF82XUhvV46KfjFF2HYLKLIC65AIry4Br6j8bwhUSCmuXVynoSM/WyNv3fYqg QgxIgJGWAlreiXAtAbDFXx7Jr2G1H63qT66vDfT1Mts3/SmmbUr6pXK9jBWw1Y0rqgLp1tONn fHJbKOzajDWHkv/YiVgJVM1gqwM2qFj5gylQtLPm8hSWAXwvIrzfCCr6eGyVazhRMKz6YGB3w +XRDMeuROL52PMih3GdDTmfyG9u/6aRgkDafwHmAZmMhk3aQKmmy7HuTzTGsHE8Mms2f9qrlv GoCRw0mP+76fid0pgLPz3G85bbmaNkyewqJNufCwY7B0aWTCdtf/jQ+HKHPl3NYXbxQ3UTds4 9bwAUXLog/3HuZq5IEcoIO1OSmMxz3RrNTqxRnOrgwTl60JQck7SWoLBAqrXa8veukCxgDP/A x1Y7vDv7rKJOqPXb4iNgct0932rQRnrW2Z2UwwOo6yxl/6bqpkuvmtt/LY/3nkw3FBiANXhC8 feVbxsXTm50R8bpXGr8o6Ri+VXUmZiAko5NVyFS9iT6zFFr5+Z3kc8VTyemsDH7M4quc08ThC FVawFv+ZTLdfHXaiml2yU3U6HG+0Q/MCcU9E+jKZzS5dsKjrK7tOBGYojXWkcYQQESRoKaTIZ AA52tpPL3lwjpGHbdcs9paPQ8XvOLQ5GuXk9fSmX9KxZlbgDwam0W3W/pU73Puhe8Y1XUZfok ylBa+k2abw584P6voPI1H9+YTx/ZZ/5EsbzQwgRT4Iz6XTZyk+uKOQvkIALnEZ221K3B2fxu3 2UO3ToVyS9p9JlFs7nw/huHgygZHLSzwZsDZw9qjZy8QYvPuAcu/ePrk/7PMMz0sKFqXsl0r8 MdNppdURHMdwEY= Subject: [libcamera-devel] [PATCH 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 */