{"id":11935,"url":"https://patchwork.libcamera.org/api/1.1/patches/11935/?format=json","web_url":"https://patchwork.libcamera.org/patch/11935/","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":"<20210415044854.3348529-1-hiroh@chromium.org>","date":"2021-04-15T04:48:52","name":"[libcamera-devel,v2,1/3] libcamera: V4L2Device: Use std::vector for v4l2_ext_control in getControls()","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"cccc948498f773c17f5105ed970a7c1e3c08bffd","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/11935/mbox/","series":[{"id":1932,"url":"https://patchwork.libcamera.org/api/1.1/series/1932/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1932","date":"2021-04-15T04:48:52","name":"[libcamera-devel,v2,1/3] libcamera: V4L2Device: Use std::vector for v4l2_ext_control in getControls()","version":2,"mbox":"https://patchwork.libcamera.org/series/1932/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11935/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11935/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 46561BD1F6\n\tfor ;\n\tThu, 15 Apr 2021 04:49:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0885468812;\n\tThu, 15 Apr 2021 06:49:03 +0200 (CEST)","from mail-pf1-x430.google.com (mail-pf1-x430.google.com\n\t[IPv6:2607:f8b0:4864:20::430])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 77C56602C7\n\tfor ;\n\tThu, 15 Apr 2021 06:49:01 +0200 (CEST)","by mail-pf1-x430.google.com with SMTP id o123so15246847pfb.4\n\tfor ;\n\tWed, 14 Apr 2021 21:49:01 -0700 (PDT)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:2:84f5:7981:dfbe:8f02])\n\tby smtp.gmail.com with ESMTPSA id\n\tkk6sm833885pjb.51.2021.04.14.21.48.58\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 14 Apr 2021 21:48:59 -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=\"mtyr7Fdz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; h=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=3Vo+IG2mc7UoxNBnK/5Lk1VvKmbhE/s7kiIKI3T0kTA=;\n\tb=mtyr7FdzwcBqxljMtY1WtMzHsyaXcxpz1/kJB3T+vH5y1z5xzuedoRdZA00RhJs+e6\n\t32aGoS9HGAjWXObmZo/zFYjxKT+srUroSktUyd+6cbfEkRSImF4/3VT6RHh6CNUd4Dcv\n\tAsTgFQVk+vPEAkAkvlqkGEYx0f7tbic25ZOxA=","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:mime-version\n\t:content-transfer-encoding;\n\tbh=3Vo+IG2mc7UoxNBnK/5Lk1VvKmbhE/s7kiIKI3T0kTA=;\n\tb=MxUI4rblzt4ZE04LZLMfAyjBRK3/F2ia4gn8UXBDk4YX1Ke3xg8vMc0PezB81wZhVY\n\t0DNURwVNNxTz7J0SSjF4ZlO+908cU0asty7//076L3symfsyMQDg0wcSyuKF90HnTsIj\n\tG3Rzxh3vadMSj+9e3aB1vuV0oWr7KtjxB42FQ9lAi3jhT0QIdvCXVMu+0QxLJ5nMmdIA\n\tpd3zahzTDjdKfQ3QEIf/tKiLKHjn7geX7x96mVb1HeA0v1fx8d/tnkjPs3vMZ69Tsb+a\n\tTrtmEiKn0sDMES7GaW6cg7HhFMj9r79T4WUeewD7qe2vS4ofK7Tb/Qmr+URHNiyTw0+u\n\t07/w==","X-Gm-Message-State":"AOAM532kWcXKl8ru+U/yyHCbXLkklro6+/SeQzu6xyCZvO3yA4p/K7es\n\tWb2QlCME2apjOIZg1NMQs1lqjeIIiOBxCw==","X-Google-Smtp-Source":"ABdhPJy9AMgc8HpJ4pXYSCZIXI1nyLWuuIvTFU82yMPp4EnwECOQcgmgbAAQqyEhpatgU4CPE/tjUw==","X-Received":"by 2002:a63:64c6:: with SMTP id\n\ty189mr1757127pgb.267.1618462139961; \n\tWed, 14 Apr 2021 21:48:59 -0700 (PDT)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 15 Apr 2021 13:48:52 +0900","Message-Id":"<20210415044854.3348529-1-hiroh@chromium.org>","X-Mailer":"git-send-email 2.31.1.368.gbe11c130af-goog","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 1/3] libcamera: V4L2Device: Use\n\tstd::vector for v4l2_ext_control in getControls()","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 \n---\n src/libcamera/v4l2_device.cpp | 43 ++++++++++++++++-------------------\n 1 file changed, 20 insertions(+), 23 deletions(-)","diff":"diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 8fd79934..ee8c3fed 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -173,8 +173,7 @@ void V4L2Device::close()\n */\n ControlList V4L2Device::getControls(const std::vector &ids)\n {\n-\tunsigned int count = ids.size();\n-\tif (count == 0)\n+\tif (ids.empty())\n \t\treturn {};\n \n \tControlList ctrls;\n@@ -196,22 +195,25 @@ ControlList V4L2Device::getControls(const std::vector &ids)\n \t\tctrls.set(id, {});\n \t}\n \n-\tstruct v4l2_ext_control v4l2Ctrls[count];\n-\tmemset(v4l2Ctrls, 0, sizeof(v4l2Ctrls));\n-\n-\tunsigned int i = 0;\n+\tstd::vector v4l2Ctrls;\n+\tv4l2Ctrls.reserve(ctrls.size());\n \tfor (auto &ctrl : ctrls) {\n \t\tunsigned int id = ctrl.first;\n \t\tconst struct v4l2_query_ext_ctrl &info = controlInfo_[id];\n+\t\tv4l2_ext_control v4l2Ctrl;\n+\t\tmemset(&v4l2Ctrl, 0, sizeof(v4l2Ctrl));\n \n \t\tif (info.flags & V4L2_CTRL_FLAG_HAS_PAYLOAD) {\n-\t\t\tControlType type;\n+\t\t\tControlValue &value = ctrl.second;\n \n \t\t\tswitch (info.type) {\n-\t\t\tcase V4L2_CTRL_TYPE_U8:\n-\t\t\t\ttype = ControlTypeByte;\n+\t\t\tcase V4L2_CTRL_TYPE_U8: {\n+\t\t\t\tvalue.reserve(ControlTypeByte, true, info.elems);\n+\t\t\t\tSpan data = value.data();\n+\t\t\t\tv4l2Ctrl.p_u8 = data.data();\n+\t\t\t\tv4l2Ctrl.size = data.size();\n \t\t\t\tbreak;\n-\n+\t\t\t}\n \t\t\tdefault:\n \t\t\t\tLOG(V4L2, Error)\n \t\t\t\t\t<< \"Unsupported payload control type \"\n@@ -219,29 +221,23 @@ ControlList V4L2Device::getControls(const std::vector &ids)\n \t\t\t\treturn {};\n \t\t\t}\n \n-\t\t\tControlValue &value = ctrl.second;\n-\t\t\tvalue.reserve(type, true, info.elems);\n-\t\t\tSpan data = value.data();\n-\n-\t\t\tv4l2Ctrls[i].p_u8 = data.data();\n-\t\t\tv4l2Ctrls[i].size = data.size();\n \t\t}\n \n-\t\tv4l2Ctrls[i].id = id;\n-\t\ti++;\n+\t\tv4l2Ctrl.id = id;\n+\t\tv4l2Ctrls.push_back(std::move(v4l2Ctrl));\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_G_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 read controls: \"\n \t\t\t\t\t << strerror(-ret);\n \t\t\treturn {};\n@@ -250,10 +246,11 @@ ControlList V4L2Device::getControls(const std::vector &ids)\n \t\t/* A specific control failed. */\n \t\tLOG(V4L2, Error) << \"Unable to read control \" << errorIdx\n \t\t\t\t << \": \" << strerror(-ret);\n-\t\tcount = errorIdx - 1;\n+\n+\t\tv4l2Ctrls.resize(errorIdx);\n \t}\n \n-\tupdateControls(&ctrls, v4l2Ctrls, count);\n+\tupdateControls(&ctrls, v4l2Ctrls.data(), v4l2Ctrls.size());\n \n \treturn ctrls;\n }\n","prefixes":["libcamera-devel","v2","1/3"]}