{"id":8495,"url":"https://patchwork.libcamera.org/api/1.1/patches/8495/?format=json","web_url":"https://patchwork.libcamera.org/patch/8495/","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":"<20200629115328.16273-1-jacopo@jmondi.org>","date":"2020-06-29T11:53:25","name":"[libcamera-devel,v3,1/4] libcamera: formats: Make ImageFormats a templated class","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c7635db5c87c26b251d26541506b690e9ee33f09","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/1.1/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/8495/mbox/","series":[{"id":1055,"url":"https://patchwork.libcamera.org/api/1.1/series/1055/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1055","date":"2020-06-29T10:50:33","name":"ImageFormat rework","version":3,"mbox":"https://patchwork.libcamera.org/series/1055/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8495/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8495/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 1CBB2BF415\n\tfor ;\n\tMon, 29 Jun 2020 11:50:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B9DC0609DB;\n\tMon, 29 Jun 2020 13:50:11 +0200 (CEST)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 684A7609C2\n\tfor ;\n\tMon, 29 Jun 2020 13:50:11 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id C6470100002;\n\tMon, 29 Jun 2020 11:50:09 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 29 Jun 2020 13:53:25 +0200","Message-Id":"<20200629115328.16273-1-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200629105037.14706-1-jacopo@jmondi.org>","References":"<20200629105037.14706-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 1/4] libcamera: formats: Make\n\tImageFormats a templated class","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":"The ImageFormats class was originally designed to be used by both\nV4L2VideoDevices and V4L2Subdevices. As video devices enumerates their\nimage formats using V4L2PixelFormat instances, the ImageFormats class\ncannot be used there anymore and it has been replaced by raw maps.\n\nPrepare to re-introduce usage of ImageFormats in the V4L2VideoDevice\nclass and its users by making ImageFormats a templated class that\nindexes the image sizes using on keys of variadic type.\n\nReviewed-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/internal/camera_sensor.h | 2 +-\n include/libcamera/internal/formats.h | 11 +++++----\n include/libcamera/internal/v4l2_subdevice.h | 2 +-\n src/libcamera/formats.cpp | 26 ++++++++++++++-------\n src/libcamera/v4l2_subdevice.cpp | 6 ++---\n test/v4l2_subdevice/list_formats.cpp | 2 +-\n 6 files changed, 29 insertions(+), 20 deletions(-)\n\n--\n2.27.0","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex 7f07413f9560..d5814a26a121 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -75,7 +75,7 @@ private:\n\n \tstd::string model_;\n\n-\tImageFormats formats_;\n+\tImageFormats formats_;\n \tSize resolution_;\n \tstd::vector mbusCodes_;\n \tstd::vector sizes_;\ndiff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h\nindex f59ac8fe36a1..aba83511179f 100644\n--- a/include/libcamera/internal/formats.h\n+++ b/include/libcamera/internal/formats.h\n@@ -18,18 +18,19 @@\n\n namespace libcamera {\n\n+template\n class ImageFormats\n {\n public:\n-\tint addFormat(unsigned int format, const std::vector &sizes);\n+\tint addFormat(T format, const std::vector &sizes);\n\n \tbool isEmpty() const;\n-\tstd::vector formats() const;\n-\tconst std::vector &sizes(unsigned int format) const;\n-\tconst std::map> &data() const;\n+\tstd::vector formats() const;\n+\tconst std::vector &sizes(T format) const;\n+\tconst std::map> &data() const;\n\n private:\n-\tstd::map> data_;\n+\tstd::map> data_;\n };\n\n class PixelFormatInfo\ndiff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\nindex a3ecf123f640..f811d316dada 100644\n--- a/include/libcamera/internal/v4l2_subdevice.h\n+++ b/include/libcamera/internal/v4l2_subdevice.h\n@@ -51,7 +51,7 @@ public:\n \tint setSelection(unsigned int pad, unsigned int target,\n \t\t\t Rectangle *rect);\n\n-\tImageFormats formats(unsigned int pad);\n+\tImageFormats formats(unsigned int pad);\n\n \tint getFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n \t\t Whence whence = ActiveFormat);\ndiff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\nindex 436672e8bf4f..a5607da3efd4 100644\n--- a/src/libcamera/formats.cpp\n+++ b/src/libcamera/formats.cpp\n@@ -12,6 +12,7 @@\n #include \n\n #include \"libcamera/internal/log.h\"\n+#include \"libcamera/internal/v4l2_pixelformat.h\"\n\n /**\n * \\file internal/formats.h\n@@ -30,9 +31,8 @@ LOG_DEFINE_CATEGORY(Formats)\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+ * When used for a V4L2Device, the image formats are V4L2PixelFormat instances.\n+ * When used for a V4L2Subdevice formats are uint32_t media bus codes.\n *\n * Sizes are stored as a list of SizeRange.\n */\n@@ -45,7 +45,8 @@ LOG_DEFINE_CATEGORY(Formats)\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 &sizes)\n+template\n+int ImageFormats::addFormat(T format, const std::vector &sizes)\n {\n \tif (data_.find(format) != data_.end())\n \t\treturn -EEXIST;\n@@ -59,7 +60,8 @@ int ImageFormats::addFormat(unsigned int format, const std::vector &s\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+template\n+bool ImageFormats::isEmpty() const\n {\n \treturn data_.empty();\n }\n@@ -68,9 +70,10 @@ bool ImageFormats::isEmpty() const\n * \\brief Retrieve a list of all supported image formats\n * \\return List of pixel formats or media bus codes\n */\n-std::vector ImageFormats::formats() const\n+template\n+std::vector ImageFormats::formats() const\n {\n-\tstd::vector formats;\n+\tstd::vector formats;\n \tformats.reserve(data_.size());\n\n \t/* \\todo: Should this be cached instead of computed each time? */\n@@ -90,7 +93,8 @@ std::vector ImageFormats::formats() const\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 &ImageFormats::sizes(unsigned int format) const\n+template\n+const std::vector &ImageFormats::sizes(T format) const\n {\n \tstatic const std::vector empty;\n\n@@ -105,11 +109,15 @@ const std::vector &ImageFormats::sizes(unsigned int format) const\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> &ImageFormats::data() const\n+template\n+const std::map> &ImageFormats::data() const\n {\n \treturn data_;\n }\n\n+template class ImageFormats;\n+template class ImageFormats;\n+\n /**\n * \\class PixelFormatInfo\n * \\brief Information about pixel formats\ndiff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\nindex 32c6c7acc11a..231473ba3d06 100644\n--- a/src/libcamera/v4l2_subdevice.cpp\n+++ b/src/libcamera/v4l2_subdevice.cpp\n@@ -340,16 +340,16 @@ int V4L2Subdevice::setSelection(unsigned int pad, unsigned int target,\n *\n * \\return A list of the supported device formats\n */\n-ImageFormats V4L2Subdevice::formats(unsigned int pad)\n+ImageFormats V4L2Subdevice::formats(unsigned int pad)\n {\n-\tImageFormats formats;\n+\tImageFormats formats;\n\n \tif (pad >= entity_->pads().size()) {\n \t\tLOG(V4L2, Error) << \"Invalid pad: \" << pad;\n \t\treturn {};\n \t}\n\n-\tfor (unsigned int code : enumPadCodes(pad)) {\n+\tfor (uint32_t code : enumPadCodes(pad)) {\n \t\tstd::vector sizes = enumPadSizes(pad, code);\n \t\tif (sizes.empty())\n \t\t\treturn {};\ndiff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp\nindex a55af1100d9a..3e8d4cdba045 100644\n--- a/test/v4l2_subdevice/list_formats.cpp\n+++ b/test/v4l2_subdevice/list_formats.cpp\n@@ -47,7 +47,7 @@ void ListFormatsTest::printFormats(unsigned int pad,\n int ListFormatsTest::run()\n {\n \t/* List all formats available on existing \"Scaler\" pads. */\n-\tImageFormats formats;\n+\tImageFormats formats;\n\n \tformats = scaler_->formats(0);\n \tif (formats.isEmpty()) {\n","prefixes":["libcamera-devel","v3","1/4"]}