From patchwork Sat Jun 4 21:11:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 16175 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 8C44AC3276 for ; Sat, 4 Jun 2022 21:11:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DA39465646; Sat, 4 Jun 2022 23:11:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1654377116; bh=57RCMCH2ddS8uCZM3E90CIxLhQ7NCr8PSdJyCaYE2pE=; 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=gpasxA6GlGj6KWsCcrQ1QNfE1mnRlAUBbQsL24fhxjLrVLphT4HaipZd5ymZq9AFK r8Ti05af7ZLviXQli1rESKESHZxXctDthKc0pNUq6i0lCvATsy6kTBiPRGrp3uDpC4 cT479Lxd+Jkd8e/0uPE53g4tYjDZ6YhP3OcaC58GBV8vRMy8sE6xRA1/KaGoR+KerC R7uBnljqnSNigZBDktgGyJ2FybHoPRbK6mdCYppUkgfNYb3JO07kv6LknkgMogNnIR IjDcoDk/7tUKe0uBpzYs5RXTonQCvPY1Ufm+YKpgtPEI5kKW3Mv2hEqJ/VJvfH5hst qm254nL9kiMQQ== Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DD77D65633 for ; Sat, 4 Jun 2022 23:11:52 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="Vgvac8qb"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1654377112; bh=57RCMCH2ddS8uCZM3E90CIxLhQ7NCr8PSdJyCaYE2pE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Vgvac8qbJynp3b9lo+V8AVUHYsD8EERXhOGd9osjMrfFwjdVsfzSHPtID5V981F4m HfgCGZTHiVg73D9UFAKH6FJkl5FMoq8ntY9maGGLc2CDQxcOTDq6vuoJqBD3Dj/mGU BHmX8JKLCQGnqYqlGBk9yb75Szu+aZU/0wBxESas= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([92.18.80.244]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MKbkM-1oE1Tw28Pk-00KvCJ; Sat, 04 Jun 2022 23:11:52 +0200 To: libcamera-devel@lists.libcamera.org Date: Sat, 4 Jun 2022 22:11:48 +0100 Message-Id: <20220604211148.188421-6-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220604211148.188421-1-Rauch.Christian@gmx.de> References: <20220604211148.188421-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:mMcMWQsLWY5nZPbxwaVyw/Qzq162bIt00gDssAH8WRZd3ctWuy2 uhEcVnPd5f8NTDiTiAtMtlz4asmHTDcyhu4X7Yezt2GKCoMhpz/IQPIlQJqi1aYMRSlPeGS D6XM6EwLjdqq+1tSA3waXxlu0+/VzMASXHIRSkfwQkKcT84NCTgmNqb8VfLnpiHnTjqW9v5 1nho26pETxTQIFwkzJFnQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:pG9P/BEcBIY=:h5q67KvBbz/Md9SKWVKGzj urQ1imd1o9nNeAlS/AqEON4EHCTxP4SXEtyP37uLIwwcCGos/wWJWSpLqXSQANlLWwx0PZ+7/ DZwppGgG7Ydu+POaDsbcHifNnXQIOZb/TBiW6Jgx3skSnqTkXOXnnXRL4mRpJ/ginnE39dIpf cpcd2a7lNvoGCoBhUXGuxPJNiE0VfuVJevswxI21F1ScpWgtY5gWEOuKqNQDzlKrzPnF3fxZH 2HUHxgv42TPVp3cGQB/D2HtSa7IVVWD2JqBMPW52OUdZpBRLr9rmg3MGToKnOA/0nFnf11MnY vJ06ek1YbwAGyZH5frGCgKso1tpb8WJstRgpeyBTmBCUsByrxXrbt7bpkXtt6vMCMYSFMc7Ep CDQaN+DtppFUX2xoGZrMqpwSLeD+LOa5/wSorv9G8TEXIsbVL8of24yRzZuP6v3mIOrd3YbM6 qmQ8hAnxuLWls1NcEuX0ln5bkl5lgk1xkaJiO8ZHsjPtVDK72hJNxG6ex8c7/v9GlklNhqdg2 9ikr9sZbvMjtWRpin0wfGdHdwRDWXBl/FZ8qhnFVnlmjHXXaFRw19+ygIqr3x0wD3VR4vQY2i 7bT6GkkxXwjjvtuBsPKaOZeO8g5MmzzSUm5v+AQg8CZFQtzRtcuT4w+7a4d0I86Mah9bv4mdS EASEHA0367m1eEHZfv90YaFARs+TxHxeywuWfD3nceaX1BJl7+RINUw2cXexpc1ywfOilfQNU NwLqEc8DEzGGCAkfy52JFt6D1x+5AprPk6KnWVBpGNR5iB3DiF4MWrpGGkwBY07TUR4Vt11bI CSYKB9enL83PGC1Ggvj++zo9aVTFW+CdByzsVjjlTGeINXrk6NmEci9Tpv6RmSsJ2F+U4p1My JqP0+SKjNqdW+pXUpI0aCkAReeuVkR4db+7eiQ/6M0fcR2XLOWaTlvnt0vKL8dtadNnFBP0qc A36IvqNjMl90w1W9BkwurgVPLp8pM8eLQBUj1/P6rEvSTlYCgA4k+7Cw18ahrQ/RA7XxdXE7N Q1PpQppx02lEgZO9euwbmES18zZTT9fYW7A9D6DcyHTAGsSSoXD9iseHq4Lva1d7dDbD70pzJ HEFLPD7B2pDtsqjZDleLZP3VdsoFSG4MXZuUTMPIzqhwVLmEKIVdFLtrg== Subject: [libcamera-devel] [PATCH v7 5/5] libcamera: controls: 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 --- include/libcamera/controls.h | 2 +- src/ipa/raspberrypi/raspberrypi.cpp | 19 ++++++++++--------- .../pipeline/raspberrypi/raspberrypi.cpp | 2 +- src/qcam/dng_writer.cpp | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) -- 2.34.1 diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 192be784..a19f1845 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -168,7 +168,7 @@ public: using V = typename T::value_type; const V *value = reinterpret_cast(data().data()); - return { value, numElements_ }; + return T{ value, numElements_ }; } #ifndef __DOXYGEN__ diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index f65a0680..203ae613 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -505,18 +505,19 @@ 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({ blackLevelStatus->black_level_r, + blackLevelStatus->black_level_g, + blackLevelStatus->black_level_g, + blackLevelStatus->black_level_b })); FocusStatus *focusStatus = rpiMetadata_.GetLocked("focus.status"); if (focusStatus && focusStatus->num == 12) { @@ -821,7 +822,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; } @@ -1105,8 +1106,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 a62afdd4..6efe7c3c 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -1706,7 +1706,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 = + libcamera::Span colourGains = *controls.get(libcamera::controls::ColourGains); /* The control wants linear gains in the order B, Gb, Gr, R. */ ControlList ctrls(sensor_->controls()); diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp index 4b5d8276..23612be0 100644 --- a/src/qcam/dng_writer.cpp +++ b/src/qcam/dng_writer.cpp @@ -514,7 +514,7 @@ int DNGWriter::write(const char *filename, const Camera *camera, uint32_t whiteLevel = (1 << info->bitsPerSample) - 1; if (metadata.contains(controls::SensorBlackLevels)) { - Span levels = + Span levels = *metadata.get(controls::SensorBlackLevels); /*