{"id":8720,"url":"https://patchwork.libcamera.org/api/1.1/patches/8720/?format=json","web_url":"https://patchwork.libcamera.org/patch/8720/","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":"<20200709132835.112593-6-paul.elder@ideasonboard.com>","date":"2020-07-09T13:28:17","name":"[libcamera-devel,v5,05/23] libcamera: formats: PixelFormatInfo: Add v4l2 lookup function","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"1db2cde0d15a14c499af4a2af625b60641cb1307","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/8720/mbox/","series":[{"id":1093,"url":"https://patchwork.libcamera.org/api/1.1/series/1093/?format=json","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/8720/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8720/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 621A8BD792\n\tfor ;\n\tThu, 9 Jul 2020 13:29:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2EDB761214;\n\tThu, 9 Jul 2020 15:29:03 +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 41F4A61184\n\tfor ;\n\tThu, 9 Jul 2020 15:29:01 +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 60637525;\n\tThu, 9 Jul 2020 15:28:59 +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=\"APnaTAPl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594301341;\n\tbh=yZ6rmuidz6coF/A8M2ObiHffxyzDcmI8NW9wNDESm8c=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=APnaTAPlc/90oprJWt9y6PV7alz5+WJv/NfHDPOBIuEZJ0BrA4eSI/ceU9omn+lWU\n\tCijkuKr00ZHVU6Bcq1M28AdG0OgvNtpk7os0Y4nM/FaSj93G6AuEvJeyaYw3UngOMn\n\tcr1Gc+/RCGYnQA2jhJecwE4NUWli3HrCaGI5WtR4=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 9 Jul 2020 22:28:17 +0900","Message-Id":"<20200709132835.112593-6-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 05/23] 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":"","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":"Add a lookup function for PixelFormatInfo that takes a V4L2PixelFormat.\n\nSigned-off-by: Paul Elder \nReviewed-by: Laurent Pinchart \n\n---\nNo change in v5\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 4e90e5a..211da4a 100644\n--- a/include/libcamera/internal/formats.h\n+++ b/include/libcamera/internal/formats.h\n@@ -51,6 +51,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 \n #include \n \n #include \n@@ -229,6 +230,8 @@ const std::map> &ImageFormats::data() const\n \n namespace {\n \n+const PixelFormatInfo pixelFormatInfoInvalid{};\n+\n const std::map pixelFormatInfo{\n \t/* RGB formats. */\n \t{ formats::BGR888, {\n@@ -700,17 +703,33 @@ const std::map 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","v5","05/23"]}