[{"id":11174,"web_url":"https://patchwork.libcamera.org/comment/11174/","msgid":"<20200704190142.GA10773@pendragon.ideasonboard.com>","date":"2020-07-04T19:01:42","subject":"Re: [libcamera-devel] [PATCH v3 10/22] v4l2: v4l2_camera_proxy: Use\n\tstream config in tryFormat","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:28PM +0900, Paul Elder wrote:\n> For handling try_fmt, the values should be filled in by validating the\n> stream configuration, and not by recalculating them. Use\n> V4L2Camera::validateConfiguration to obtain size, format, stride, and\n> frameSize values.\n> \n> Signed-off-by: Paul Elder \n\nSquashed with 07/22, and reordered appropriately to avoid using the\nstride() and frameSize() functions (although that last part isn't really\nmandatory, I thought it would be nice from a bisection point of view,\nbut the code is not working correctly today anyway, so there's no\nregression),\n\nReviewed-by: Laurent Pinchart \n\n> ---\n> New in v3\n> ---\n> src/v4l2/v4l2_camera_proxy.cpp | 23 +++++++++--------------\n> 1 file changed, 9 insertions(+), 14 deletions(-)\n> \n> diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\n> index 9121d3d..1a1753b 100644\n> --- a/src/v4l2/v4l2_camera_proxy.cpp\n> +++ b/src/v4l2/v4l2_camera_proxy.cpp\n> @@ -299,24 +299,19 @@ void V4L2CameraProxy::tryFormat(struct v4l2_format *arg)\n> {\n> \tV4L2PixelFormat v4l2Format = V4L2PixelFormat(arg->fmt.pix.pixelformat);\n> \tPixelFormat format = PixelFormatInfo::info(v4l2Format).format;\n> -\tconst std::vector &formats =\n> -\t\tstreamConfig_.formats().pixelformats();\n> -\tif (std::find(formats.begin(), formats.end(), format) == formats.end())\n> -\t\tformat = streamConfig_.formats().pixelformats()[0];\n> -\n> \tSize size(arg->fmt.pix.width, arg->fmt.pix.height);\n> -\tconst std::vector &sizes = streamConfig_.formats().sizes(format);\n> -\tif (std::find(sizes.begin(), sizes.end(), size) == sizes.end())\n> -\t\tsize = streamConfig_.formats().sizes(format)[0];\n> \n> -\tconst PixelFormatInfo &formatInfo = PixelFormatInfo::info(format);\n> +\tStreamConfiguration config;\n> +\tvcam_->validateConfiguration(&config, size, format);\n> +\n> +\tconst PixelFormatInfo &info = PixelFormatInfo::info(config.pixelFormat);\n> \n> -\targ->fmt.pix.width = size.width;\n> -\targ->fmt.pix.height = size.height;\n> -\targ->fmt.pix.pixelformat = formatInfo.v4l2Format;\n> +\targ->fmt.pix.width = config.size.width;\n> +\targ->fmt.pix.height = config.size.height;\n> +\targ->fmt.pix.pixelformat = info.v4l2Format;\n> \targ->fmt.pix.field = V4L2_FIELD_NONE;\n> -\targ->fmt.pix.bytesperline = formatInfo.stride(size.width, 0);\n> -\targ->fmt.pix.sizeimage = formatInfo.frameSize(size);\n> +\targ->fmt.pix.bytesperline = config.stride;\n> +\targ->fmt.pix.sizeimage = config.frameSize;\n> \targ->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;\n> \targ->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;\n> \targ->fmt.pix.ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;","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 520F6BD792\n\tfor ;\n\tSat, 4 Jul 2020 19:01:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DEAEC60E01;\n\tSat, 4 Jul 2020 21:01:47 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9A5F4609C7\n\tfor ;\n\tSat, 4 Jul 2020 21:01:46 +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 0AF8B296;\n\tSat, 4 Jul 2020 21:01:45 +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=\"isFWsIMT\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593889306;\n\tbh=C3hd+W/J7zJxSyOSHbWSNwkcMT4CiAt9hUKRuJQLMV4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=isFWsIMT0f+9Mz0f5CMMDJZmWrG8pslt7iCVxrhzxNEsQGF7GUhzKfiShzVeg6OYa\n\tgDxkr8g/NVP7CtDexVFrKO3SXw86H7YEgeA0qqRyAJf3WcOgV21PCXbZZQ7oVzo8Mq\n\tNRGQ/CtFRtSRYupORXn/cV33KH0/oHrZY8HQCrNk=","Date":"Sat, 4 Jul 2020 22:01:42 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"<20200704190142.GA10773@pendragon.ideasonboard.com>","References":"<20200704133140.1738660-1-paul.elder@ideasonboard.com>\n\t<20200704133140.1738660-11-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200704133140.1738660-11-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 10/22] v4l2: v4l2_camera_proxy: Use\n\tstream config in tryFormat","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\" "}}]