From patchwork Fri Apr 23 09:36:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 12095 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id A6A95BDB15 for ; Fri, 23 Apr 2021 09:37:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 668B668881; Fri, 23 Apr 2021 11:37:58 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="b0yrrMWF"; dkim-atps=neutral Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 06F6F6887B for ; Fri, 23 Apr 2021 11:37:56 +0200 (CEST) Received: by mail-pl1-x631.google.com with SMTP id p16so21002207plf.12 for ; Fri, 23 Apr 2021 02:37:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3JRIL9VD0+XeiN5ymASkeohbruAVE54kRat/uXu6Ma0=; b=b0yrrMWFsT735Fou+G2CUYKL3A7YCzh+/RFFXfMFrvEIDca4czcmk+IMfDVyHBjTwB HalWh59NmMAl8cotWe8S5oLtxGur4baoVjIe9T7CA4+HwoZSoTIE3GV3Oar9iO1V0eT6 /mlSEFgdBF1R0o/IQJbzHIW+XjB73euc6Mc74= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3JRIL9VD0+XeiN5ymASkeohbruAVE54kRat/uXu6Ma0=; b=q6BUegWLWcTWSTK0LGKW2h1N3/7R8bXTPWUzYaC/UEIqpdAagas7qhRZXJCaQOWRUX AFRADNlDfkJ0QtTiDf4nB36/eTc+gxRNsz67Y8Nw3qmSBPKYzRqZBLeLPN6ZgDmQDJc+ /MxiFJt71/ElPAwuqepq2OvOrXjLxK39eHVfenZao+lMviGmdwcao5OR1Ar1KkmKNWux SPba0ZYdWU4cAGgg9czfaln2WDoiYgi+A3yiys2JCF6y2hygjXyqR1tVd66sB6YTKucs 3S4XCvAYd2yRfze5gwSWyix4DNnJDedm9gplqdzER98BGO6MJMsIYXOxitDJxOMgjopI /06w== X-Gm-Message-State: AOAM532cTK6By0edN51IComCnnqKb+ajTwjfnGP03S3BEodcf16sszlc 7pnXbNK004wTMvZtr6eBME8ivuXSFecKvg== X-Google-Smtp-Source: ABdhPJz06yh+wzXrqKULClS8l6g0/4VMQn25YQXAEurdP57CYqxVRbYmQ6oxwrDomijeOJrI/PxZVg== X-Received: by 2002:a17:902:c183:b029:ea:c15a:c6e9 with SMTP id d3-20020a170902c183b02900eac15ac6e9mr2967590pld.14.1619170674463; Fri, 23 Apr 2021 02:37:54 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:2:8537:2d4f:8d35:5777]) by smtp.gmail.com with ESMTPSA id z5sm4273660pff.191.2021.04.23.02.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 02:37:54 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Fri, 23 Apr 2021 18:36:51 +0900 Message-Id: <20210423093653.1726488-2-hiroh@chromium.org> X-Mailer: git-send-email 2.31.1.498.g6c1eba8ee3d-goog In-Reply-To: <20210423093653.1726488-1-hiroh@chromium.org> References: <20210423093653.1726488-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 2/4] libcamera: V4L2Device: Use std::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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The original code uses Variable-Length-Array, which is not officially supported in C++. This replaces the array with std::vector. Signed-off-by: Hirokazu Honda --- src/libcamera/v4l2_device.cpp | 41 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index ce2860c4..bbe8f154 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -173,13 +173,18 @@ void V4L2Device::close() */ ControlList V4L2Device::getControls(const std::vector &ids) { - unsigned int count = ids.size(); - if (count == 0) + if (ids.empty()) return {}; ControlList ctrls{ controls_ }; + std::vector v4l2Ctrls(ids.size()); + memset(v4l2Ctrls.data(), 0, sizeof(v4l2_ext_control) * ctrls.size()); + + for (size_t i = 0, j = 0; j < ids.size(); ++j) { + const unsigned int id = ids[j]; + if (ctrls.contains(id)) + continue; - for (uint32_t id : ids) { const auto iter = controls_.find(id); if (iter == controls_.end()) { LOG(V4L2, Error) @@ -187,20 +192,12 @@ ControlList V4L2Device::getControls(const std::vector &ids) return {}; } - ctrls.set(id, {}); - } - - struct v4l2_ext_control v4l2Ctrls[count]; - memset(v4l2Ctrls, 0, sizeof(v4l2Ctrls)); - - unsigned int i = 0; - for (auto &ctrl : ctrls) { - unsigned int id = ctrl.first; + v4l2_ext_control &v4l2Ctrl = v4l2Ctrls[i++]; const struct v4l2_query_ext_ctrl &info = controlInfo_[id]; + ControlValue value{}; if (info.flags & V4L2_CTRL_FLAG_HAS_PAYLOAD) { ControlType type; - switch (info.type) { case V4L2_CTRL_TYPE_U8: type = ControlTypeByte; @@ -213,7 +210,6 @@ ControlList V4L2Device::getControls(const std::vector &ids) return {}; } - ControlValue &value = ctrl.second; value.reserve(type, true, info.elems); Span data = value.data(); @@ -221,21 +217,23 @@ ControlList V4L2Device::getControls(const std::vector &ids) v4l2Ctrls[i].size = data.size(); } - v4l2Ctrls[i].id = id; - i++; + v4l2Ctrl.id = id; + ctrls.set(id, std::move(value)); } + v4l2Ctrls.resize(ctrls.size()); + struct v4l2_ext_controls v4l2ExtCtrls = {}; v4l2ExtCtrls.which = V4L2_CTRL_WHICH_CUR_VAL; - v4l2ExtCtrls.controls = v4l2Ctrls; - v4l2ExtCtrls.count = count; + v4l2ExtCtrls.controls = v4l2Ctrls.data(); + v4l2ExtCtrls.count = v4l2Ctrls.size(); int ret = ioctl(VIDIOC_G_EXT_CTRLS, &v4l2ExtCtrls); if (ret) { unsigned int errorIdx = v4l2ExtCtrls.error_idx; /* Generic validation error. */ - if (errorIdx == 0 || errorIdx >= count) { + if (errorIdx == 0 || errorIdx >= v4l2Ctrls.size()) { LOG(V4L2, Error) << "Unable to read controls: " << strerror(-ret); return {}; @@ -244,10 +242,11 @@ ControlList V4L2Device::getControls(const std::vector &ids) /* A specific control failed. */ LOG(V4L2, Error) << "Unable to read control " << errorIdx << ": " << strerror(-ret); - count = errorIdx - 1; + + v4l2Ctrls.resize(errorIdx); } - updateControls(&ctrls, v4l2Ctrls, count); + updateControls(&ctrls, v4l2Ctrls.data(), v4l2Ctrls.size()); return ctrls; }