From patchwork Wed Jan 23 15:03:51 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?=
 <niklas.soderlund@ragnatech.se>
X-Patchwork-Id: 354
Return-Path: <niklas.soderlund@ragnatech.se>
Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net
	[195.74.38.228])
	by lancelot.ideasonboard.com (Postfix) with ESMTPS id B964560B2D
	for <libcamera-devel@lists.libcamera.org>;
	Wed, 23 Jan 2019 16:04:01 +0100 (CET)
X-Halon-ID: 10805d3c-1f20-11e9-911a-0050569116f7
Authorized-sender: niklas@soderlund.pp.se
Received: from bismarck.berto.se (unknown [89.233.230.99])
	by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA
	id 10805d3c-1f20-11e9-911a-0050569116f7;
	Wed, 23 Jan 2019 16:03:38 +0100 (CET)
From: =?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>
To: libcamera-devel@lists.libcamera.org
Date: Wed, 23 Jan 2019 16:03:51 +0100
Message-Id: <20190123150351.8307-3-niklas.soderlund@ragnatech.se>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20190123150351.8307-1-niklas.soderlund@ragnatech.se>
References: <20190123150351.8307-1-niklas.soderlund@ragnatech.se>
MIME-Version: 1.0
Subject: [libcamera-devel] [PATCH 2/2] libcamera: pipeline: uvcvideo: create
	a V4L2Device for the default video entity
X-BeenThere: libcamera-devel@lists.libcamera.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <libcamera-devel.lists.libcamera.org>
List-Unsubscribe: <https://lists.libcamera.org/options/libcamera-devel>,
	<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>
List-Archive: <https://lists.libcamera.org/pipermail/libcamera-devel/>
List-Post: <mailto:libcamera-devel@lists.libcamera.org>
List-Help: <mailto:libcamera-devel-request@lists.libcamera.org?subject=help>
List-Subscribe: <https://lists.libcamera.org/listinfo/libcamera-devel>,
	<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Jan 2019 15:04:02 -0000

Add a V4L2Device for the default video entity in the media graph. The
UVC pipeline needs to search for the entity marked with the
MEDIA_ENT_FL_DEFAULT flag as the entity names in the media graph varies
depending on which device is used.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/pipeline/uvcvideo.cpp | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp
index b56ee9881239abdc..f853105f50a958a3 100644
--- a/src/libcamera/pipeline/uvcvideo.cpp
+++ b/src/libcamera/pipeline/uvcvideo.cpp
@@ -12,6 +12,7 @@
 #include "log.h"
 #include "media_device.h"
 #include "pipeline_handler.h"
+#include "v4l2_device.h"
 
 namespace libcamera {
 
@@ -31,15 +32,21 @@ public:
 
 private:
 	MediaDevice *dev_;
+	V4L2Device *v4l2dev_;
 };
 
 PipelineHandlerUVC::PipelineHandlerUVC()
-	: dev_(nullptr)
+	: dev_(nullptr), v4l2dev_(nullptr)
 {
 }
 
 PipelineHandlerUVC::~PipelineHandlerUVC()
 {
+	if (v4l2dev_) {
+		v4l2dev_->close();
+		delete v4l2dev_;
+	}
+
 	if (dev_)
 		dev_->release();
 }
@@ -83,6 +90,23 @@ bool PipelineHandlerUVC::match(CameraManager *manager, DeviceEnumerator *enumera
 
 	dev_->acquire();
 
+	for (MediaEntity *entity : dev_->entities()) {
+		if (!(entity->flags() & MEDIA_ENT_FL_DEFAULT))
+			continue;
+
+		v4l2dev_ = new V4L2Device(*entity);
+
+		if (v4l2dev_->open())
+			delete v4l2dev_;
+
+		break;
+	}
+
+	if (!v4l2dev_) {
+		dev_->release();
+		return false;
+	}
+
 	std::shared_ptr<Camera> camera = Camera::create(this, dev_->model());
 	registerCamera(manager, std::move(camera));