{"id":8677,"url":"https://patchwork.libcamera.org/api/1.1/patches/8677/?format=json","web_url":"https://patchwork.libcamera.org/patch/8677/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20200708134417.67747-9-paul.elder@ideasonboard.com>","date":"2020-07-08T13:44:04","name":"[libcamera-devel,v4,08/21] v4l2: v4l2_camera_proxy: Use stream config in tryFormat","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"18ca3233da3b0a572c67f586183a74c840d37def","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8677/mbox/","series":[{"id":1090,"url":"https://patchwork.libcamera.org/api/1.1/series/1090/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1090","date":"2020-07-08T13:43:56","name":"Clean up formats in v4l2-compat and pipeline handlers","version":4,"mbox":"https://patchwork.libcamera.org/series/1090/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8677/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8677/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 BC303BD792\n\tfor ;\n\tWed, 8 Jul 2020 13:44:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 871EA61130;\n\tWed, 8 Jul 2020 15:44:48 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 20DA561136\n\tfor ;\n\tWed, 8 Jul 2020 15:44:47 +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 A13C651B;\n\tWed, 8 Jul 2020 15:44: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=\"qJV/2lnC\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594215886;\n\tbh=wV/EmtRy7qByINd29XeAOmiAY1i7R+jozVKVWd5lZL8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=qJV/2lnCJvIqFZN5UJK4Tx4KRR49EoipH/4lwlsIIcjoezlfpvjNh+kK4s2gNDXBd\n\tHdDZICYy6ONsXx3QnTtvSTa+tXUdysqkjqmhrknE3p4j3s6bbG/De0qz3ZKMBWiMMr\n\t8W0CJYPauQ2XCyI/BXK9ETmbpl8lKs5XUGeI3RX0=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 8 Jul 2020 22:44:04 +0900","Message-Id":"<20200708134417.67747-9-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200708134417.67747-1-paul.elder@ideasonboard.com>","References":"<20200708134417.67747-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 08/21] 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 or manually checking\nagainst the cached list of formats and sizes. Use\nV4L2Camera::validateConfiguration to obtain size, format, stride, and\nframeSize values. Also, implement this function in V4L2Camera.\n\nSigned-off-by: Paul Elder \n\n---\nChanges in v4:\n- clean up code a bit\n- squash the implementation and usage\n\nNew in v3\n---\n src/v4l2/v4l2_camera.cpp | 20 ++++++++++++++++++++\n src/v4l2/v4l2_camera.h | 3 +++\n src/v4l2/v4l2_camera_proxy.cpp | 23 +++++++++--------------\n 3 files changed, 32 insertions(+), 14 deletions(-)","diff":"diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp\nindex ffc1230..9f81c97 100644\n--- a/src/v4l2/v4l2_camera.cpp\n+++ b/src/v4l2/v4l2_camera.cpp\n@@ -138,6 +138,26 @@ int V4L2Camera::configure(StreamConfiguration *streamConfigOut,\n \treturn 0;\n }\n \n+int V4L2Camera::validateConfiguration(const PixelFormat &pixelFormat,\n+\t\t\t\t const Size &size,\n+\t\t\t\t StreamConfiguration *streamConfigOut)\n+{\n+\tstd::unique_ptr config =\n+\t\tcamera_->generateConfiguration({ StreamRole::Viewfinder });\n+\tStreamConfiguration &cfg = config->at(0);\n+\tcfg.size = size;\n+\tcfg.pixelFormat = pixelFormat;\n+\tcfg.bufferCount = 1;\n+\n+\tCameraConfiguration::Status validation = config->validate();\n+\tif (validation == CameraConfiguration::Invalid)\n+\t\treturn -EINVAL;\n+\n+\t*streamConfigOut = cfg;\n+\n+\treturn 0;\n+}\n+\n int V4L2Camera::allocBuffers(unsigned int count)\n {\n \tStream *stream = *camera_->streams().begin();\ndiff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\nindex 515e906..be6c4e1 100644\n--- a/src/v4l2/v4l2_camera.h\n+++ b/src/v4l2/v4l2_camera.h\n@@ -47,6 +47,9 @@ public:\n \tint configure(StreamConfiguration *streamConfigOut,\n \t\t const Size &size, const PixelFormat &pixelformat,\n \t\t unsigned int bufferCount);\n+\tint validateConfiguration(const PixelFormat &pixelformat,\n+\t\t\t\t const Size &size,\n+\t\t\t\t StreamConfiguration *streamConfigOut);\n \n \tint allocBuffers(unsigned int count);\n \tvoid freeBuffers();\ndiff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 305ede0..5c92ff7 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -300,24 +300,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(format, size, &config);\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","v4","08/21"]}