From patchwork Wed Apr 21 09:38:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 12030 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 870CFBDB16 for ; Wed, 21 Apr 2021 09:39:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id F09DF68846; Wed, 21 Apr 2021 11:39:08 +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="aLVPepei"; dkim-atps=neutral Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 76D9768806 for ; Wed, 21 Apr 2021 11:39:07 +0200 (CEST) Received: by mail-pl1-x62e.google.com with SMTP id p16so17363841plf.12 for ; Wed, 21 Apr 2021 02:39:07 -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=zEObZbu+HrhFhwsmTm3EBsVtUrFydFsdsysjLhiBwUI=; b=aLVPepei9yiILVSgiySjynZF8iGBH3gd5pzKL/l655RYxSxyrKxSDYwuvDH2sQ8GYx 776UpbwoS1C+DoipfWId1RL9nbELF9JlFigKtjl+hJhwVIaMotip9vk91y8dvfSI+urF CiJ6HM+3/8NXhxUduZvIVqZGOIhnuLcI1wlGc= 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=zEObZbu+HrhFhwsmTm3EBsVtUrFydFsdsysjLhiBwUI=; b=AT6lH5PSfcwfx+VWhgd1G51CilHAUdXTgd1t6e5jXlqsxIZcUIXL44ONk7i7GXEB9J /EiSssKM9s/2DXoS185HVtOcjvx+vWgY7ZPoIYuaP+omN6BzuS70NLcVxoXVPg5+hzWN doYuebfVRfQprhCBlNlzBpTC3jStpX+tO2yoSJqKc9VscJ7hVXmVIy1HZrRpO3VTNnkx IO6DXVv7ZthTJwpRK3X3XrG9jluV+qwd7GIcpooyVEqHm0qiWMdj+/R3yZ4vcBlmtAFz pl6jMqrSqphxDrHmkyegR44zPPQgKEdjVc7XqpvdH8rcrmmbEVpKp+fGGL+iu2IXkAoi HSeA== X-Gm-Message-State: AOAM530+TmkuaKEa0FDa5y23OZlFjMpjeT8JIDdFpUPEdobctFHjqnMw hefrZSr6qZaxpLDN7bPYKvSS7qzKocn4Hg== X-Google-Smtp-Source: ABdhPJza5yLbc2V8t2l3+R3z46GzqV725iybafzi3wt+7vqiY2RYQ5+XZLiutqE1xnRPQmL3UHggOA== X-Received: by 2002:a17:902:e788:b029:eb:2c5b:bce8 with SMTP id cp8-20020a170902e788b02900eb2c5bbce8mr33768228plb.41.1618997945781; Wed, 21 Apr 2021 02:39:05 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:2:7aaa:cbeb:5d87:4ab6]) by smtp.gmail.com with ESMTPSA id o11sm1305939pfu.188.2021.04.21.02.39.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 02:39:05 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Wed, 21 Apr 2021 18:38:57 +0900 Message-Id: <20210421093857.391409-3-hiroh@chromium.org> X-Mailer: git-send-email 2.31.1.368.gbe11c130af-goog In-Reply-To: <20210421093857.391409-1-hiroh@chromium.org> References: <20210421093857.391409-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/3] libcamera: V4L2Device: Use Span in updateControls() 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" V4L2Device::updateControls() takes two arguments, raw array and its size, for the v4l2_ext_control values. This replaces it with libcamera::Span. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- include/libcamera/internal/v4l2_device.h | 4 ++-- src/libcamera/v4l2_device.cpp | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h index d006bf68..7c79ee97 100644 --- a/include/libcamera/internal/v4l2_device.h +++ b/include/libcamera/internal/v4l2_device.h @@ -14,6 +14,7 @@ #include #include +#include #include "libcamera/internal/log.h" #include "libcamera/internal/v4l2_controls.h" @@ -55,8 +56,7 @@ protected: private: void listControls(); void updateControls(ControlList *ctrls, - const struct v4l2_ext_control *v4l2Ctrls, - unsigned int count); + libcamera::Span v4l2Ctrls); void eventAvailable(EventNotifier *notifier); diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 109269b2..a59e8378 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -250,7 +250,8 @@ ControlList V4L2Device::getControls(const std::vector &ids) v4l2Ctrls.resize(errorIdx); } - updateControls(&ctrls, v4l2Ctrls.data(), v4l2Ctrls.size()); + updateControls(&ctrls, + libcamera::Span(v4l2Ctrls)); return ctrls; } @@ -349,7 +350,8 @@ int V4L2Device::setControls(ControlList *ctrls) ret = errorIdx; } - updateControls(ctrls, v4l2Ctrls.data(), v4l2Ctrls.size()); + updateControls(ctrls, + libcamera::Span(v4l2Ctrls)); return ret; } @@ -513,14 +515,11 @@ void V4L2Device::listControls() * values in \a v4l2Ctrls * \param[inout] ctrls List of V4L2 controls to update * \param[in] v4l2Ctrls List of V4L2 extended controls as returned by the driver - * \param[in] count The number of controls to update */ void V4L2Device::updateControls(ControlList *ctrls, - const struct v4l2_ext_control *v4l2Ctrls, - unsigned int count) + libcamera::Span v4l2Ctrls) { - for (unsigned int i = 0; i < count; i++) { - const struct v4l2_ext_control &v4l2Ctrl = v4l2Ctrls[i]; + for (const v4l2_ext_control &v4l2Ctrl : v4l2Ctrls) { const unsigned int id = v4l2Ctrl.id; if (!ctrls->contains(id)) { LOG(V4L2, Error) << "ControlList doesn't contain id: "