Patch Detail
Show a patch.
GET /api/1.1/patches/12056/?format=api
{ "id": 12056, "url": "https://patchwork.libcamera.org/api/1.1/patches/12056/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12056/", "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": "<20210422021809.520675-3-hiroh@chromium.org>", "date": "2021-04-22T02:18:07", "name": "[libcamera-devel,v4,2/4] libcamera: V4L2Device: Use std::vector for v4l2_ext_control in getControls()", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "81a5cf849467519d0c435cd40bd86e3e011c4fa5", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/1.1/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/12056/mbox/", "series": [ { "id": 1959, "url": "https://patchwork.libcamera.org/api/1.1/series/1959/?format=api", "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/12056/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12056/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 406EFBDB15\n\tfor <parsemail@patchwork.libcamera.org>;\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 E4B0068853;\n\tThu, 22 Apr 2021 04:18:21 +0200 (CEST)", "from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com\n\t[IPv6:2607:f8b0:4864:20::42e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AC7C468852\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 22 Apr 2021 04:18:18 +0200 (CEST)", "by mail-pf1-x42e.google.com with SMTP id p67so25689583pfp.10\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 21 Apr 2021 19:18:18 -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.15\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 21 Apr 2021 19:18:16 -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=\"HITIMsHa\"; 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=ntj34Oi7QZw5K7pg5QcWtTfZ8IzjTMaWd9YV8k6vys8=;\n\tb=HITIMsHa4c73RrwWdRLiP4h+ufi7IaByM1/S/+grXuV/0oEFJ2TyuJ006jAqVOf9rP\n\tJ00P54OJSKkpQnpb5vQk2IY8fEhTbMNPIvx5u0QY7Ax0O/JeF5WsSPygtHrA7hWLGm+z\n\tjWXrErNj30Q/w5EYZmAGJ6Bv+FFb2+L0ujQ1s=", "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=ntj34Oi7QZw5K7pg5QcWtTfZ8IzjTMaWd9YV8k6vys8=;\n\tb=q5PyekTNkSTqv3GoN1ZaGnwNP3xJp9QGgZtYd3DIdLEVZ7V8o4RTkhCz4ve6c3VYTq\n\t52RLRV4kxRTe7dqhs1tHnVgIcSbn+ifDfzOXTIeUa8eRZTYC28X17a377ygluFGbP2TG\n\tnpbhsDa0NSr7Jb3TlaDynuGvQCAUgSZuW0DVPyKjFAyeT98Sc4ASEyRJr81+8aiUFJVm\n\tKp1AXu3qLGl1SNCgaw/3MjhpfMvkiJ1zjKLILuLuBjG8rrWJVQ0WQ7cTaIMXniPDIp6Y\n\tBEkdTllVkjfUskGFnq8pnWAiRKN4AzH+QFXQpWspJBpfHeb0KuZDtM6FfYL7IDV83ZXK\n\tq7Ng==", "X-Gm-Message-State": "AOAM532hmM6YG7813dPNZB5ha3GaajSMg/AjOThzG+o2g1Xp25aiJELW\n\t9cs64Vz0Ea9MISAScRRoujMOCVFqTwlgvA==", "X-Google-Smtp-Source": "ABdhPJwrF+4PkDPvQavvJOwbK+THUTAr2xNg5vkxbm0dUZTVCktKldedXr8IK/8JskksXA0mE48OuA==", "X-Received": "by 2002:a65:4986:: with SMTP id r6mr1171470pgs.392.1619057897139;\n\tWed, 21 Apr 2021 19:18:17 -0700 (PDT)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 22 Apr 2021 11:18:07 +0900", "Message-Id": "<20210422021809.520675-3-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 2/4] 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": "<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>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <hiroh@chromium.org>\n---\n src/libcamera/v4l2_device.cpp | 31 ++++++++++++++-----------------\n 1 file changed, 14 insertions(+), 17 deletions(-)", "diff": "diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 3c32d682..617e6ec9 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<uint32_t> &ids)\n {\n-\tunsigned int count = ids.size();\n-\tif (count == 0)\n+\tif (ids.empty())\n \t\treturn {};\n \n \tControlList ctrls{ controls_ };\n@@ -190,22 +189,20 @@ ControlList V4L2Device::getControls(const std::vector<uint32_t> &ids)\n \t\tctrls.set(id, {});\n \t}\n \n-\tstruct v4l2_ext_control v4l2Ctrls[count];\n-\tmemset(v4l2Ctrls, 0, sizeof(v4l2Ctrls));\n+\tstd::vector<v4l2_ext_control> 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 struct v4l2_query_ext_ctrl &info = controlInfo_[id];\n+\t\tv4l2_ext_control &v4l2Ctrl = v4l2Ctrls[i];\n \n \t\tif (info.flags & V4L2_CTRL_FLAG_HAS_PAYLOAD) {\n \t\t\tControlType type;\n-\n \t\t\tswitch (info.type) {\n \t\t\tcase V4L2_CTRL_TYPE_U8:\n \t\t\t\ttype = ControlTypeByte;\n \t\t\t\tbreak;\n-\n \t\t\tdefault:\n \t\t\t\tLOG(V4L2, Error)\n \t\t\t\t\t<< \"Unsupported payload control type \"\n@@ -213,7 +210,7 @@ ControlList V4L2Device::getControls(const std::vector<uint32_t> &ids)\n \t\t\t\treturn {};\n \t\t\t}\n \n-\t\t\tControlValue &value = ctrl.second;\n+\t\t\tControlValue &value = ctrl->second;\n \t\t\tvalue.reserve(type, true, info.elems);\n \t\t\tSpan<uint8_t> data = value.data();\n \n@@ -221,21 +218,20 @@ ControlList V4L2Device::getControls(const std::vector<uint32_t> &ids)\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}\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@@ -244,10 +240,11 @@ ControlList V4L2Device::getControls(const std::vector<uint32_t> &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", "v4", "2/4" ] }