From patchwork Wed Jan 5 15:55:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 15252 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 F159DC3258 for ; Wed, 5 Jan 2022 15:55:55 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A09EE60927; Wed, 5 Jan 2022 16:55:54 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="tBJrO7hK"; dkim-atps=neutral Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F388960868 for ; Wed, 5 Jan 2022 16:55:52 +0100 (CET) Received: by mail-wm1-x332.google.com with SMTP id m14-20020a7bcb8e000000b00346da381d59so791941wmi.5 for ; Wed, 05 Jan 2022 07:55:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gqqGVwD5RfUgJkDkv34YgTJkIjI5WuIHwVNOXj2xvNI=; b=tBJrO7hK7aYZvfPuAWcJWuIwZNkw5Uy2OFuvKQKrEUd2tVVW+5Dv4ZMIp6AqhIZk7s BQve6CtxE5TM1unQ95I6f7BQFB9ftlTf69B+tOL06Z14KKYJ+lRo5nX0BDbhPjuJ+P3V 2YwmFo+Vmx3/2mPzu8+red56bNbsYN3uE8+3qjai9N8mziO+LSGsINfIw+GADXhW+9ks j57LTH8sKdwc4kAj81KlSJtcOg23+ChclwMmg4WMM8XbpsEFxoL7wWMFD4qlORl35Ej6 wZdPXUQwlCm93AHfl3oV+tSEZdjb0CdaZWeCENukYECA2I/2q4cJVeQNsS9tW7edzoFA ELDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gqqGVwD5RfUgJkDkv34YgTJkIjI5WuIHwVNOXj2xvNI=; b=mNr8Hcl60AtRxSx6QW0OXk4EqVKYnKMzmZvNSNgqUYeWV2jXV7vmC/PDbUY7TQU++W FyuNkZCz4QB+6jQW4STtuh8w3eIiiBVgq97Ya6SSMepy+Re6PGbJ8W6vv1ITfuX4Prv7 2o7uDuAkxBzp7zk77ASkWLitM+tk1aVZJzlxWawOHVokBpTTtioTJJ+Nfu7dz9QZlzHE DhFWt4ySc4Zc/xCtAKXi/tLcIh/d3tqS3linuP4DICWqQ9PGM+OJiGJq9jRM4dnaDGO1 08kqoQu57LpjBK1VH7ee+dw1Mo0PcRdNz7TOqorPjtD35jEqdH7gz1d4NzAOaGJB30YO Hj+w== X-Gm-Message-State: AOAM531jt/AIv1V8Q5R7peyGdT4whAYTiq90qhhG4RtGON3YS4lNEZAU HsUsAJfH7+BQKac7jgR5sCK9pD1vtpA7/7DU X-Google-Smtp-Source: ABdhPJwEPcTwcoMxJOwOtUUONPwGq9YIt6wQAq6vT1vkKSU0ZDLyjDsy61O/eaISKd+NoPwTLioXpw== X-Received: by 2002:a05:600c:1d1c:: with SMTP id l28mr3302741wms.69.1641398152547; Wed, 05 Jan 2022 07:55:52 -0800 (PST) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id g18sm3387491wmq.5.2022.01.05.07.55.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 07:55:52 -0800 (PST) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Wed, 5 Jan 2022 15:55:38 +0000 Message-Id: <20220105155539.5550-3-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220105155539.5550-1-david.plowman@raspberrypi.com> References: <20220105155539.5550-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/3] libcamera: v4l2_device: Add support for integer array controls 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::setControl and V4L2Device::updateControl are both updated to handle ControlTypeInteger32 array controls. Signed-off-by: David Plowman Reviewed-by: Laurent Pinchart --- src/libcamera/v4l2_device.cpp | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 62c91779..3fc8438f 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -297,6 +297,18 @@ int V4L2Device::setControls(ControlList *ctrls) /* Set the v4l2_ext_control value for the write operation. */ ControlValue &value = ctrl->second; switch (iter->first->type()) { + case ControlTypeInteger32: { + if (value.isArray()) { + Span data = value.data(); + v4l2Ctrl.p_u32 = reinterpret_cast(data.data()); + v4l2Ctrl.size = data.size(); + } else { + v4l2Ctrl.value = value.get(); + } + + break; + } + case ControlTypeInteger64: v4l2Ctrl.value64 = value.get(); break; @@ -671,6 +683,14 @@ void V4L2Device::updateControls(ControlList *ctrls, const unsigned int id = v4l2Ctrl.id; ControlValue value = ctrls->get(id); + if (value.isArray()) { + /* + * No action required, the VIDIOC_[GS]_EXT_CTRLS ioctl + * accessed the ControlValue storage directly for array + * controls. + */ + continue; + } const auto iter = controls_.find(id); ASSERT(iter != controls_.end()); @@ -680,19 +700,10 @@ void V4L2Device::updateControls(ControlList *ctrls, value.set(v4l2Ctrl.value64); break; - case ControlTypeInteger32: - value.set(v4l2Ctrl.value); - break; - - case ControlTypeByte: - /* - * No action required, the VIDIOC_[GS]_EXT_CTRLS ioctl - * accessed the ControlValue storage directly. - */ - break; - default: /* + * Note: this catches the ControlTypeInteger32 case. + * * \todo To be changed when support for string controls * will be added. */