Patch Detail
Show a patch.
GET /api/1.1/patches/16541/?format=api
{ "id": 16541, "url": "https://patchwork.libcamera.org/api/1.1/patches/16541/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16541/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220704233217.54769-5-Rauch.Christian@gmx.de>", "date": "2022-07-04T23:32:17", "name": "[libcamera-devel,v9,4/4] libcamera: controls: Apply explicit fixed-sized Span type casts", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "a358875a43334b6d79c547a4343fd8a7c26da02c", "submitter": { "id": 111, "url": "https://patchwork.libcamera.org/api/1.1/people/111/?format=api", "name": "Christian Rauch", "email": "Rauch.Christian@gmx.de" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/16541/mbox/", "series": [ { "id": 3250, "url": "https://patchwork.libcamera.org/api/1.1/series/3250/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3250", "date": "2022-07-04T23:32:13", "name": "generate and use fixed-sized Span Control types", "version": 9, "mbox": "https://patchwork.libcamera.org/series/3250/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16541/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16541/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id AAE00C3273\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 4 Jul 2022 23:32:40 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5534F63312;\n\tTue, 5 Jul 2022 01:32:38 +0200 (CEST)", "from mout.gmx.net (mout.gmx.net [212.227.15.15])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 998296330C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 5 Jul 2022 01:32:34 +0200 (CEST)", "from localhost.localdomain ([92.18.80.244]) by mail.gmx.net\n\t(mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id\n\t1N1Obh-1nRulV0ckl-012slJ; Tue, 05 Jul 2022 01:32:34 +0200" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656977558;\n\tbh=qdkppGAt8GGAkIW4ikxxbmnaUy8g9qZLK3Flsvri9Po=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=SjuAQFDMBvvTOEUHnN0Su196RLfw4MF1V5PO3MBywyl+oHyZpcwG3A7iiTxok5NzQ\n\tzTadlgQ4Ng5rSNdOrW+YwBavPesfZNHUxh6aZSL3tYPLDvDatvRYxrrBU2Ybl3k7FQ\n\tkerv3N4BlI2pL7Rb4/mIhSePUXPCjsLK/iN5JArjynjL7h4TKRDssZKsVszomzvvBH\n\tfGdNBA0ge67VAQKVgBt6IH4z+V05iJqTVQ/CG1gkUFHca1Oyc0swfQ+G8bMI7OhimS\n\tLY7S98T+/HkOz/EBZFXTzP+H5iw4VskwoZGf0jkOaWyKJgicHcCD2b4yby02aOeInA\n\tOEIyIFgPl5D/w==", "v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;\n\ts=badeba3b8450; t=1656977554;\n\tbh=qdkppGAt8GGAkIW4ikxxbmnaUy8g9qZLK3Flsvri9Po=;\n\th=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;\n\tb=DNs4v97kzwUqiDBiw4luqv60XYDYkD7VU7XXLfvt3T+vwWTDM+/bqKvR8HAN0WbZW\n\t5Ao1hCISkDLqu9NiRmXVUK6HXRR42ADQPRZJ1NiOCGrwmL4VP5Vh3Non7miWTl9JZe\n\ty5vKgmRY7ZsphaHAg/bpa8ERWZL0cJFjWqKD0rFw=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=gmx.net header.i=@gmx.net\n\theader.b=\"DNs4v97k\"; dkim-atps=neutral", "X-UI-Sender-Class": "01bb95c1-4bf8-414a-932a-4f6e2808ef9c", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 5 Jul 2022 00:32:17 +0100", "Message-Id": "<20220704233217.54769-5-Rauch.Christian@gmx.de>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20220704233217.54769-1-Rauch.Christian@gmx.de>", "References": "<20220704233217.54769-1-Rauch.Christian@gmx.de>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "quoted-printable", "X-Provags-ID": "V03:K1:7iGohiHwf4goJ8QSBa2b5vs3GqQZLSC43gEm+OFgl7eE1EZVs3w\n\tiPMBIVCPoAeE38cq1GjUnKzPNZe0kvYtukYa6mvCdTP4s9K8xoOyTvB82zyiOaRuxpLpz8a\n\tiBvL+MEWoy8UTpmlIbzO2kNmO3LYp8MeUmjsY70V0ddnRtoQJetermTenq5eyT4fQ9v/aFs\n\tW13c+x2NdWSGYvJk+DNjg==", "X-Spam-Flag": "NO", "X-UI-Out-Filterresults": "notjunk:1; V03:K0:lR1VDFReXY8=:5KFSP0n3LU1Etao7ho9RLe\n\tDPlvTI7xDogeILMtxOmW//0vpslnaZKz4HHrdSO2n73H/I2U+qv+PJB0cSGUNzIiCdc5bYbhO\n\tIKsxOC6ph3SJ8hr9JnRNXPEN/sF6duntDIqoCK9rWrACeksdARCl9j2itXiCvVbXiSCebws4K\n\tntyd8xRtagS5bUzZlnS431IECsC0PtoQRDlwn7iBC34cT0N4/RjUsVgiVM9qjXkQpuaSRrOs6\n\tF6wviacNEbuimCA4tgge6sCTd9yzUJC282D7CpiMk+90QzsiyfmR2LxkAEXhCmavBeYQoiEok\n\tCvi4jVOrUbxJ2TxjcmpJKRUNi8iD8IBWPUl6D71sPsuin1UppF41qGM9hNL4LKho0Q6mXp3Tw\n\txx7JZp697fM8g5Dc2xQzus3MzfryhyinWm/w5Pw6U3JbQmZaKvqbCMKCaoxoTqy3GKQFnYgm8\n\tRl5DwWhl3XJUxVlo4sDKE5dYQ0xmq/ITwySiYg0MmXA5gop5nOy+LCh9uL24grZiXSZXBsfq2\n\tPZZxVUGW42yDYjJoZUcpkFhO3xdDBzbMGttRbYCNscIewBp5pC5USM12oA7VCR9wba1ZgG4Zl\n\tM+LzUMm9XIbgEQw9vzbkJKwPosz+FV85JJ9gPpXAdGVDYFZsRLqpqJSTgqtTKULPV2iZsgXId\n\teLudvWOmKGdgAJqAp0ysA7x73rzxvylRV07IKIRkmuVo7JbtOhqZenAHrD3pivolo4QhOkeeI\n\tTvnI3Hmu0O+EH4NiwkWcSwuxvw6uTkyuKGNPZBPNavuFowlc+kJYgugmKy2DtTtcz3aXTeOqT\n\tZsupd4xPoFMLMub9KHdZHwB1RT5qxO1oRyhvcOqigRaKjiv+hoiMvDIao4RBGvDHtp4CCPB1r\n\ttPwGxsCtkprOzFbgscBn50o2kNCPxKT158CkCXJc2KXrwvzrSdrgfpXWDFrt4QD3Sm/UP0xYs\n\tkMTJPPm9vISyB5Xkhhq1G79Logx0QgjHA141lc+gKayEhFDKlRCILUJxXBQCvvwbfDTxYtC1S\n\tg9rVajQ0P7XfT0hxm/GragqNi4QoNxw/YrodgaAOeOFmoydA3V7BrVyp7PReSQD7lPzqF82bK\n\t4LMe86IPVDE/rxp3ljegxISSCL9LrsVLFU2FbBgnvyPMAVxTC4RhLbPqA==", "Subject": "[libcamera-devel] [PATCH v9 4/4] libcamera: controls: Apply\n\texplicit fixed-sized Span type casts", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Christian Rauch via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Christian Rauch <Rauch.Christian@gmx.de>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The change of types of some Controls from variable- to fixed-sized requires\nexplicit casting of FrameDurationLimits, ColourGains and SensorBlackLevels.\n\nSigned-off-by: Christian Rauch <Rauch.Christian@gmx.de>\n---\n include/libcamera/controls.h | 2 +-\n src/ipa/raspberrypi/raspberrypi.cpp | 19 ++++++++++---------\n .../pipeline/raspberrypi/raspberrypi.cpp | 2 +-\n src/qcam/dng_writer.cpp | 2 +-\n 4 files changed, 13 insertions(+), 12 deletions(-)\n\n--\n2.34.1", "diff": "diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 192be784..a19f1845 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -168,7 +168,7 @@ public:\n\n \t\tusing V = typename T::value_type;\n \t\tconst V *value = reinterpret_cast<const V *>(data().data());\n-\t\treturn { value, numElements_ };\n+\t\treturn T{ value, numElements_ };\n \t}\n\n #ifndef __DOXYGEN__\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex c7492a77..baaa1e08 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -559,18 +559,19 @@ void IPARPi::reportMetadata()\n\n \tAwbStatus *awbStatus = rpiMetadata_.GetLocked<AwbStatus>(\"awb.status\");\n \tif (awbStatus) {\n-\t\tlibcameraMetadata_.set(controls::ColourGains, { static_cast<float>(awbStatus->gain_r),\n-\t\t\t\t\t\t\t\tstatic_cast<float>(awbStatus->gain_b) });\n+\t\tlibcameraMetadata_.set(controls::ColourGains,\n+\t\t\t\t Span<const float, 2>({ static_cast<float>(awbStatus->gain_r),\n+\t\t\t\t\t\t\t static_cast<float>(awbStatus->gain_b) }));\n \t\tlibcameraMetadata_.set(controls::ColourTemperature, awbStatus->temperature_K);\n \t}\n\n \tBlackLevelStatus *blackLevelStatus = rpiMetadata_.GetLocked<BlackLevelStatus>(\"black_level.status\");\n \tif (blackLevelStatus)\n \t\tlibcameraMetadata_.set(controls::SensorBlackLevels,\n-\t\t\t\t { static_cast<int32_t>(blackLevelStatus->black_level_r),\n-\t\t\t\t\t static_cast<int32_t>(blackLevelStatus->black_level_g),\n-\t\t\t\t\t static_cast<int32_t>(blackLevelStatus->black_level_g),\n-\t\t\t\t\t static_cast<int32_t>(blackLevelStatus->black_level_b) });\n+\t\t\t\t Span<const int32_t, 4>({ blackLevelStatus->black_level_r,\n+\t\t\t\t\t\t\t\tblackLevelStatus->black_level_g,\n+\t\t\t\t\t\t\t\tblackLevelStatus->black_level_g,\n+\t\t\t\t\t\t\t\tblackLevelStatus->black_level_b }));\n\n \tFocusStatus *focusStatus = rpiMetadata_.GetLocked<FocusStatus>(\"focus.status\");\n \tif (focusStatus && focusStatus->num == 12) {\n@@ -875,7 +876,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \t\t\tif (gains[0] != 0.0f && gains[1] != 0.0f)\n \t\t\t\t/* A gain of 0.0f will switch back to auto mode. */\n \t\t\t\tlibcameraMetadata_.set(controls::ColourGains,\n-\t\t\t\t\t\t { gains[0], gains[1] });\n+\t\t\t\t\t\t Span<const float, 2>({ gains[0], gains[1] }));\n \t\t\tbreak;\n \t\t}\n\n@@ -1159,8 +1160,8 @@ void IPARPi::applyFrameDurations(Duration minFrameDuration, Duration maxFrameDur\n\n \t/* Return the validated limits via metadata. */\n \tlibcameraMetadata_.set(controls::FrameDurationLimits,\n-\t\t\t { static_cast<int64_t>(minFrameDuration_.get<std::micro>()),\n-\t\t\t\t static_cast<int64_t>(maxFrameDuration_.get<std::micro>()) });\n+\t\t\t Span<const int64_t, 2>({ static_cast<int64_t>(minFrameDuration_.get<std::micro>()),\n+\t\t\t\t\t\t\tstatic_cast<int64_t>(maxFrameDuration_.get<std::micro>()) }));\n\n \t/*\n \t * Calculate the maximum exposure time possible for the AGC to use.\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 28f054cb..d88aa256 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -1717,7 +1717,7 @@ void RPiCameraData::statsMetadataComplete(uint32_t bufferId, const ControlList &\n \t * V4L2_CID_NOTIFY_GAINS control (which means notifyGainsUnity_ is set).\n \t */\n \tif (notifyGainsUnity_ && controls.contains(libcamera::controls::ColourGains)) {\n-\t\tlibcamera::Span<const float> colourGains =\n+\t\tlibcamera::Span<const float, 2> colourGains =\n \t\t\t*controls.get(libcamera::controls::ColourGains);\n \t\t/* The control wants linear gains in the order B, Gb, Gr, R. */\n \t\tControlList ctrls(sensor_->controls());\ndiff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\nindex 4b5d8276..23612be0 100644\n--- a/src/qcam/dng_writer.cpp\n+++ b/src/qcam/dng_writer.cpp\n@@ -514,7 +514,7 @@ int DNGWriter::write(const char *filename, const Camera *camera,\n \tuint32_t whiteLevel = (1 << info->bitsPerSample) - 1;\n\n \tif (metadata.contains(controls::SensorBlackLevels)) {\n-\t\tSpan<const int32_t> levels =\n+\t\tSpan<const int32_t, 4> levels =\n \t\t\t*metadata.get(controls::SensorBlackLevels);\n\n \t\t/*\n", "prefixes": [ "libcamera-devel", "v9", "4/4" ] }