[{"id":11950,"web_url":"https://patchwork.libcamera.org/comment/11950/","msgid":"<20200808202304.GD6186@pendragon.ideasonboard.com>","date":"2020-08-08T20:23:04","subject":"Re: [libcamera-devel] [PATCH 3/7] libcamera: pipeline: uvcvideo:\n\tInitialize CameraData from MediaDevice","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Thu, Aug 06, 2020 at 03:09:33PM +0200, Niklas Söderlund wrote:\n> The UVCCameraData::init() is the only consumer of the default entry in\n> the media graph, move the lookup of it into the init() function and pass\n> it the MediaDevice. This is done in preparation to extend the CameraData\n> initialization to consume more information form the MediaDevice.\n> \n> Signed-off-by: Niklas Söderlund \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 30 ++++++++++----------\n> 1 file changed, 15 insertions(+), 15 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> index bc892ecfac046881..b12083a7a74dae54 100644\n> --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> @@ -43,7 +43,7 @@ public:\n> \t\tdelete video_;\n> \t}\n> \n> -\tint init(MediaEntity *entity);\n> +\tint init(MediaDevice *media);\n> \tvoid addControl(uint32_t cid, const ControlInfo &v4l2info,\n> \t\t\tControlInfoMap::Map *ctrls);\n> \tvoid bufferReady(FrameBuffer *buffer);\n> @@ -457,18 +457,7 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n> \n> \tstd::unique_ptr data = std::make_unique(this);\n> \n> -\t/* Locate and initialise the camera data with the default video node. */\n> -\tconst std::vector &entities = media->entities();\n> -\tauto entity = std::find_if(entities.begin(), entities.end(),\n> -\t\t\t\t [](MediaEntity *entity) {\n> -\t\t\t\t\t return entity->flags() & MEDIA_ENT_FL_DEFAULT;\n> -\t\t\t\t });\n> -\tif (entity == entities.end()) {\n> -\t\tLOG(UVC, Error) << \"Could not find a default video device\";\n> -\t\treturn false;\n> -\t}\n> -\n> -\tif (data->init(*entity))\n> +\tif (data->init(media))\n> \t\treturn false;\n> \n> \t/* Create and register the camera. */\n> @@ -488,12 +477,23 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n> \treturn true;\n> }\n> \n> -int UVCCameraData::init(MediaEntity *entity)\n> +int UVCCameraData::init(MediaDevice *media)\n> {\n> \tint ret;\n> \n> +\t/* Locate and initialise the camera data with the default video node. */\n> +\tconst std::vector &entities = media->entities();\n> +\tauto entity = std::find_if(entities.begin(), entities.end(),\n> +\t\t\t\t [](MediaEntity *entity) {\n> +\t\t\t\t\t return entity->flags() & MEDIA_ENT_FL_DEFAULT;\n> +\t\t\t\t });\n> +\tif (entity == entities.end()) {\n> +\t\tLOG(UVC, Error) << \"Could not find a default video device\";\n> +\t\treturn -ENODEV;\n> +\t}\n> +\n> \t/* Create and open the video device. */\n> -\tvideo_ = new V4L2VideoDevice(entity);\n> +\tvideo_ = new V4L2VideoDevice(*entity);\n> \tret = video_->open();\n> \tif (ret)\n> \t\treturn ret;","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id BDCCDBD87D\n\tfor ;\n\tSat, 8 Aug 2020 20:23:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2B57B60DF1;\n\tSat, 8 Aug 2020 22:23:24 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B6C7D6038D\n\tfor ;\n\tSat, 8 Aug 2020 22:23:22 +0200 (CEST)","from pendragon.ideasonboard.com (85-76-78-184-nat.elisa-mobile.fi\n\t[85.76.78.184])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E87AFF9;\n\tSat, 8 Aug 2020 22:23:21 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"VGvvIW18\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1596918202;\n\tbh=vnScL7SKRu/w0atG2QjT1ZhF0PrCk+09NT7NwSKIrd4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=VGvvIW18gxUkMkKJe0yct+7clqufFQSPknvfmsyXVUJFb2vsPdW9B4MdPRxrsbwwN\n\tNbHkAvpvDoqg3OJ85pf9N5M4hThYo8Rhsn61lAxLsIYvPRMtHXf3QaoTwiwQn7ZQt8\n\tQ9zNgt9xdCB19aFTeNQs9DjHMrQbfADi1NvFK3Mg=","Date":"Sat, 8 Aug 2020 23:23:04 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Message-ID":"<20200808202304.GD6186@pendragon.ideasonboard.com>","References":"<20200806130937.2991606-1-niklas.soderlund@ragnatech.se>\n\t<20200806130937.2991606-4-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200806130937.2991606-4-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH 3/7] libcamera: pipeline: uvcvideo:\n\tInitialize CameraData from MediaDevice","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]