From patchwork Tue Apr 13 06:19:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 11896 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 A5E1FBD224 for ; Tue, 13 Apr 2021 06:19:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1AEFF687F3; Tue, 13 Apr 2021 08:19:36 +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="jNgQRpoF"; dkim-atps=neutral Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DF5A0605AE for ; Tue, 13 Apr 2021 08:19:33 +0200 (CEST) Received: by mail-pj1-x1035.google.com with SMTP id i4so7924957pjk.1 for ; Mon, 12 Apr 2021 23:19:33 -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:mime-version :content-transfer-encoding; bh=Q1hC5n4D2ruo8tDDXvz3jBM31g3+DuH4sNeW+LjMqkY=; b=jNgQRpoF7FWgfOf+HbNqMdgzfcdpO1kElBtMSEWqrtQz9aGZ0WbXCIFS8cxENQI5IA mPBJpSPYfCoq6bRhMjZGmmkkT8NTdpVW44kifvLKJMXDCWoMwvs5JhVKbH5pTk2Dv0Sz fMGtOLxKPhbDJSv5WMsDvIMzp23+B8ayBJ0Js= 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:mime-version :content-transfer-encoding; bh=Q1hC5n4D2ruo8tDDXvz3jBM31g3+DuH4sNeW+LjMqkY=; b=HdVmr1LfKCmA+HQDszV+xrGZFZUhRABXtZWsZreEB1N/Fj72GZBxDuRqsHNQqqF59N RUzctILscwengB+/RwMN5hup6oItyS43uDfL22ylacic+WqhNThiRE2frqYBktkS14pv qknn1dhYug1dtFf2/+melem4KyPdrfB9f99v40EY7Ba1yQO7CWQL7LANBc8EhiLDKGqO oX9ruNRUeruxCKr+otqQwokfJBAcP+6c+AXJhaJsY0W2g4at8aFN15R0mP/G2M8y3/Qp nyE7C1SutpNdUn3EOb04JI4Me4RDHF+Y+pvSlneouLtl/5Lx4aOOppmNmlvR+zK9h5ad T8bQ== X-Gm-Message-State: AOAM530DMXwZ72+M4Da+PsZNZhB/C+lbc/CFDmk0TM+QryHwHpXCf/QT 3fadoNTmwiervgZ1hmjl4YJLdbhPS3obTw== X-Google-Smtp-Source: ABdhPJwzumDc5JDpYF58fPRm4dfKdLuyTRLnX4RqbxhH4FAqFevZlTOjai3qyjTEVe72/HFw+6jWyw== X-Received: by 2002:a17:90b:300c:: with SMTP id hg12mr3027914pjb.165.1618294771934; Mon, 12 Apr 2021 23:19:31 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:2:84f5:7981:dfbe:8f02]) by smtp.gmail.com with ESMTPSA id n4sm11666063pfu.45.2021.04.12.23.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 23:19:31 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Tue, 13 Apr 2021 15:19:23 +0900 Message-Id: <20210413061925.3054927-1-hiroh@chromium.org> X-Mailer: git-send-email 2.31.1.295.g9ea45b61b8-goog MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] 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 | 44 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index decd19ef..78c289c2 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -173,8 +173,7 @@ 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_ }; @@ -196,21 +195,26 @@ ControlList V4L2Device::getControls(const std::vector &ids) ctrls.set(id, {}); } - struct v4l2_ext_control v4l2Ctrls[count]; - memset(v4l2Ctrls, 0, sizeof(v4l2Ctrls)); - - unsigned int i = 0; + std::vector v4l2Ctrls; + v4l2Ctrls.reserve(ctrls.size()); for (auto &ctrl : ctrls) { unsigned int id = ctrl.first; const struct v4l2_query_ext_ctrl &info = controlInfo_[id]; + v4l2_ext_control v4l2Ctrl; + memset(&v4l2Ctrl, 0, sizeof(v4l2Ctrl)); if (info.flags & V4L2_CTRL_FLAG_HAS_PAYLOAD) { - ControlType type; - switch (info.type) { - case V4L2_CTRL_TYPE_U8: + case V4L2_CTRL_TYPE_U8: { + ControlType type; type = ControlTypeByte; + ControlValue &value = ctrl.second; + value.reserve(type, true, info.elems); + Span data = value.data(); + v4l2Ctrl.p_u8 = data.data(); + v4l2Ctrl.size = data.size(); break; + } default: LOG(V4L2, Error) @@ -218,30 +222,23 @@ ControlList V4L2Device::getControls(const std::vector &ids) << info.type; return {}; } - - ControlValue &value = ctrl.second; - value.reserve(type, true, info.elems); - Span data = value.data(); - - v4l2Ctrls[i].p_u8 = data.data(); - v4l2Ctrls[i].size = data.size(); } - v4l2Ctrls[i].id = id; - i++; + v4l2Ctrl.id = id; + v4l2Ctrls.push_back(std::move(v4l2Ctrl)); } 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 {}; @@ -250,10 +247,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; }