[{"id":16374,"web_url":"https://patchwork.libcamera.org/comment/16374/","msgid":"","date":"2021-04-20T01:16:58","subject":"Re: [libcamera-devel] [PATCH v2 3/3] libcamera: V4L2Device: Use\n\tstd::vector in updateControls()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Thu, Apr 15, 2021 at 01:48:54PM +0900, Hirokazu Honda wrote:\n> V4L2Device::updateControls() takes two arguments, raw array and\n> its size, for the v4l2_ext_control values. This replaces it with\n> std::vector.\n\nEven better, you can use Span.\n\n> Signed-off-by: Hirokazu Honda \n> ---\n> include/libcamera/internal/v4l2_device.h | 3 +--\n> src/libcamera/v4l2_device.cpp | 11 ++++-------\n> 2 files changed, 5 insertions(+), 9 deletions(-)\n> \n> diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h\n> index d006bf68..4cce3840 100644\n> --- a/include/libcamera/internal/v4l2_device.h\n> +++ b/include/libcamera/internal/v4l2_device.h\n> @@ -55,8 +55,7 @@ protected:\n> private:\n> \tvoid listControls();\n> \tvoid updateControls(ControlList *ctrls,\n> -\t\t\t const struct v4l2_ext_control *v4l2Ctrls,\n> -\t\t\t unsigned int count);\n> +\t\t\t const std::vector &v4l2Ctrls);\n> \n> \tvoid eventAvailable(EventNotifier *notifier);\n> \n> diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\n> index 5ec1b10e..217a39e3 100644\n> --- a/src/libcamera/v4l2_device.cpp\n> +++ b/src/libcamera/v4l2_device.cpp\n> @@ -250,7 +250,7 @@ ControlList V4L2Device::getControls(const std::vector &ids)\n> \t\tv4l2Ctrls.resize(errorIdx);\n> \t}\n> \n> -\tupdateControls(&ctrls, v4l2Ctrls.data(), v4l2Ctrls.size());\n> +\tupdateControls(&ctrls, v4l2Ctrls);\n> \n> \treturn ctrls;\n> }\n> @@ -350,7 +350,7 @@ int V4L2Device::setControls(ControlList *ctrls)\n> \t\tret = errorIdx;\n> \t}\n> \n> -\tupdateControls(ctrls, v4l2Ctrls.data(), v4l2Ctrls.size());\n> +\tupdateControls(ctrls, v4l2Ctrls);\n> \n> \treturn ret;\n> }\n> @@ -514,14 +514,11 @@ void V4L2Device::listControls()\n> * values in \\a v4l2Ctrls\n> * \\param[inout] ctrls List of V4L2 controls to update\n> * \\param[in] v4l2Ctrls List of V4L2 extended controls as returned by the driver\n> - * \\param[in] count The number of controls to update\n> */\n> void V4L2Device::updateControls(ControlList *ctrls,\n> -\t\t\t\tconst struct v4l2_ext_control *v4l2Ctrls,\n> -\t\t\t\tunsigned int count)\n> +\t\t\t\tconst std::vector &v4l2Ctrls)\n> {\n> -\tfor (unsigned int i = 0; i < count; i++) {\n> -\t\tconst struct v4l2_ext_control &v4l2Ctrl = v4l2Ctrls[i];\n> +\tfor (const v4l2_ext_control &v4l2Ctrl : v4l2Ctrls) {\n> \t\tconst unsigned int id = v4l2Ctrl.id;\n> \t\tif (!ctrls->contains(id)) {\n> \t\t\tLOG(V4L2, Error) << \"ControlList doesn't contain id: \"","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 761CABD814\n\tfor ;\n\tTue, 20 Apr 2021 01:17:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3A3B168838;\n\tTue, 20 Apr 2021 03:17:03 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 12CE5602CA\n\tfor ;\n\tTue, 20 Apr 2021 03:17:02 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9C806470;\n\tTue, 20 Apr 2021 03:17:01 +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=\"u5Sa93pz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1618881421;\n\tbh=anZqTi2eJNwek/HwQ57+kM64TEm6/lHQZcTjgkDjVew=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=u5Sa93pznqprvGNrt+vw813YSqBqUAaekeX4zC/c4u2gvkZm6aTn/mKRQu6j8/Fb3\n\tlPifcKb2Qzb6twM8M/xn0dYX5Q6Gt4mqCf/rZKFJVZq9rpsTpbQ5NAggLiEAO3Oj7S\n\tgoYXBGaTHU4wmtex8m5IGQpyOOXeUwn+KX2PCgwE=","Date":"Tue, 20 Apr 2021 04:16:58 +0300","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210415044854.3348529-1-hiroh@chromium.org>\n\t<20210415044854.3348529-3-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210415044854.3348529-3-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v2 3/3] libcamera: V4L2Device: Use\n\tstd::vector in updateControls()","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]