From patchwork Tue Apr 13 06:19:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 11898 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 165F8BD224 for ; Tue, 13 Apr 2021 06:19:39 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id CCA90687FF; Tue, 13 Apr 2021 08:19:38 +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="gJqxOICr"; dkim-atps=neutral Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9E0A468807 for ; Tue, 13 Apr 2021 08:19:36 +0200 (CEST) Received: by mail-pl1-x62a.google.com with SMTP id j7so7647550plx.2 for ; Mon, 12 Apr 2021 23:19:36 -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=slwRzF9Gj9xvox8fzWKnDmBEEvj0hcU17A7XH1OMBAA=; b=gJqxOICrCMlHggPPocmFgdJt4OWfxH36rAmTwoIlN8mtOLBC43DHwjTMPJTpjdUfjd SJJdB+3+fSXStdbc2DI72jlD1LfaFkrVlxHtlS10nVNRbpKkaKsw+ElC0KQB8xKKByqZ Ml6ySSf6LI7sGI5/PHIztsOymWt3MoFuhz7IU= 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=slwRzF9Gj9xvox8fzWKnDmBEEvj0hcU17A7XH1OMBAA=; b=C9wzGu/6sm/arOgQ4cEP4ne8e9+BkSz7lH7OBRYjFbPs6roD7db4dBOeNpyMslTjoY dAm7/lo7IC+T/IhZoehX8gRfYCobebU9+8f7hvi8jLo4jTz+nM2xGgCU+KjPBj79BdZm EhsZ4ElMcvor86i4PEDNgESlhSDQlA8Q+2ZQwmDOUwqtm2qoRzyA0fTrGpOMDX/HTiWZ e8YmxXdBlJRLONpeGfziukdBq0/cle76nu63eITENdyxyBe+bCEPVgKLU071pWPX5hDy retdteA23l4cRzeaQz7XKDF5iYN+pV8Mu5k2pl903awFTqHRHrj7YOxMGZvj0/clEdaO XD9g== X-Gm-Message-State: AOAM5326P9AgVoNpv0OiSZc/lR69tISLLRu7eRtyFvN5WjlcZ6yioyMC +04M6cTI39jYdFJIddoQ3XSA4hGGVpFwIg== X-Google-Smtp-Source: ABdhPJycFZeX3DqwNbkTwcnB8RL64OKpuhTAiTwtGGmdsgkyOpeA/xXWiqr0d7ZefnGLAzDQAK40+Q== X-Received: by 2002:a17:902:e884:b029:e5:fece:3bb0 with SMTP id w4-20020a170902e884b02900e5fece3bb0mr31075309plg.61.1618294774860; Mon, 12 Apr 2021 23:19:34 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 23:19:34 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Tue, 13 Apr 2021 15:19:25 +0900 Message-Id: <20210413061925.3054927-3-hiroh@chromium.org> X-Mailer: git-send-email 2.31.1.295.g9ea45b61b8-goog In-Reply-To: <20210413061925.3054927-1-hiroh@chromium.org> References: <20210413061925.3054927-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/3] libcamera: V4L2Device: Use std::vector 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 std::vector. Signed-off-by: Hirokazu Honda --- include/libcamera/internal/v4l2_device.h | 3 +- src/libcamera/v4l2_device.cpp | 36 +++++++++++++----------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h index d006bf68..4cce3840 100644 --- a/include/libcamera/internal/v4l2_device.h +++ b/include/libcamera/internal/v4l2_device.h @@ -55,8 +55,7 @@ protected: private: void listControls(); void updateControls(ControlList *ctrls, - const struct v4l2_ext_control *v4l2Ctrls, - unsigned int count); + const std::vector &v4l2Ctrls); void eventAvailable(EventNotifier *notifier); diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 8625dde8..8f29cd7f 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -251,7 +251,7 @@ ControlList V4L2Device::getControls(const std::vector &ids) v4l2Ctrls.resize(errorIdx); } - updateControls(&ctrls, v4l2Ctrls.data(), v4l2Ctrls.size()); + updateControls(&ctrls, v4l2Ctrls); return ctrls; } @@ -353,7 +353,7 @@ int V4L2Device::setControls(ControlList *ctrls) ret = errorIdx; } - updateControls(ctrls, v4l2Ctrls.data(), v4l2Ctrls.size()); + updateControls(ctrls, v4l2Ctrls); return ret; } @@ -517,25 +517,27 @@ 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) + const std::vector &v4l2Ctrls) { - unsigned int i = 0; - for (auto &ctrl : *ctrls) { - if (i == count) - break; + for (const v4l2_ext_control &v4l2Ctrl : v4l2Ctrls) { + if (!ctrls->contains(v4l2Ctrl.id)) { + LOG(V4L2, Error) << "Unknown id: " << v4l2Ctrl.id; + continue; + } - const struct v4l2_ext_control *v4l2Ctrl = &v4l2Ctrls[i]; - unsigned int id = ctrl.first; - ControlValue &value = ctrl.second; + const auto it = controls_.find(v4l2Ctrl.id); + if (it == controls_.end()) { + LOG(V4L2, Error) << "Unknown id: " << v4l2Ctrl.id; + continue; + } - const auto iter = controls_.find(id); - switch (iter->first->type()) { + const ControlValue &value = ctrls->get(v4l2Ctrl.id); + ControlValue newValue = value; + switch (it->first->type()) { case ControlTypeInteger64: - value.set(v4l2Ctrl->value64); + newValue.set(v4l2Ctrl.value64); break; case ControlTypeByte: @@ -550,11 +552,11 @@ void V4L2Device::updateControls(ControlList *ctrls, * \todo To be changed when support for string controls * will be added. */ - value.set(v4l2Ctrl->value); + newValue.set(v4l2Ctrl.value); break; } - i++; + ctrls->set(v4l2Ctrl.id, newValue); } }