{"id":12105,"url":"https://patchwork.libcamera.org/api/patches/12105/?format=json","web_url":"https://patchwork.libcamera.org/patch/12105/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210426001220.15599-3-laurent.pinchart@ideasonboard.com>","date":"2021-04-26T00:12:19","name":"[libcamera-devel,v6,2/3] libcamera: V4L2Device: Replace VLA with std::vector in setControls()","commit_ref":"3c0e99e0341559968361eea231a2b5e5dae6034d","pull_url":null,"state":"accepted","archived":false,"hash":"4f43ca926bcf322572917d4440e1b45c3be9cc24","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":{"id":14,"url":"https://patchwork.libcamera.org/api/users/14/?format=json","username":"pinchartl","first_name":"Laurent","last_name":"Pinchart","email":"laurent.pinchart@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/12105/mbox/","series":[{"id":1973,"url":"https://patchwork.libcamera.org/api/series/1973/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1973","date":"2021-04-26T00:12:17","name":"libcamera: V4L2Device: VLA removal","version":6,"mbox":"https://patchwork.libcamera.org/series/1973/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12105/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12105/checks/","tags":{},"headers":{"Return-Path":"","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 3DBD1BDC92\n\tfor ;\n\tMon, 26 Apr 2021 00:12:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 97C5B68881;\n\tMon, 26 Apr 2021 02:12:37 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 319DC6887A\n\tfor ;\n\tMon, 26 Apr 2021 02:12:34 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C484BD3C;\n\tMon, 26 Apr 2021 02:12:33 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"TLhBZRNb\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1619395954;\n\tbh=CggdWiDHGSJk94n+JYuLxQLTPJsZVdBVtXXb/+ZhBpE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=TLhBZRNbR6mnc2RdhUJEZrkryjQPmCCnVOpL2DwxWpFew3+8hgKvDDps2ovpeJZsP\n\tY2iA+v9UKoO1FugvnmgtRYvfuLTo+YJ6X+8U5evy2eeiV8sb+fhAc4FhQ6+TvjgVl0\n\thhuYh+xRLbAifti4NX5g2V0u8d/4Qa4Qhnf4DCXw=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 26 Apr 2021 03:12:19 +0300","Message-Id":"<20210426001220.15599-3-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.28.1","In-Reply-To":"<20210426001220.15599-1-laurent.pinchart@ideasonboard.com>","References":"<20210426001220.15599-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v6 2/3] libcamera: V4L2Device: Replace VLA\n\twith std::vector in setControls()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Hirokazu Honda \n\nThe original code uses Variable-Length-Array, which is not\nofficially supported in C++. This replaces the array with\nstd::vector.\n\nSigned-off-by: Hirokazu Honda \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/v4l2_device.cpp | 39 ++++++++++++++++-------------------\n 1 file changed, 18 insertions(+), 21 deletions(-)","diff":"diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 3a4df4f6c098..6a2bfffe850c 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -282,30 +282,28 @@ ControlList V4L2Device::getControls(const std::vector &ids)\n */\n int V4L2Device::setControls(ControlList *ctrls)\n {\n-\tunsigned int count = ctrls->size();\n-\tif (count == 0)\n+\tif (ctrls->empty())\n \t\treturn 0;\n \n-\tstruct v4l2_ext_control v4l2Ctrls[count];\n-\tmemset(v4l2Ctrls, 0, sizeof(v4l2Ctrls));\n+\tstd::vector v4l2Ctrls(ctrls->size());\n+\tmemset(v4l2Ctrls.data(), 0, sizeof(v4l2_ext_control) * ctrls->size());\n \n-\tunsigned int i = 0;\n-\tfor (auto &ctrl : *ctrls) {\n-\t\tunsigned int id = ctrl.first;\n+\tfor (auto [ctrl, i] = std::pair(ctrls->begin(), 0u); i < ctrls->size(); ctrl++, i++) {\n+\t\tconst unsigned int id = ctrl->first;\n \t\tconst auto iter = controls_.find(id);\n \t\tif (iter == controls_.end()) {\n \t\t\tLOG(V4L2, Error)\n \t\t\t\t<< \"Control \" << utils::hex(id) << \" not found\";\n \t\t\treturn -EINVAL;\n \t\t}\n-\n-\t\tv4l2Ctrls[i].id = id;\n+\t\tv4l2_ext_control &v4l2Ctrl = v4l2Ctrls[i];\n+\t\tv4l2Ctrl.id = id;\n \n \t\t/* Set the v4l2_ext_control value for the write operation. */\n-\t\tControlValue &value = ctrl.second;\n+\t\tControlValue &value = ctrl->second;\n \t\tswitch (iter->first->type()) {\n \t\tcase ControlTypeInteger64:\n-\t\t\tv4l2Ctrls[i].value64 = value.get();\n+\t\t\tv4l2Ctrl.value64 = value.get();\n \t\t\tbreak;\n \n \t\tcase ControlTypeByte: {\n@@ -317,32 +315,30 @@ int V4L2Device::setControls(ControlList *ctrls)\n \t\t\t}\n \n \t\t\tSpan data = value.data();\n-\t\t\tv4l2Ctrls[i].p_u8 = data.data();\n-\t\t\tv4l2Ctrls[i].size = data.size();\n+\t\t\tv4l2Ctrl.p_u8 = data.data();\n+\t\t\tv4l2Ctrl.size = data.size();\n \n \t\t\tbreak;\n \t\t}\n \n \t\tdefault:\n \t\t\t/* \\todo To be changed to support strings. */\n-\t\t\tv4l2Ctrls[i].value = value.get();\n+\t\t\tv4l2Ctrl.value = value.get();\n \t\t\tbreak;\n \t\t}\n-\n-\t\ti++;\n \t}\n \n \tstruct v4l2_ext_controls v4l2ExtCtrls = {};\n \tv4l2ExtCtrls.which = V4L2_CTRL_WHICH_CUR_VAL;\n-\tv4l2ExtCtrls.controls = v4l2Ctrls;\n-\tv4l2ExtCtrls.count = count;\n+\tv4l2ExtCtrls.controls = v4l2Ctrls.data();\n+\tv4l2ExtCtrls.count = v4l2Ctrls.size();\n \n \tint ret = ioctl(VIDIOC_S_EXT_CTRLS, &v4l2ExtCtrls);\n \tif (ret) {\n \t\tunsigned int errorIdx = v4l2ExtCtrls.error_idx;\n \n \t\t/* Generic validation error. */\n-\t\tif (errorIdx == 0 || errorIdx >= count) {\n+\t\tif (errorIdx == 0 || errorIdx >= v4l2Ctrls.size()) {\n \t\t\tLOG(V4L2, Error) << \"Unable to set controls: \"\n \t\t\t\t\t << strerror(-ret);\n \t\t\treturn -EINVAL;\n@@ -351,11 +347,12 @@ int V4L2Device::setControls(ControlList *ctrls)\n \t\t/* A specific control failed. */\n \t\tLOG(V4L2, Error) << \"Unable to set control \" << errorIdx\n \t\t\t\t << \": \" << strerror(-ret);\n-\t\tcount = errorIdx - 1;\n+\n+\t\tv4l2Ctrls.resize(errorIdx);\n \t\tret = errorIdx;\n \t}\n \n-\tupdateControls(ctrls, v4l2Ctrls, count);\n+\tupdateControls(ctrls, v4l2Ctrls.data(), v4l2Ctrls.size());\n \n \treturn ret;\n }\n","prefixes":["libcamera-devel","v6","2/3"]}