{"id":1455,"url":"https://patchwork.libcamera.org/api/patches/1455/?format=json","web_url":"https://patchwork.libcamera.org/patch/1455/","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":"<20190619025129.21164-6-niklas.soderlund@ragnatech.se>","date":"2019-06-19T02:51:18","name":"[libcamera-devel,v4,05/16] libcamera: formats: Add ImageFormats","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"f445a85fb210f9c594e7740e8aa53d94238fddd7","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1455/mbox/","series":[{"id":361,"url":"https://patchwork.libcamera.org/api/series/361/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=361","date":"2019-06-19T02:51:13","name":"libcamera: Add support for format information and validation","version":4,"mbox":"https://patchwork.libcamera.org/series/361/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1455/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1455/checks/","tags":{},"headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0546361A4B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 19 Jun 2019 04:52:25 +0200 (CEST)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 3c98ed5b-923d-11e9-8ab4-005056917a89;\n\tWed, 19 Jun 2019 04:52:12 +0200 (CEST)"],"X-Halon-ID":"3c98ed5b-923d-11e9-8ab4-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 19 Jun 2019 04:51:18 +0200","Message-Id":"<20190619025129.21164-6-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190619025129.21164-1-niklas.soderlund@ragnatech.se>","References":"<20190619025129.21164-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 05/16] libcamera: formats: Add\n\tImageFormats","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","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>","X-List-Received-Date":"Wed, 19 Jun 2019 02:52:26 -0000"},"content":"Add a new class to hold format information for V4L2 devices and\nsubdevices. The object describes the relationship between either pixel\nformats (V4L2 devices) or media bus codes (V4L2 subdevice) and a list of\nimage sizes which can be produced with that format.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/formats.cpp       | 88 +++++++++++++++++++++++++++++++++\n src/libcamera/include/formats.h | 14 ++++++\n 2 files changed, 102 insertions(+)","diff":"diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\nindex 56f4ddb51ffad4d3..312db6557c5beff9 100644\n--- a/src/libcamera/formats.cpp\n+++ b/src/libcamera/formats.cpp\n@@ -24,4 +24,92 @@ namespace libcamera {\n  * resolutions represented by SizeRange items.\n  */\n \n+/**\n+ * \\class ImageFormats\n+ * \\brief Describe V4L2Device and V4L2SubDevice image formats\n+ *\n+ * This class stores a list of image formats, each associated with a\n+ * corresponding set of image sizes. It is used to describe the formats and\n+ * sizes supported by a V4L2Device or V4L2Subdevice.\n+ *\n+ * Formats are stored as an integer. When used for a V4L2Device, the image\n+ * formats are fourcc pixel formats. When used for a V4L2Subdevice they are\n+ * media bus codes. Both are defined by the V4L2 specification.\n+ *\n+ * Sizes are stored as a list of SizeRange.\n+ */\n+\n+/**\n+ * \\brief Add a format and corresponding sizes to the description\n+ * \\param[in] format Pixel format or media bus code to describe\n+ * \\param[in] sizes List of supported size ranges for the format\n+ *\n+ * \\return 0 on success or a negative error code otherwise\n+ * \\retval -EEXIST The format is already described\n+ */\n+int ImageFormats::addFormat(unsigned int format, const std::vector<SizeRange> &sizes)\n+{\n+\tif (data_.find(format) != data_.end())\n+\t\treturn -EEXIST;\n+\n+\tdata_[format] = sizes;\n+\n+\treturn 0;\n+}\n+\n+/**\n+ * \\brief Check if the list of devices supported formats is empty\n+ * \\return True if the list of supported formats is empty\n+ */\n+bool ImageFormats::isEmpty() const\n+{\n+\treturn data_.empty();\n+}\n+\n+/**\n+ * \\brief Retrieve a list of all supported image formats\n+ * \\return List of pixel formats or media bus codes\n+ */\n+std::vector<unsigned int> ImageFormats::formats() const\n+{\n+\tstd::vector<unsigned int> formats;\n+\tformats.reserve(data_.size());\n+\n+\t/* \\todo: Should this be cached instead of computed each time? */\n+\tfor (auto const &it : data_)\n+\t\tformats.push_back(it.first);\n+\n+\treturn formats;\n+}\n+\n+/**\n+ * \\brief Retrieve all sizes for a specific format\n+ * \\param[in] format The pixel format or mbus code\n+ *\n+ * Retrieve all size ranges for a specific format. For V4L2Device \\a format is a\n+ * pixel format while for a V4L2Subdevice \\a format is a media bus code.\n+ *\n+ * \\return The list of image sizes supported for \\a format, or an empty list if\n+ * the format is not supported\n+ */\n+const std::vector<SizeRange> &ImageFormats::sizes(unsigned int format) const\n+{\n+\tstatic std::vector<SizeRange> empty;\n+\n+\tauto const &it = data_.find(format);\n+\tif (it == data_.end())\n+\t\treturn empty;\n+\n+\treturn it->second;\n+}\n+\n+/**\n+ * \\brief Retrieve the map that associates formats to image sizes\n+ * \\return The map that associates formats to image sizes\n+ */\n+const std::map<unsigned int, std::vector<SizeRange>> &ImageFormats::data() const\n+{\n+\treturn data_;\n+}\n+\n } /* namespace libcamera */\ndiff --git a/src/libcamera/include/formats.h b/src/libcamera/include/formats.h\nindex a73772b1eda068b4..6ec8312590b74f03 100644\n--- a/src/libcamera/include/formats.h\n+++ b/src/libcamera/include/formats.h\n@@ -17,6 +17,20 @@ namespace libcamera {\n \n typedef std::map<unsigned int, std::vector<SizeRange>> FormatEnum;\n \n+class ImageFormats\n+{\n+public:\n+\tint addFormat(unsigned int format, const std::vector<SizeRange> &sizes);\n+\n+\tbool isEmpty() const;\n+\tstd::vector<unsigned int> formats() const;\n+\tconst std::vector<SizeRange> &sizes(unsigned int format) const;\n+\tconst std::map<unsigned int, std::vector<SizeRange>> &data() const;\n+\n+private:\n+\tstd::map<unsigned int, std::vector<SizeRange>> data_;\n+};\n+\n } /* namespace libcamera */\n \n #endif /* __LIBCAMERA_FORMATS_H__ */\n","prefixes":["libcamera-devel","v4","05/16"]}