[{"id":1923,"web_url":"https://patchwork.libcamera.org/comment/1923/","msgid":"<20190619000028.GU23556@pendragon.ideasonboard.com>","date":"2019-06-19T00:00:28","subject":"Re: [libcamera-devel] [PATCH v3 16/16] libcamera: pipeline:\n\tuvcvideo: Add format information and validation","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 Sun, Jun 16, 2019 at 03:34:02PM +0200, Niklas Söderlund wrote:\n> Extend the uvcvideo pipeline with format information and validation. The\n> format information is gathered by enumerating the v4l2 device. This\n> enumeration approach is valid for UVC as it has a static and simple\n> media graph.\n> \n> Signed-off-by: Niklas Söderlund \n> Reviewed-by: Jacopo Mondi \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/libcamera/pipeline/uvcvideo.cpp | 41 ++++++++++++++++++++++-------\n> 1 file changed, 31 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index 45260f34c8f5daba..7ca9d0eefe8223e8 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -5,6 +5,8 @@\n> * uvcvideo.cpp - Pipeline handler for uvcvideo devices\n> */\n> \n> +#include \n> +\n> #include \n> #include \n> #include \n> @@ -95,18 +97,33 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n> \t}\n> \n> \tStreamConfiguration &cfg = config_[0];\n> -\n> -\t/* \\todo: Validate the configuration against the device capabilities. */\n> +\tconst StreamFormats &formats = cfg.formats();\n> \tconst unsigned int pixelFormat = cfg.pixelFormat;\n> \tconst Size size = cfg.size;\n> \n> -\tcfg.pixelFormat = V4L2_PIX_FMT_YUYV;\n> -\tcfg.size = { 640, 480 };\n> +\tconst std::vector pixelFormats = formats.pixelformats();\n> +\tauto iter = std::find(pixelFormats.begin(), pixelFormats.end(), pixelFormat);\n> +\tif (iter == pixelFormats.end()) {\n> +\t\tcfg.pixelFormat = pixelFormats.front();\n> +\t\tLOG(UVC, Debug)\n> +\t\t\t<< \"Adjusting pixel format from \" << pixelFormat\n> +\t\t\t<< \" to \" << cfg.pixelFormat;\n> +\t\tstatus = Adjusted;\n> +\t}\n> +\n> +\tconst std::vector &formatSizes = formats.sizes(cfg.pixelFormat);\n> +\tcfg.size = formatSizes.front();\n> +\tfor (const Size &formatsSize : formatSizes) {\n> +\t\tif (formatsSize > size)\n> +\t\t\tbreak;\n> +\n> +\t\tcfg.size = formatsSize;\n> +\t}\n> \n> -\tif (cfg.pixelFormat != pixelFormat || cfg.size != size) {\n> +\tif (cfg.size != size) {\n> \t\tLOG(UVC, Debug)\n> -\t\t\t<< \"Adjusting configuration from \" << cfg.toString()\n> -\t\t\t<< \" to \" << cfg.size.toString() << \"-YUYV\";\n> +\t\t\t<< \"Adjusting size from \" << size.toString()\n> +\t\t\t<< \" to \" << cfg.size.toString();\n> \t\tstatus = Adjusted;\n> \t}\n> \n> @@ -123,14 +140,18 @@ PipelineHandlerUVC::PipelineHandlerUVC(CameraManager *manager)\n> CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\n> \tconst StreamRoles &roles)\n> {\n> +\tUVCCameraData *data = cameraData(camera);\n> \tCameraConfiguration *config = new UVCCameraConfiguration();\n> \n> \tif (roles.empty())\n> \t\treturn config;\n> \n> -\tStreamConfiguration cfg{};\n> -\tcfg.pixelFormat = V4L2_PIX_FMT_YUYV;\n> -\tcfg.size = { 640, 480 };\n> +\tImageFormats v4l2formats = data->video_->formats();\n> +\tStreamFormats formats(v4l2formats.data());\n> +\tStreamConfiguration cfg(formats);\n> +\n> +\tcfg.pixelFormat = formats.pixelformats().front();\n> +\tcfg.size = formats.sizes(cfg.pixelFormat).back();\n> \tcfg.bufferCount = 4;\n> \n> \tconfig->addConfiguration(cfg);","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B69F961A27\n\tfor ;\n\tWed, 19 Jun 2019 02:00:45 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4172ED5;\n\tWed, 19 Jun 2019 02:00:45 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1560902445;\n\tbh=pJQ5oatv99uQYE1Kf6evGU5G0y/db80r3Rytl35sx9I=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=hlicwwaaz5of91mWGuGQA05s50TC/wqqhdYwblSzRNoq94phufJ+wequIxMc54gbr\n\tHTZQX6PAWIvOYSygqcWGXS8WweS+9SRU6ODDWAkZJbcHfxI5GS2ELIHwozDK62iIcR\n\tUdQ1SeQYJIqTtIlTctGzdf0C/xTLK3+YyCOomROg=","Date":"Wed, 19 Jun 2019 03:00:28 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190619000028.GU23556@pendragon.ideasonboard.com>","References":"<20190616133402.21934-1-niklas.soderlund@ragnatech.se>\n\t<20190616133402.21934-17-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190616133402.21934-17-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v3 16/16] libcamera: pipeline:\n\tuvcvideo: Add format information and validation","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 19 Jun 2019 00:00:45 -0000"}}]