From patchwork Thu Apr 22 02:18:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 12058 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 15480BDB15 for ; Thu, 22 Apr 2021 02:18:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id CAB7F68853; Thu, 22 Apr 2021 04:18:24 +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="GZ8r/yxS"; 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 393606885A for ; Thu, 22 Apr 2021 04:18:22 +0200 (CEST) Received: by mail-pj1-x1035.google.com with SMTP id lt13so11630440pjb.1 for ; Wed, 21 Apr 2021 19:18:22 -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=AvjxFuGHWuGy6en7PavGeDRuj1BiQI7LI6KxMvnz+GE=; b=GZ8r/yxStbs3y39HPFR+osHgaOoomiMGjphMPcwX3lchapG8cgI5OsXcILB8SrKTAc Rg+DrmdtHFCILTUyzHMg+0BqnIqwQKEIx/EaZsi3UcvM98kAJLPI2jZgtArJge/m3AOv kb5EvVCCg4KCp+ozWAgEj4u/JrGJnaatW1L1E= 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=AvjxFuGHWuGy6en7PavGeDRuj1BiQI7LI6KxMvnz+GE=; b=bLnZqHzHFBvS1Se99a4SJOKlHI+5dduCJSGJP7Liuon+eUrHvZUDVUwnAQDtQPpeOd a2iNcDv3nry3uvCs7woPT/jdl5Xsx4wPlNEQ4N/Ou6DG4QfffT9VM66cMS25REyTHsXX ANaWgBpuLCPGc6vG5c1f4Q+7ejlbPP3EMLUDUhocMW5VVIXjrJhdPjam+gl4cf0lhmsw vHkIHP1adN4FOY02PmFsYHhD8k/glP1A2L/+Cc1LiHJCKCYEbydgjVFiKda5CrvjGPGH oKXipZ2b54q0ald5RTNRv7N5pyCOeT1KUXoqlmMQxx4Lk+4P18fbt3GxpW61yLAtibut /4DQ== X-Gm-Message-State: AOAM530D8IrZ3YDsLX7Ocs/jiVsQ9lf+cKKjG1C8r2elefKFbGjpen7k kizX9Xtu4OnZjrAQ4acWz4WwJG5rM0HxJA== X-Google-Smtp-Source: ABdhPJyzbKnfwAU8Yp5ha2MWKsC1dNMYtzTryTsRZVfqaheq45+ZM+77WIeWZRGasNBhJ96kXNz0Sg== X-Received: by 2002:a17:90b:4a05:: with SMTP id kk5mr1324649pjb.202.1619057900672; Wed, 21 Apr 2021 19:18:20 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 19:18:20 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Thu, 22 Apr 2021 11:18:09 +0900 Message-Id: <20210422021809.520675-5-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 4/4] 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 | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h index d006bf68..087f07e7 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); + Span v4l2Ctrls); void eventAvailable(EventNotifier *notifier); diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 9f71bf0e..58516609 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -244,7 +244,7 @@ ControlList V4L2Device::getControls(const std::vector &ids) v4l2Ctrls.resize(errorIdx); } - updateControls(&ctrls, v4l2Ctrls.data(), v4l2Ctrls.size()); + updateControls(&ctrls, v4l2Ctrls); return ctrls; } @@ -343,7 +343,7 @@ int V4L2Device::setControls(ControlList *ctrls) ret = errorIdx; } - updateControls(ctrls, v4l2Ctrls.data(), v4l2Ctrls.size()); + updateControls(ctrls, v4l2Ctrls); return ret; } @@ -507,14 +507,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) + 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: "