[{"id":1815,"web_url":"https://patchwork.libcamera.org/comment/1815/","msgid":"<20190610071820.GG4806@pendragon.ideasonboard.com>","date":"2019-06-10T07:18:20","subject":"Re: [libcamera-devel] [PATCH 17/17] libcamera: pipeline: uvcvideo:\n\tAdd 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 Mon, May 27, 2019 at 02:15:43AM +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> ---\n> src/libcamera/pipeline/uvcvideo.cpp | 46 +++++++++++++++++++++++------\n> 1 file changed, 37 insertions(+), 9 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index 45260f34c8f5daba..ce9f281891a8bc5e 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -95,18 +95,42 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n> \t}\n> \n> \tStreamConfiguration &cfg = config_[0];\n> +\tconst StreamFormats &formats = cfg.formats();\n> \n\nYou can remove this blank line.\n\n> -\t/* \\todo: Validate the configuration against the device capabilities. */\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> +\tbool found = false;\n> +\tfor (unsigned int pixfmt : formats.pixelformats()) {\n> +\t\tif (pixfmt == pixelFormat) {\n> +\t\t\tfound = true;\n> +\t\t\tbreak;\n> +\t\t}\n> +\t}\n> +\tif (!found)\n> +\t\tcfg.pixelFormat = formats.pixelformats().front();\n\n\tauto iter = std::find(formats.begin(), formats.end(), pixelFormat);\n\tif (iter == formats.end()) {\n\t\tcfg.pixelFormat = formats.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> \n> -\tif (cfg.pixelFormat != pixelFormat || cfg.size != size) {\n> +\tif (cfg.pixelFormat != pixelFormat) {\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 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\tcfg.size = formatsSize;\n> +\n> +\t\tif (formatsSize == size)\n\nAs the sizes are sorted, should this be >= ?\n\nI really like this patch. Once the series stabilises, I think we should\ndo the same for all the other pipeline handlers, and always provide\nstream formats when constructing the configuration. The stream\nconfiguration constructor that takes no format should then be removed.\n\n> +\t\t\tbreak;\n> +\t}\n> +\n> +\tif (cfg.size != size) {\n> +\t\tLOG(UVC, Debug)\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 +147,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> +\tV4L2DeviceFormats 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[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 54FD36376F\n\tfor ;\n\tMon, 10 Jun 2019 09:18:37 +0200 (CEST)","from pendragon.ideasonboard.com (85-76-134-17-nat.elisa-mobile.fi\n\t[85.76.134.17])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9F380569;\n\tMon, 10 Jun 2019 09:18:36 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1560151117;\n\tbh=phSZcLwE4J/TcdJMfRbm3ECef06sIDz5h7WBIkXLuHI=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=u7z5GU3Mk+Kj48WMjciNG6HVUJ0rmWPHNdfr/QwHqCQ48vsn3OEUP8zYynbrVIsAO\n\tkgAkqgwRGrkFbR/hBAtU1ST5Hz7SPSVwlRYnDu/9fTPAh6DxLJKZnqoi+5H1OiZ5yr\n\tRBc0VIMWpRGQpIXicW2FXL1/sZ6zN0N/JPkAFEW4=","Date":"Mon, 10 Jun 2019 10:18:20 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190610071820.GG4806@pendragon.ideasonboard.com>","References":"<20190527001543.13593-1-niklas.soderlund@ragnatech.se>\n\t<20190527001543.13593-18-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":"<20190527001543.13593-18-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 17/17] libcamera: pipeline: uvcvideo:\n\tAdd 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":"Mon, 10 Jun 2019 07:18:37 -0000"}}]