{"id":8905,"url":"https://patchwork.libcamera.org/api/patches/8905/?format=json","web_url":"https://patchwork.libcamera.org/patch/8905/","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":"<20200721135541.2931205-2-niklas.soderlund@ragnatech.se>","date":"2020-07-21T13:55:39","name":"[libcamera-devel,v2,1/3] libcamera: v4l2_subdevice: Replace ImageFormats with a map","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4347f7098e0e40060047ca1c215d21f7431f3b2c","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/8905/mbox/","series":[{"id":1123,"url":"https://patchwork.libcamera.org/api/series/1123/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1123","date":"2020-07-21T13:55:38","name":"libcamera: formats: Remove ImageFormat","version":2,"mbox":"https://patchwork.libcamera.org/series/1123/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8905/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8905/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 1BDBDBDB1B\n\tfor ;\n\tTue, 21 Jul 2020 13:55:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5341F60926;\n\tTue, 21 Jul 2020 15:55:56 +0200 (CEST)","from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6AB7560554\n\tfor ;\n\tTue, 21 Jul 2020 15:55:55 +0200 (CEST)","from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid bddf759a-cb59-11ea-86ee-0050569116f7;\n\tTue, 21 Jul 2020 15:54:48 +0200 (CEST)"],"X-Halon-ID":"bddf759a-cb59-11ea-86ee-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 21 Jul 2020 15:55:39 +0200","Message-Id":"<20200721135541.2931205-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200721135541.2931205-1-niklas.soderlund@ragnatech.se>","References":"<20200721135541.2931205-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 1/3] libcamera: v4l2_subdevice: Replace\n\tImageFormats with a map","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=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Replace the V4L2Subdevice usage of the ImageFormats class with a\nstd::map and the utils::map_keys() helper.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \n---\n* Changes since RFC\n- Fix spelling in commit message.\n- Prevent double lookup in CameraSensor::getFormat().\n- Preserve error message in V4L2Subdevice::formats().\n---\n include/libcamera/internal/camera_sensor.h | 6 ++----\n include/libcamera/internal/v4l2_subdevice.h | 4 +++-\n src/libcamera/camera_sensor.cpp | 13 +++++++------\n src/libcamera/v4l2_subdevice.cpp | 12 +++++++++---\n test/v4l2_subdevice/list_formats.cpp | 16 ++++++++--------\n 5 files changed, 29 insertions(+), 22 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex 7f07413f95602881..06c8292ca30129de 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -16,13 +16,11 @@\n \n #include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/log.h\"\n+#include \"libcamera/internal/v4l2_subdevice.h\"\n \n namespace libcamera {\n \n class MediaEntity;\n-class V4L2Subdevice;\n-\n-struct V4L2SubdeviceFormat;\n \n struct CameraSensorInfo {\n \tstd::string model;\n@@ -75,7 +73,7 @@ private:\n \n \tstd::string model_;\n \n-\tImageFormats formats_;\n+\tV4L2Subdevice::Formats formats_;\n \tSize resolution_;\n \tstd::vector mbusCodes_;\n \tstd::vector sizes_;\ndiff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\nindex a3ecf123f640dd54..02ee3e914a8b1d92 100644\n--- a/include/libcamera/internal/v4l2_subdevice.h\n+++ b/include/libcamera/internal/v4l2_subdevice.h\n@@ -32,6 +32,8 @@ struct V4L2SubdeviceFormat {\n class V4L2Subdevice : public V4L2Device\n {\n public:\n+\tusing Formats = std::map>;\n+\n \tenum Whence {\n \t\tActiveFormat,\n \t\tTryFormat,\n@@ -51,7 +53,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+\tFormats formats(unsigned int pad);\n \n \tint getFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n \t\t Whence whence = ActiveFormat);\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 6e93cc51155ba678..350f49accad99c7b 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -18,7 +18,6 @@\n \n #include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/utils.h\"\n-#include \"libcamera/internal/v4l2_subdevice.h\"\n \n /**\n * \\file camera_sensor.h\n@@ -245,15 +244,15 @@ int CameraSensor::init()\n \n \t/* Enumerate, sort and cache media bus codes and sizes. */\n \tformats_ = subdev_->formats(pad_);\n-\tif (formats_.isEmpty()) {\n+\tif (formats_.empty()) {\n \t\tLOG(CameraSensor, Error) << \"No image format found\";\n \t\treturn -EINVAL;\n \t}\n \n-\tmbusCodes_ = formats_.formats();\n+\tmbusCodes_ = utils::map_keys(formats_);\n \tstd::sort(mbusCodes_.begin(), mbusCodes_.end());\n \n-\tfor (const auto &format : formats_.data()) {\n+\tfor (const auto &format : formats_) {\n \t\tconst std::vector &ranges = format.second;\n \t\tstd::transform(ranges.begin(), ranges.end(), std::back_inserter(sizes_),\n \t\t\t [](const SizeRange &range) { return range.max; });\n@@ -359,9 +358,11 @@ V4L2SubdeviceFormat CameraSensor::getFormat(const std::vector &mbu\n \tuint32_t bestCode = 0;\n \n \tfor (unsigned int code : mbusCodes) {\n-\t\tconst std::vector &ranges = formats_.sizes(code);\n+\t\tconst auto formats = formats_.find(code);\n+\t\tif (formats == formats_.end())\n+\t\t\tcontinue;\n \n-\t\tfor (const SizeRange &range : ranges) {\n+\t\tfor (const SizeRange &range : formats->second) {\n \t\t\tconst Size &sz = range.max;\n \n \t\t\tif (sz.width < size.width || sz.height < size.height)\ndiff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\nindex 32c6c7acc11a6a3f..85d00c246f5e5ee9 100644\n--- a/src/libcamera/v4l2_subdevice.cpp\n+++ b/src/libcamera/v4l2_subdevice.cpp\n@@ -217,6 +217,11 @@ uint8_t V4L2SubdeviceFormat::bitsPerPixel() const\n * any device left open will be closed, and any resources released.\n */\n \n+/**\n+ * \\typedef V4L2Subdevice::Formats\n+ * \\brief A map of supported media bus formats to frame sizes\n+ */\n+\n /**\n * \\enum V4L2Subdevice::Whence\n * \\brief Specify the type of format for getFormat() and setFormat() operations\n@@ -340,9 +345,9 @@ 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+V4L2Subdevice::Formats V4L2Subdevice::formats(unsigned int pad)\n {\n-\tImageFormats formats;\n+\tFormats formats;\n \n \tif (pad >= entity_->pads().size()) {\n \t\tLOG(V4L2, Error) << \"Invalid pad: \" << pad;\n@@ -354,7 +359,8 @@ ImageFormats V4L2Subdevice::formats(unsigned int pad)\n \t\tif (sizes.empty())\n \t\t\treturn {};\n \n-\t\tif (formats.addFormat(code, sizes)) {\n+\t\tconst auto inserted = formats.insert({ code, sizes });\n+\t\tif (!inserted.second) {\n \t\t\tLOG(V4L2, Error)\n \t\t\t\t<< \"Could not add sizes for media bus code \"\n \t\t\t\t<< code << \" on pad \" << pad;\ndiff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp\nindex a55af1100d9ab498..a6044c044036acd4 100644\n--- a/test/v4l2_subdevice/list_formats.cpp\n+++ b/test/v4l2_subdevice/list_formats.cpp\n@@ -47,29 +47,29 @@ 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+\tV4L2Subdevice::Formats formats;\n \n \tformats = scaler_->formats(0);\n-\tif (formats.isEmpty()) {\n+\tif (formats.empty()) {\n \t\tcerr << \"Failed to list formats on pad 0 of subdevice \"\n \t\t << scaler_->entity()->name() << endl;\n \t\treturn TestFail;\n \t}\n-\tfor (unsigned int code : formats.formats())\n-\t\tprintFormats(0, code, formats.sizes(code));\n+\tfor (unsigned int code : utils::map_keys(formats))\n+\t\tprintFormats(0, code, formats[code]);\n \n \tformats = scaler_->formats(1);\n-\tif (formats.isEmpty()) {\n+\tif (formats.empty()) {\n \t\tcerr << \"Failed to list formats on pad 1 of subdevice \"\n \t\t << scaler_->entity()->name() << endl;\n \t\treturn TestFail;\n \t}\n-\tfor (unsigned int code : formats.formats())\n-\t\tprintFormats(1, code, formats.sizes(code));\n+\tfor (unsigned int code : utils::map_keys(formats))\n+\t\tprintFormats(1, code, formats[code]);\n \n \t/* List format on a non-existing pad, format vector shall be empty. */\n \tformats = scaler_->formats(2);\n-\tif (!formats.isEmpty()) {\n+\tif (!formats.empty()) {\n \t\tcerr << \"Listing formats on non-existing pad 2 of subdevice \"\n \t\t << scaler_->entity()->name()\n \t\t << \" should return an empty format list\" << endl;\n","prefixes":["libcamera-devel","v2","1/3"]}