{"id":8631,"url":"https://patchwork.libcamera.org/api/patches/8631/?format=json","web_url":"https://patchwork.libcamera.org/patch/8631/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200704133140.1738660-11-paul.elder@ideasonboard.com>","date":"2020-07-04T13:31:28","name":"[libcamera-devel,v3,10/22] v4l2: v4l2_camera_proxy: Use stream config in tryFormat","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"f6cd32eea1cd5d0aabcbc89522041617795feb4c","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8631/mbox/","series":[{"id":1083,"url":"https://patchwork.libcamera.org/api/series/1083/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1083","date":"2020-07-04T13:31:18","name":"Clean up formats in v4l2-compat and pipeline handlers","version":3,"mbox":"https://patchwork.libcamera.org/series/1083/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8631/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8631/checks/","tags":{},"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 CA47EBD792\n\tfor ;\n\tSat, 4 Jul 2020 13:32:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9A76560E2B;\n\tSat, 4 Jul 2020 15:32:16 +0200 (CEST)","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 E180760E2B\n\tfor ;\n\tSat, 4 Jul 2020 15:32:14 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 67C8655B;\n\tSat, 4 Jul 2020 15:32:13 +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=\"jOtoKrOy\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593869534;\n\tbh=F0pLkwzWLyT5yg8LEW1hghzt00pTUOWuUtzzNQEX9G8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=jOtoKrOyCN20nnmt4clEjES0pZvuKvsu7VOET+VhjasasOgQTb1357ZrHe8qp3QDg\n\tZcS5o/YGgoCGzG3/GOyM/Yi/ENg9mZqsnqK6h7Lz1GQwOQOHEktJ894Ra7kusQefoZ\n\t+jMCMvWii8aZ1cDI8uS7XKJuiRtneBC8hz751NgU=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 4 Jul 2020 22:31:28 +0900","Message-Id":"<20200704133140.1738660-11-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200704133140.1738660-1-paul.elder@ideasonboard.com>","References":"<20200704133140.1738660-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"For handling try_fmt, the values should be filled in by validating the\nstream configuration, and not by recalculating them. Use\nV4L2Camera::validateConfiguration to obtain size, format, stride, and\nframeSize values.\n\nSigned-off-by: Paul Elder \n\n---\nNew in v3\n---\n src/v4l2/v4l2_camera_proxy.cpp | 23 +++++++++--------------\n 1 file changed, 9 insertions(+), 14 deletions(-)","diff":"diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 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;\n","prefixes":["libcamera-devel","v3","10/22"]}