From patchwork Tue Nov 3 13:30:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 10319 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com 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 93CBDBDB89 for ; Tue, 3 Nov 2020 13:31:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0806A62BDA; Tue, 3 Nov 2020 14:31:36 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="QHKZnQxy"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EBC0062B7E for ; Tue, 3 Nov 2020 14:31:34 +0100 (CET) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 71BC6563 for ; Tue, 3 Nov 2020 14:31:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1604410294; bh=0dp6JcYWqTNo3WQWcZpGjZRSd32st+iATc/ULIj1rUk=; h=From:To:Subject:Date:From; b=QHKZnQxybafOv+Mdoeto3O0ieiHNo4/e31TuUGcM8T8jdS9J8GnQKLTPCK8UsQonZ 7GmdYG3ugBGP9HC0iY9+ad4aciKGHI9Lqbj3Elt2yAxD2ZbpLVQyCddYz4fHxL68Re y0pfALs5QD/LLS5k8g4WC8h8frLABhtoji6ErFGA= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 3 Nov 2020 15:30:41 +0200 Message-Id: <20201103133042.30341-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] libcamera: pipeline: vivid: Set camera properties 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" Initialize the CameraData properties with Location and Model. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/libcamera/pipeline/vivid/vivid.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libcamera/pipeline/vivid/vivid.cpp b/src/libcamera/pipeline/vivid/vivid.cpp index 67b0d85b6629..bf8f82af981f 100644 --- a/src/libcamera/pipeline/vivid/vivid.cpp +++ b/src/libcamera/pipeline/vivid/vivid.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/log.h" @@ -336,7 +337,7 @@ int VividCameraData::init() video_->bufferReady.connect(this, &VividCameraData::bufferReady); - /* Initialise the supported controls. */ + /* Initialise the supported controls and properties. */ const ControlInfoMap &controls = video_->controls(); ControlInfoMap::Map ctrls; @@ -366,6 +367,9 @@ int VividCameraData::init() controlInfo_ = std::move(ctrls); + properties_.set(properties::Location, properties::CameraLocationExternal); + properties_.set(properties::Model, "Virtual Video Device"); + return 0; } From patchwork Tue Nov 3 13:30:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 10320 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com 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 47575BDB89 for ; Tue, 3 Nov 2020 13:31:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 11A5C62BC9; Tue, 3 Nov 2020 14:31:38 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="uEfZjTrf"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3868962B7E for ; Tue, 3 Nov 2020 14:31:35 +0100 (CET) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id C6AB3B9C for ; Tue, 3 Nov 2020 14:31:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1604410294; bh=Vda8SY9J+d1/gw+XrGwD04H3h7nk7U/4VWbH1o8NR4o=; h=From:To:Subject:Date:In-Reply-To:References:From; b=uEfZjTrfQ8Wt10LXTBZ4tFQdSOr0kEQxWNAbBBGlCaE8eHGDy2jDNRvgbOw184lPV WSg/Yo1E0pCE2rhsjiOkP3D55HivpifAXD09C3L4qBnJ1zJcA90j2aXnL21y9YU4Ff MavMspbB0QU+HjSGslWoSmq+K6HDMrWClXLbCago= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 3 Nov 2020 15:30:42 +0200 Message-Id: <20201103133042.30341-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201103133042.30341-1-laurent.pinchart@ideasonboard.com> References: <20201103133042.30341-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] libcamera: pipeline: vivid: Print diagnostic on configuration failure 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" In case the setFormat() call on the video device fails to match the configuration, print both the requested and actual configurations to ease debugging. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/libcamera/pipeline/vivid/vivid.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libcamera/pipeline/vivid/vivid.cpp b/src/libcamera/pipeline/vivid/vivid.cpp index bf8f82af981f..a0ccbd1e711e 100644 --- a/src/libcamera/pipeline/vivid/vivid.cpp +++ b/src/libcamera/pipeline/vivid/vivid.cpp @@ -181,8 +181,13 @@ int PipelineHandlerVivid::configure(Camera *camera, CameraConfiguration *config) return ret; if (format.size != cfg.size || - format.fourcc != data->video_->toV4L2PixelFormat(cfg.pixelFormat)) + format.fourcc != data->video_->toV4L2PixelFormat(cfg.pixelFormat)) { + LOG(VIVID, Error) + << "Requested " << cfg.toString() << ", got " + << format.size.toString() << "-" + << format.fourcc.toString(); return -EINVAL; + } /* Set initial controls specific to VIVID */ ControlList controls(data->video_->controls());