[{"id":11183,"web_url":"https://patchwork.libcamera.org/comment/11183/","msgid":"<20200704220125.GJ10773@pendragon.ideasonboard.com>","date":"2020-07-04T22:01:25","subject":"Re: [libcamera-devel] [PATCH v3 20/22] libcamera: uvcvideo: Fill\n\tstride and frameSize at config validation","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Sat, Jul 04, 2020 at 10:31:38PM +0900, Paul Elder wrote:\n> Fill the stride and frameSize fields of the StreamConfiguration at\n> configuration validation time instead of at camera configuration time.\n> \n> Signed-off-by: Paul Elder \n> \n> ---\n> New in v3\n> ---\n> src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 31 ++++++++++++++++----\n> 1 file changed, 26 insertions(+), 5 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> index a5feab6..f8d258e 100644\n> --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n> @@ -53,9 +53,12 @@ public:\n> class UVCCameraConfiguration : public CameraConfiguration\n> {\n> public:\n> -\tUVCCameraConfiguration();\n> +\tUVCCameraConfiguration(V4L2VideoDevice *video);\n\nI'd rather pass a UVCCameraData instead, to make it more generic.\n\n> \n> \tStatus validate() override;\n> +\n> +private:\n> +\tV4L2VideoDevice *video_;\n> };\n> \n> class PipelineHandlerUVC : public PipelineHandler\n> @@ -89,8 +92,8 @@ private:\n> \t}\n> };\n> \n> -UVCCameraConfiguration::UVCCameraConfiguration()\n> -\t: CameraConfiguration()\n> +UVCCameraConfiguration::UVCCameraConfiguration(V4L2VideoDevice *video)\n> +\t: CameraConfiguration(), video_(video)\n> {\n> }\n> \n> @@ -141,6 +144,25 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n> \n> \tcfg.bufferCount = 4;\n> \n> +\tV4L2DeviceFormat format = {};\n> +\tformat.fourcc = video_->toV4L2PixelFormat(cfg.pixelFormat);\n> +\tformat.size = cfg.size;\n> +\n> +\tint ret = video_->tryFormat(&format);\n> +\tif (ret) {\n> +\t\tLOG(UVC, Warning)\n> +\t\t\t<< \"try_fmt failed, \"\n> +\t\t\t<< \"getting stride and frameSize from PixelFormatInfo\";\n> +\n> +\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);\n> +\t\tcfg.stride = info.stride(cfg.size.width, 0);\n> +\t\tcfg.frameSize = info.frameSize(cfg.size);\n> +\t\treturn status;\n\nSame as for the previous patch, I think you can just return an error. I\nwould either drop the warning message (tryFormat() prints a message on\nfailure, doesn't it ?), or also add it in the previous patch.\n\n> +\t}\n> +\n> +\tcfg.stride = format.planes[0].bpl;\n> +\tcfg.frameSize = format.planes[0].size;\n> +\n> \treturn status;\n> }\n> \n> @@ -153,7 +175,7 @@ CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\n> \tconst StreamRoles &roles)\n> {\n> \tUVCCameraData *data = cameraData(camera);\n> -\tCameraConfiguration *config = new UVCCameraConfiguration();\n> +\tCameraConfiguration *config = new UVCCameraConfiguration(data->video_);\n> \n> \tif (roles.empty())\n> \t\treturn config;\n> @@ -200,7 +222,6 @@ int PipelineHandlerUVC::configure(Camera *camera, CameraConfiguration *config)\n> \t\treturn -EINVAL;\n> \n> \tcfg.setStream(&data->stream_);\n> -\tcfg.stride = format.planes[0].bpl;\n> \n> \treturn 0;\n> }","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 B92A8BD790\n\tfor ;\n\tSat, 4 Jul 2020 22:01:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4A75960E05;\n\tSun, 5 Jul 2020 00:01:31 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9A825609A9\n\tfor ;\n\tSun, 5 Jul 2020 00:01:29 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 160D5296;\n\tSun, 5 Jul 2020 00:01:29 +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=\"T7yQsoSG\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593900089;\n\tbh=Pen+O+DM5OES1RckP2IoHoXVBPTxBi2nJW93VMgeXJk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=T7yQsoSG/F+y02MDoDAdsAiDn5yL5JBszLkhbOGU+LVTX8JhFFFJfNT4CD49VBL4y\n\tl7nnMihDdIReKcELirzqOz9kOJB3QKz5T9WL+iwidKHHBzLcHn4tXKU24m0KlxsL3v\n\tWlxuYkpl31oV6ydax1aFZvXppUf8JugKeQNTuqyE=","Date":"Sun, 5 Jul 2020 01:01:25 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"<20200704220125.GJ10773@pendragon.ideasonboard.com>","References":"<20200704133140.1738660-1-paul.elder@ideasonboard.com>\n\t<20200704133140.1738660-21-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200704133140.1738660-21-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 20/22] libcamera: uvcvideo: Fill\n\tstride and frameSize at config validation","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]