From patchwork Thu Apr 22 02:18:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 12056 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 406EFBDB15 for ; Thu, 22 Apr 2021 02:18:22 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E4B0068853; Thu, 22 Apr 2021 04:18:21 +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="HITIMsHa"; dkim-atps=neutral Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AC7C468852 for ; Thu, 22 Apr 2021 04:18:18 +0200 (CEST) Received: by mail-pf1-x42e.google.com with SMTP id p67so25689583pfp.10 for ; Wed, 21 Apr 2021 19:18:18 -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=ntj34Oi7QZw5K7pg5QcWtTfZ8IzjTMaWd9YV8k6vys8=; b=HITIMsHa4c73RrwWdRLiP4h+ufi7IaByM1/S/+grXuV/0oEFJ2TyuJ006jAqVOf9rP J00P54OJSKkpQnpb5vQk2IY8fEhTbMNPIvx5u0QY7Ax0O/JeF5WsSPygtHrA7hWLGm+z jWXrErNj30Q/w5EYZmAGJ6Bv+FFb2+L0ujQ1s= 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=ntj34Oi7QZw5K7pg5QcWtTfZ8IzjTMaWd9YV8k6vys8=; b=q5PyekTNkSTqv3GoN1ZaGnwNP3xJp9QGgZtYd3DIdLEVZ7V8o4RTkhCz4ve6c3VYTq 52RLRV4kxRTe7dqhs1tHnVgIcSbn+ifDfzOXTIeUa8eRZTYC28X17a377ygluFGbP2TG npbhsDa0NSr7Jb3TlaDynuGvQCAUgSZuW0DVPyKjFAyeT98Sc4ASEyRJr81+8aiUFJVm Kp1AXu3qLGl1SNCgaw/3MjhpfMvkiJ1zjKLILuLuBjG8rrWJVQ0WQ7cTaIMXniPDIp6Y BEkdTllVkjfUskGFnq8pnWAiRKN4AzH+QFXQpWspJBpfHeb0KuZDtM6FfYL7IDV83ZXK q7Ng== X-Gm-Message-State: AOAM532hmM6YG7813dPNZB5ha3GaajSMg/AjOThzG+o2g1Xp25aiJELW 9cs64Vz0Ea9MISAScRRoujMOCVFqTwlgvA== X-Google-Smtp-Source: ABdhPJwrF+4PkDPvQavvJOwbK+THUTAr2xNg5vkxbm0dUZTVCktKldedXr8IK/8JskksXA0mE48OuA== X-Received: by 2002:a65:4986:: with SMTP id r6mr1171470pgs.392.1619057897139; Wed, 21 Apr 2021 19:18:17 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:2:f88:d5a0:ebc4:5b76]) by smtp.gmail.com with ESMTPSA id lt11sm3352480pjb.23.2021.04.21.19.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 19:18:16 -0700 (PDT) From: Hirokazu Honda 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 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 | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 3c32d682..617e6ec9 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_ }; @@ -190,22 +189,20 @@ ControlList V4L2Device::getControls(const std::vector &ids) ctrls.set(id, {}); } - struct v4l2_ext_control v4l2Ctrls[count]; - memset(v4l2Ctrls, 0, sizeof(v4l2Ctrls)); + std::vector v4l2Ctrls(ctrls.size()); + memset(v4l2Ctrls.data(), 0, sizeof(v4l2_ext_control) * ctrls.size()); - unsigned int i = 0; - for (auto &ctrl : ctrls) { - unsigned int id = ctrl.first; + for (auto [ctrl, i] = std::pair(ctrls.begin(), 0u); i < ctrls.size(); ctrl++, i++) { + const unsigned int id = ctrl->first; const struct v4l2_query_ext_ctrl &info = controlInfo_[id]; + v4l2_ext_control &v4l2Ctrl = v4l2Ctrls[i]; if (info.flags & V4L2_CTRL_FLAG_HAS_PAYLOAD) { ControlType type; - switch (info.type) { case V4L2_CTRL_TYPE_U8: type = ControlTypeByte; break; - default: LOG(V4L2, Error) << "Unsupported payload control type " @@ -213,7 +210,7 @@ ControlList V4L2Device::getControls(const std::vector &ids) return {}; } - ControlValue &value = ctrl.second; + ControlValue &value = ctrl->second; value.reserve(type, true, info.elems); Span data = value.data(); @@ -221,21 +218,20 @@ ControlList V4L2Device::getControls(const std::vector &ids) v4l2Ctrls[i].size = data.size(); } - v4l2Ctrls[i].id = id; - i++; + v4l2Ctrl.id = id; } 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 +240,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; }