Patch Detail
Show a patch.
GET /api/patches/8737/?format=api
{ "id": 8737, "url": "https://patchwork.libcamera.org/api/patches/8737/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8737/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200709132835.112593-23-paul.elder@ideasonboard.com>", "date": "2020-07-09T13:28:34", "name": "[libcamera-devel,v5,22/23] v4l2: v4l2_camera_proxy: Use stream config in tryFormat", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c0a967f1b9b5451c45371c15d88dbab14fe719be", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/8737/mbox/", "series": [ { "id": 1093, "url": "https://patchwork.libcamera.org/api/series/1093/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1093", "date": "2020-07-09T13:28:12", "name": "Clean up formats in v4l2-compat and pipeline handlers", "version": 5, "mbox": "https://patchwork.libcamera.org/series/1093/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8737/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8737/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 32BBEBD792\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 9 Jul 2020 13:29:46 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F41476124F;\n\tThu, 9 Jul 2020 15:29:45 +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 78268611B2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 9 Jul 2020 15:29:44 +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 94B6F525;\n\tThu, 9 Jul 2020 15:29:42 +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=\"gh7bJtLD\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594301384;\n\tbh=z9IOjSBpFqm+X0WXiiOGE26Y96dw5D9zVDicpLvH6l8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=gh7bJtLDiDRpFDcZXymoIyaeik7auJXrR6Ih1DEmpMKimVbJJWE+ifkVFcnblWkRx\n\tW+eWvjohG8kh/W8tv46SNUCbj7p+opDJd9aWaHwltf4Khj9k8CexltHjUEvdOwNwM2\n\tT2FMeMz0NIRlhVo96AA3HRF4cDb+B3tVP+bkY7JM=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 9 Jul 2020 22:28:34 +0900", "Message-Id": "<20200709132835.112593-23-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200709132835.112593-1-paul.elder@ideasonboard.com>", "References": "<20200709132835.112593-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v5 22/23] 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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. Add a new\nV4L2Camera::validateConfiguration() function to validate a configuration\nand use it to obtain size, format, stride, and frameSize values.\n\nIf the format negotiation fails, return error from try_fmt and s_fmt.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n---\nChanges in v5:\n- change commit message wording a bit\n- re-order patches to avoid potential regressions\n- return error from try_fmt and s_fmt if negotiation fails\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 | 41 ++++++++++++++++++++--------------\n src/v4l2/v4l2_camera_proxy.h | 2 +-\n 4 files changed, 48 insertions(+), 18 deletions(-)", "diff": "diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp\nindex a923256..61bca07 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<CameraConfiguration> 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 = config_->at(0).stream();\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 8c55a06..50ab7e6 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -296,33 +296,36 @@ int V4L2CameraProxy::vidioc_g_fmt(V4L2CameraFile *file, struct v4l2_format *arg)\n \treturn 0;\n }\n \n-void V4L2CameraProxy::tryFormat(struct v4l2_format *arg)\n+int 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<PixelFormat> &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<Size> &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+\tint ret = vcam_->validateConfiguration(format, size, &config);\n+\tif (ret < 0) {\n+\t\tLOG(V4L2Compat, Error)\n+\t\t\t<< \"Failed to negotiate a valid format: \"\n+\t\t\t<< format.toString();\n+\t\treturn -EINVAL;\n+\t}\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 \targ->fmt.pix.quantization = V4L2_QUANTIZATION_DEFAULT;\n \targ->fmt.pix.xfer_func = V4L2_XFER_FUNC_DEFAULT;\n+\n+\treturn 0;\n }\n \n int V4L2CameraProxy::vidioc_s_fmt(V4L2CameraFile *file, struct v4l2_format *arg)\n@@ -339,7 +342,9 @@ int V4L2CameraProxy::vidioc_s_fmt(V4L2CameraFile *file, struct v4l2_format *arg)\n \tif (ret < 0)\n \t\treturn ret;\n \n-\ttryFormat(arg);\n+\tret = tryFormat(arg);\n+\tif (ret < 0)\n+\t\treturn ret;\n \n \tSize size(arg->fmt.pix.width, arg->fmt.pix.height);\n \tV4L2PixelFormat v4l2Format = V4L2PixelFormat(arg->fmt.pix.pixelformat);\n@@ -361,7 +366,9 @@ int V4L2CameraProxy::vidioc_try_fmt(V4L2CameraFile *file, struct v4l2_format *ar\n \tif (!validateBufferType(arg->type))\n \t\treturn -EINVAL;\n \n-\ttryFormat(arg);\n+\tint ret = tryFormat(arg);\n+\tif (ret < 0)\n+\t\treturn ret;\n \n \treturn 0;\n }\ndiff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h\nindex e962694..f06b5b8 100644\n--- a/src/v4l2/v4l2_camera_proxy.h\n+++ b/src/v4l2/v4l2_camera_proxy.h\n@@ -41,7 +41,7 @@ private:\n \tbool validateMemoryType(uint32_t memory);\n \tvoid setFmtFromConfig(StreamConfiguration &streamConfig);\n \tvoid querycap(std::shared_ptr<Camera> camera);\n-\tvoid tryFormat(struct v4l2_format *arg);\n+\tint tryFormat(struct v4l2_format *arg);\n \tenum v4l2_priority maxPriority();\n \tvoid updateBuffers();\n \tvoid freeBuffers();\n", "prefixes": [ "libcamera-devel", "v5", "22/23" ] }