[{"id":3301,"web_url":"https://patchwork.libcamera.org/comment/3301/","msgid":"<20200103051531.GA3820@localhost.localdomain>","date":"2020-01-03T05:15:31","subject":"Re: [libcamera-devel] [PATCH] libcamera: pipeline: uvcvideo: Fix\n\tcrash when default entity is not found","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Laurent,\n\nThank you for the patch.\n\nOn Thu, Jan 02, 2020 at 02:03:06AM +0200, Laurent Pinchart wrote:\n> Commit e441f2c7f46d (\"libcamera: pipeline: uvcvideo: Add controls\n> support\") broke handling of UVC devices without a default entity by\n> turning the error check into an always false check. Fix it.\n> \n> Fixes: e441f2c7f46d (\"libcamera: pipeline: uvcvideo: Add controls support\")\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/libcamera/pipeline/uvcvideo.cpp | 18 +++++++++---------\n> 1 file changed, 9 insertions(+), 9 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index 3043366bee38..8d7f7ea79410 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -296,19 +296,19 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n> \tstd::unique_ptr data = utils::make_unique(this);\n> \n> \t/* Locate and initialise the camera data with the default video node. */\n> -\tfor (MediaEntity *entity : media->entities()) {\n> -\t\tif (entity->flags() & MEDIA_ENT_FL_DEFAULT) {\n> -\t\t\tif (data->init(entity))\n> -\t\t\t\treturn false;\n> -\t\t\tbreak;\n> -\t\t}\n> -\t}\n> -\n> -\tif (!data) {\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\treturn 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> +\t\treturn false;\n> +\n> \t/* Create and register the camera. */\n> \tstd::set streams{ &data->stream_ };\n> \tstd::shared_ptr camera = Camera::create(this, media->model(), streams);\n\nLooks good to me.\n\nReviewed-by: Paul Elder ","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D5F8260462\n\tfor ;\n\tFri, 3 Jan 2020 06:15:36 +0100 (CET)","from localhost.localdomain (unknown [96.44.9.94])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0C9DB30F;\n\tFri, 3 Jan 2020 06:15:35 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578028536;\n\tbh=Qx2YTME2nryNxpfwaxW6T9fiLSu3vyI0QDUTVVcSu1s=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=AOaJtdy5CqsjFFqAJ8a7sjspC9yxr2pZRCy3oVIaNAPGziTItjclxUga1lqjJ84SK\n\tY0Ps2gqdVaZ3UQydAL02CgE3g9DlyoMaEwLh/7HOTII9w1TIzRgEHKf4uDKwTLJEBf\n\tZBr8z5PZvfTM1GWxD0AwTJmiwvwC4Gw364/PEPvA=","Date":"Fri, 3 Jan 2020 00:15:31 -0500","From":"Paul Elder ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200103051531.GA3820@localhost.localdomain>","References":"<20200102000306.633-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20200102000306.633-1-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] libcamera: pipeline: uvcvideo: Fix\n\tcrash when default entity is not found","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","X-List-Received-Date":"Fri, 03 Jan 2020 05:15:37 -0000"}},{"id":3305,"web_url":"https://patchwork.libcamera.org/comment/3305/","msgid":"<20200103083419.er6q5ctii742puvy@uno.localdomain>","date":"2020-01-03T08:34:19","subject":"Re: [libcamera-devel] [PATCH] libcamera: pipeline: uvcvideo: Fix\n\tcrash when default entity is not found","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Thu, Jan 02, 2020 at 02:03:06AM +0200, Laurent Pinchart wrote:\n> Commit e441f2c7f46d (\"libcamera: pipeline: uvcvideo: Add controls\n> support\") broke handling of UVC devices without a default entity by\n> turning the error check into an always false check. Fix it.\n>\n> Fixes: e441f2c7f46d (\"libcamera: pipeline: uvcvideo: Add controls support\")\n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> src/libcamera/pipeline/uvcvideo.cpp | 18 +++++++++---------\n> 1 file changed, 9 insertions(+), 9 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index 3043366bee38..8d7f7ea79410 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -296,19 +296,19 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n> \tstd::unique_ptr data = utils::make_unique(this);\n>\n> \t/* Locate and initialise the camera data with the default video node. */\n> -\tfor (MediaEntity *entity : media->entities()) {\n> -\t\tif (entity->flags() & MEDIA_ENT_FL_DEFAULT) {\n> -\t\t\tif (data->init(entity))\n> -\t\t\t\treturn false;\n> -\t\t\tbreak;\n> -\t\t}\n> -\t}\n> -\n> -\tif (!data) {\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\treturn 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> +\t\treturn false;\n> +\n> \t/* Create and register the camera. */\n> \tstd::set streams{ &data->stream_ };\n> \tstd::shared_ptr camera = Camera::create(this, media->model(), streams);\n> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7544760464\n\tfor ;\n\tFri, 3 Jan 2020 09:32:02 +0100 (CET)","from uno.localdomain\n\t(host109-57-dynamic.61-82-r.retail.telecomitalia.it [82.61.57.109])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id CFF66200003;\n\tFri, 3 Jan 2020 08:32:01 +0000 (UTC)"],"Date":"Fri, 3 Jan 2020 09:34:19 +0100","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200103083419.er6q5ctii742puvy@uno.localdomain>","References":"<20200102000306.633-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"cwdtqwtfdkvrzuy6\"","Content-Disposition":"inline","In-Reply-To":"<20200102000306.633-1-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] libcamera: pipeline: uvcvideo: Fix\n\tcrash when default entity is not found","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","X-List-Received-Date":"Fri, 03 Jan 2020 08:32:02 -0000"}}]