Patch Detail
Show a patch.
GET /api/1.1/patches/8674/?format=api
{ "id": 8674, "url": "https://patchwork.libcamera.org/api/1.1/patches/8674/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8674/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20200708134417.67747-6-paul.elder@ideasonboard.com>", "date": "2020-07-08T13:44:01", "name": "[libcamera-devel,v4,05/21] libcamera: formats: PixelFormatInfo: Add v4l2 lookup function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "1db2cde0d15a14c499af4a2af625b60641cb1307", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/8674/mbox/", "series": [ { "id": 1090, "url": "https://patchwork.libcamera.org/api/1.1/series/1090/?format=api", "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/8674/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8674/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 87134BD792\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 8 Jul 2020 13:44:42 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5129861111;\n\tWed, 8 Jul 2020 15:44:42 +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 F268E610B2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 8 Jul 2020 15:44:40 +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 32C6051B;\n\tWed, 8 Jul 2020 15:44:38 +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=\"KSCv6Tew\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594215880;\n\tbh=8LgF9NOvt4hYssHIdnkWKvBRkLxc9XOw36QpzihEHcs=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=KSCv6TewGay3VzffVf3ab5wtPERxEY2qX0w79p3/sHTcmMeQM8TUVu21T7DMBXrvt\n\t6OF5pJ8+m993hhyJBY1ma15xWNdMUZ5xQE/Jy5YgixTjKFUPLHJLhXGJ0wemRvPUq3\n\tZFn1YEES2u84ykarUEuxn6Nhezjx5/DvJFhfQ5hA=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 8 Jul 2020 22:44:01 +0900", "Message-Id": "<20200708134417.67747-6-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 05/21] libcamera: formats:\n\tPixelFormatInfo: Add v4l2 lookup function", "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": "Add a lookup function for PixelFormatInfo that takes a V4L2PixelFormat.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n---\nNo change in v4\n\nChanges in v3:\n- rename invalid PixelFormatInfo\n- make info const in PixelFormatInfo::info()\n\nChanges in v2:\n- move invalid PixelFormatInfo instance to anonymous namespace\n- add documentation\n---\n include/libcamera/internal/formats.h | 1 +\n src/libcamera/formats.cpp | 25 ++++++++++++++++++++++---\n 2 files changed, 23 insertions(+), 3 deletions(-)", "diff": "diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h\nindex 61e5ff5..054be37 100644\n--- a/include/libcamera/internal/formats.h\n+++ b/include/libcamera/internal/formats.h\n@@ -50,6 +50,7 @@ public:\n \tbool isValid() const { return format.isValid(); }\n \n \tstatic const PixelFormatInfo &info(const PixelFormat &format);\n+\tstatic const PixelFormatInfo &info(const V4L2PixelFormat &format);\n \n \t/* \\todo Add support for non-contiguous memory planes */\n \tconst char *name;\ndiff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\nindex e6d3d3b..6d96055 100644\n--- a/src/libcamera/formats.cpp\n+++ b/src/libcamera/formats.cpp\n@@ -7,6 +7,7 @@\n \n #include \"libcamera/internal/formats.h\"\n \n+#include <algorithm>\n #include <errno.h>\n \n #include <libcamera/formats.h>\n@@ -229,6 +230,8 @@ const std::map<unsigned int, std::vector<SizeRange>> &ImageFormats::data() const\n \n namespace {\n \n+const PixelFormatInfo pixelFormatInfoInvalid{};\n+\n const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t/* RGB formats. */\n \t{ formats::BGR888, {\n@@ -700,17 +703,33 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n */\n const PixelFormatInfo &PixelFormatInfo::info(const PixelFormat &format)\n {\n-\tstatic const PixelFormatInfo invalid{};\n-\n \tconst auto iter = pixelFormatInfo.find(format);\n \tif (iter == pixelFormatInfo.end()) {\n \t\tLOG(Formats, Warning)\n \t\t\t<< \"Unsupported pixel format 0x\"\n \t\t\t<< utils::hex(format.fourcc());\n-\t\treturn invalid;\n+\t\treturn pixelFormatInfoInvalid;\n \t}\n \n \treturn iter->second;\n }\n \n+/**\n+ * \\brief Retrieve information about a pixel format\n+ * \\param[in] format The V4L2 pixel format\n+ * \\return The PixelFormatInfo describing the V4L2 \\a format if known, or an\n+ * invalid PixelFormatInfo otherwise\n+ */\n+const PixelFormatInfo &PixelFormatInfo::info(const V4L2PixelFormat &format)\n+{\n+\tconst auto &info = std::find_if(pixelFormatInfo.begin(), pixelFormatInfo.end(),\n+\t\t\t\t\t[format](auto pair) {\n+\t\t\t\t\t\treturn pair.second.v4l2Format == format;\n+\t\t\t\t\t});\n+\tif (info == pixelFormatInfo.end())\n+\t\treturn pixelFormatInfoInvalid;\n+\n+\treturn info->second;\n+}\n+\n } /* namespace libcamera */\n", "prefixes": [ "libcamera-devel", "v4", "05/21" ] }