From patchwork Fri Jun 10 12:03:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 16193 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 4D8F6C3273 for ; Fri, 10 Jun 2022 12:03:49 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2635D65647; Fri, 10 Jun 2022 14:03:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1654862627; 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=Oaxcok5no9SXRsAkspXowejSgoTjBfXOBaESpgAQ+QA9mKkj6B5TCIkIzHq7nASLZ OU5NReTemVCtQOI7jGcnA+dDluDsDjARLBy5QdMMY3Kpd+qxq9UHtLPibS3mxaZKT2 WVJIRG3HC+gONjLuNJbDBRzeHAq4zGu2fpmLFH08rYyst0kC56MZQB6qUG0EUdlvlH tf3HS7Ribh5GzG/qHuNxl5910w85TX4WKexrC5i/Dz2PZbLXd8vcPFtBNC8Fq/lljS DWWRzudtV/YxZXZ70NurY1KmxTOpBuVfJzBt1HqGFwPLHJlCHOsgbLOL2TiFanMYZv o8RJ06Q42jybA== Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 63FF7633A4 for ; Fri, 10 Jun 2022 14:03:42 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="LZXdxKSn"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1654862622; bh=57RCMCH2ddS8uCZM3E90CIxLhQ7NCr8PSdJyCaYE2pE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=LZXdxKSnqSyPzY6o2rHi84acQGDHIDzIqQg9icUZXsQxKwbFII0z631OzKYB5yT/o Wb3HdloWxWtfzLJuOE/7TZolZpyDJpwxYWPKtyHhAshov8Gw3eM5CnC7giBrX9c/Kz amE9guz6XVEWs9MlkE2yQOUjaKE9tb0BtehoT8Uc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([92.18.80.244]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mbir8-1nTKoS03lW-00dBpM; Fri, 10 Jun 2022 14:03:42 +0200 To: libcamera-devel@lists.libcamera.org Date: Fri, 10 Jun 2022 13:03:38 +0100 Message-Id: <20220610120338.96883-5-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220610120338.96883-1-Rauch.Christian@gmx.de> References: <20220610120338.96883-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:u1QfUdIYSEIwFXXbWte/JkcleX0EwVKw52hlNkvbKSySgbepGX9 qKd5GjPqKoxedRx4KFKOLj+ReDy3dnfe0AqXTTBrkGBL5JC/yw4VX+NNZzoKZ4qjechdZbE st3onm5ypLlMLHfBXryk2WsuSoPk65E/HghWlwsJPQ7lK3RfEUj0IrHY2d3lI3LaOb/7sqZ U1JxeSvG7LnVCckSx+CNQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:UHlmoPPN5p0=:oXJwetjbrPvk8IftyHQK+B B0SGfZVoRbch4fOb4JTYx+VOkSz8bLgT/Qu6cqKMPr20v8BXVESkjYQY1UxnyJZoXaRVXjcwb wufPzHFlGFmTcKhIbIvAYoXJqYm+Mi+5gdIbP2wlQDkN8+YGy/ea6y32ZHl1iDhfrFUs1/Nch qj9B6SGuIinFhJ3591IltSrZ8dXlE4ka+IAVZ3M8cn2fPGDXidjORxyK3ZQI70DqJ9uyd9gmI gHRo/sHasnReG4Qzi78ibXsc2o3xTqJuOHHteK8QVeUEJC7IvF9smkzL+n8pJeR+tIpl/jcyO MtTDQIOOsdehKWj9ymDNlsBQeMLz5nCble/7Jie5ZciLm8YPNoljc2qSVa9nqPo6acSD888kZ Knxtmnsj69aShzFJAWhAEXRu1I8HqEN5mkiri3wmjRu9DpA8aHIl72NFcz70h/1lmIjUVxfNu XwqSQH6Zu5dJpsQWaf9R8kxKmtQtI+FC2MjFJL4WfAXgMYwY8WkVoekCbFJaP+SQjv7zfzoGQ Yjcm7m61rti3uRECEyIlWagHb6L2iS8drgw2WiUYPennFatTYrDCzFMjo5dnsD0tMI7TGtRRh QVJgYjO/SOaofppKgwR4JcWip5ERhiUWByBlaMyceeqYsUwsRFzSL3tvG/a2jK2yshk37Jl4P Omg6GyijxaWMaOz6gI4ePS7QCUH0K3Hukl7D7vuurpO7P27MGP1Hl045GZfGTqYwkPksxH7za mkq6t51i1+E6CKxwcD88atydbKltX1MOtHjilIZikALQR9jbG7NsSxhQv7yxmbdSul3Bb/mOn ZNLwpdxSow4kuuKccSwkXD+8ePy9DZxjOCJMHJ4C/IkiLIo74iGpshVtDDHN640ZtASmxbXIP +dzo5ndbVV3atNyC2z3erFA1CHEUulLACahBGHiznHEHAomn8NkSRn/kysqzau9/31MSOD6D4 JpxYdhdLYG1EaiEANHYCh3opuNqG+wKPq1XIMOrLyWfBhLjZAASWVGQQocmB3/kebNKLvWW/O Ora1R5G/uaQ2aHiD4aanP3FTCn402Ucps+AZqhnoCCGL8U3lJaCsq1G9hPVAJdEZ04yXYOrE0 eSW94Coek/mkf7fKFJjPCuEVTvOUzUgMjKCsSxw+ywb+jM7VBLmPGRT9Q== Subject: [libcamera-devel] [PATCH v8 4/4] 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); /*