{"id":12057,"url":"https://patchwork.libcamera.org/api/1.1/patches/12057/?format=json","web_url":"https://patchwork.libcamera.org/patch/12057/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210422021809.520675-4-hiroh@chromium.org>","date":"2021-04-22T02:18:08","name":"[libcamera-devel,v4,3/4] libcamera: V4L2Device: Use std::vector for v4l2_ext_control in setControls()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4f43ca926bcf322572917d4440e1b45c3be9cc24","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/1.1/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12057/mbox/","series":[{"id":1959,"url":"https://patchwork.libcamera.org/api/1.1/series/1959/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1959","date":"2021-04-22T02:18:05","name":"Clean up V4L2Device code","version":4,"mbox":"https://patchwork.libcamera.org/series/1959/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12057/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12057/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 DCFF8BDB15\n\tfor ;\n\tThu, 22 Apr 2021 02:18:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6FEA26885B;\n\tThu, 22 Apr 2021 04:18:22 +0200 (CEST)","from mail-pl1-x632.google.com (mail-pl1-x632.google.com\n\t[IPv6:2607:f8b0:4864:20::632])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ACF4C68849\n\tfor ;\n\tThu, 22 Apr 2021 04:18:20 +0200 (CEST)","by mail-pl1-x632.google.com with SMTP id v13so9137956ple.9\n\tfor ;\n\tWed, 21 Apr 2021 19:18:20 -0700 (PDT)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:2:f88:d5a0:ebc4:5b76])\n\tby smtp.gmail.com with ESMTPSA id\n\tlt11sm3352480pjb.23.2021.04.21.19.18.17\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 21 Apr 2021 19:18:18 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"NNZcFXY2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=U3RImDmwzVIe880ArB4ZstBuCN+woBU2v98B5nJinbs=;\n\tb=NNZcFXY2fCesgiM0SnwpInVh5mwFS2gjHWxqrdkrj2H6qc+5j4GxlJujlEYNVgobvh\n\tqLjx+rzSTlmKJJ/Hl9D8MwvvU6BFsFiPXrdiAjGALLqkti1AKSXsKGlTft70KsVrq8bu\n\tKpYK4RDjaCbvwdQ5+swrGVnWiCS5O8W1G4s8o=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=U3RImDmwzVIe880ArB4ZstBuCN+woBU2v98B5nJinbs=;\n\tb=R7ZPS5rLXsrliczxUQzpjOl1xVQWsDMCLj/gjZYo4TXSgKMWq+gnz9B/G3/dYn/Jyp\n\tp2CvC82J91gqXl/lFRvLdc0xNLR3eyQlIwehCgPaPpK81NzgrUr3HKqe7aGA9tBOtR5M\n\tRJ2iU3lUVryNHhWoBqwXP1aAD5eT42jfJ/VtpGcAef2yS/QfkSou3JOCnJyMeOIJPVid\n\trUde3TcAak9/0jbKQu6UdPPoiLuE9R3mUqye1qi1bSlGzyL6GOk6C2ClKQjsOAQ+SlFF\n\tTTVhZ65Qn1G0wEQJsbrkh2y2KnujEJtBpYZPzXje2gs/rjTA87NQLpfnvg+sfOpxlhEW\n\tUvWg==","X-Gm-Message-State":"AOAM532gTeWAa38HUh4lvDne58QWBjgQphEUUt73e3BKSTbDWlammMf5\n\t+je0Ge1LhhWKMGy1mms7vM0cglfoacDGuA==","X-Google-Smtp-Source":"ABdhPJzyYTJwNVR393mld/KHyAqPHPOT9ILArBBwSA1H7aZB1wuyH6ycwb9GX6NxONRJkvW1vRabKw==","X-Received":"by 2002:a17:90a:9511:: with SMTP id\n\tt17mr14928444pjo.235.1619057899008; \n\tWed, 21 Apr 2021 19:18:19 -0700 (PDT)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 22 Apr 2021 11:18:08 +0900","Message-Id":"<20210422021809.520675-4-hiroh@chromium.org>","X-Mailer":"git-send-email 2.31.1.368.gbe11c130af-goog","In-Reply-To":"<20210422021809.520675-1-hiroh@chromium.org>","References":"<20210422021809.520675-1-hiroh@chromium.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 3/4] libcamera: V4L2Device: Use\n\tstd::vector for v4l2_ext_control 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":"The 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 \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 617e6ec9..9f71bf0e 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -273,30 +273,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@@ -308,32 +306,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@@ -342,11 +338,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","v4","3/4"]}