From patchwork Fri Apr 8 01:42:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 15655 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 7C48DC326C for ; Fri, 8 Apr 2022 01:42:41 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8F0FF65652; Fri, 8 Apr 2022 03:42:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1649382158; bh=OCbDJ7RSFLjMPLMkGk9bWWJ6Mx0JwZXcnyjk3bi70qI=; 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=V7a1Vv7Cl63na1dguxTEdk/ASU35+9e2tAWUQwzfnjOcfSdFAgHfLBIGilOmlq7A7 QdAVuQdr/b3gdZBHDGGMmoPODLrj2/Wxq9o1VcjAohmAbGTuI5W0OauX6uN3XUUaeg VEUU0HgkFHll3dllY56AIYeRXoWTnH18h+Jjb9Se9q0KzeIkJ8hm7mJNrc1rep7OrT aLLYB+tGQY/Unj4Etx2HGqtWzq72bknul5DGxHN2FTzuiYEtAzoJLXX3KBZ72kY525 6sCFGZsm0mfxq8pxkfo0e7lSj0M4tAwiXBmUtTE9uBvvC3AwhFpgXU0qOQrArMEZv0 02f+Cn+HgmsxQ== Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id ECFAE65641 for ; Fri, 8 Apr 2022 03:42:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=gmx.net header.i=@gmx.net header.b="jMHqo95r"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1649382155; bh=OCbDJ7RSFLjMPLMkGk9bWWJ6Mx0JwZXcnyjk3bi70qI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=jMHqo95r8IoJ46se2acSS/D4cv40ZGZpBkFpGwySTf7lMajDbNo9U3nH4nWkyg8FK pkcgu+kGPkGniA8FsmmkTISfQkcyV4wgsL2SHtl9w8ksOz7yowqJKbuNaVjBJ5UeGf +/k2pEJvo9X07e9IfnAdq6WJNt6Ksb1ds3XGSl80= 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 1N63RQ-1o5C7v28am-016QZH; Fri, 08 Apr 2022 03:42:35 +0200 To: libcamera-devel@lists.libcamera.org Date: Fri, 8 Apr 2022 02:42:30 +0100 Message-Id: <20220408014231.231083-4-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220408014231.231083-1-Rauch.Christian@gmx.de> References: <20220408014231.231083-1-Rauch.Christian@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:4MkCzefP3WxK74Nf8D5bqXR/5AMTla6+FGcLYGpkxvZZRJ2ygvF dBAGBsUeE9zVqXrzobto/Qd6rJoFS7uFLQddv6pFcY29Ojqfd1mLF/2C20fMijplYvZf2HL a/ZzXx5tfi6TZDjdePcq8Fca09Wq6WjRan4/sbTf10utML3u6rOoM1X8WH0dNY4CFjktSU2 kL+2gaGeG5nEb2VzimQFw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:0qPSGG8ZJgc=:XSukAi2h6SenPQWfvAqxbc KQB41xrjWCzugovt6HtGGiBJANPKuJhr9Bd8wOe/9QwUI6tRo2ogsrG5LrcPtBfZXOq7U4jn/ MW0pjowL3m9HgMPCd/R1aEHOVutp8GQb6K9FH3YOFORV3PpdPaOFl+6tPbdTj/6vTWDnOcGt6 GOXIeTktcokROiYLFNFvYeqe5yNHczm+0EY1tH2tclr5Xthj4ED+IkRn2ZzTrJTBp8ZdU0ofw 4Yvg5bmFnECTQUvNHq9Ukz9ZqCbVEgSaphJMCSrowiFwgJ5rbvWHPHxKFH/ookS0X45K+SpTb xTa84847unEEx60+isy4FGJ+Ce9suOad52RKuZAI998zWqqaJXxP1CSSNYYyrB30cdctplfF4 6IUc4jVGWtxFxazwmJKQHXdIVAswGdyBjkhIAV+JuiygF5XxazpGgwJ/d3Ym862esPnfoGJjf BHxOT44S6Mj72rpfi/rUjK5TesUQRs/9kSSQrs+jl3q6K1NszG8XTTO/qEoE224x/0EjHshs2 NSloN0igZloxkCwTbxSQFlkrReJarjAzBYYCi1j0OU+pPC1SMETL5e9ZE3W1ToIY35irjzyuh wYGsINYG9s2TOdpxRLOFpeC5RGTgVlFM1VhLPxC9Zwfr5KjdPNHzWnHgmZCkM/U26hIo1mQno 6up0D42ES0zw5acIkMS+BCm35ajuNow6FLhRc9G39s+6rRrekcyO85jFZLGivmNE4uM18Djvr mDvCuXesOeIRdux78FqEqjIQJWSqZ8/wrubLL9rEg//OHjmXLAMXT2y/1c5rpT/hQz881oD74 uKpz5mNWNCXq4jRYcYLeVknTTHgNCPK9QNSnFCTZ/cNTptePnHHFhsny/8RkeGQ3Z1qg2bgyj WSV51PHMaWsw+111eJ7/EflIkTNBwjUAZhra/wfGY5WaLEXTcgBAyKf2nBE8PI9fKoYh7TV6T hhzIiLjboVm3lfIQTn07xYLmvEESO6b+Aez/nMHcFF3m37O0LEqpyYZDakoxo0cjXjB/g+JqL zCcqQWOnSfYPDJdSn+wwJb7J/F6TJmYpeImZtlFrcQEFqKpFczVUG01n6+zIkHySTwwPhsX0Z lccYAYMLB53AgM= Subject: [libcamera-devel] [PATCH v3 3/4] 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 | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) -- 2.25.1 diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 89767a9d..5a5cdf66 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -500,18 +500,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) { @@ -816,7 +816,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; } @@ -1100,8 +1100,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 d6148724..0fa294d4 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -1696,7 +1696,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 34c8df5a..2fb527d8 100644 --- a/src/qcam/dng_writer.cpp +++ b/src/qcam/dng_writer.cpp @@ -438,7 +438,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 */ @@ -446,7 +446,7 @@ int DNGWriter::write(const char *filename, const Camera *camera, } } if (metadata.contains(controls::ColourCorrectionMatrix)) { - Span const &coeffs = metadata.get(controls::ColourCorrectionMatrix); + Span const &coeffs = metadata.get(controls::ColourCorrectionMatrix); Matrix3d ccmSupplied(coeffs); if (ccmSupplied.determinant() > eps) ccm = ccmSupplied; @@ -515,7 +515,7 @@ int DNGWriter::write(const char *filename, const Camera *camera, uint32_t whiteLevel = (1 << info->bitsPerSample) - 1; if (metadata.contains(controls::SensorBlackLevels)) { - Span levels = metadata.get(controls::SensorBlackLevels); + Span levels = metadata.get(controls::SensorBlackLevels); /* * The black levels control is specified in R, Gr, Gb, B order.