[{"id":11077,"web_url":"https://patchwork.libcamera.org/comment/11077/","msgid":"<20200702140450.GI12562@pendragon.ideasonboard.com>","date":"2020-07-02T14:04:50","subject":"Re: [libcamera-devel] [RFC 1/2] libcamera: v4l2_subdevice: Replace\n\tImageFormats with a map","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Wed, Jul 01, 2020 at 11:16:49PM +0200, Niklas Söderlund wrote:\n> Replace the V4L2Subdevice usage of the ImageForamts class with a\n\ns/ImageForamts/ImageFormats/\n\n> std::map and the utils::map_keys() helper.\n> \n> Signed-off-by: Niklas Söderlund \n> ---\n> include/libcamera/internal/camera_sensor.h | 6 ++----\n> include/libcamera/internal/v4l2_subdevice.h | 4 +++-\n> src/libcamera/camera_sensor.cpp | 12 ++++++------\n> src/libcamera/v4l2_subdevice.cpp | 16 ++++++++--------\n> test/v4l2_subdevice/list_formats.cpp | 16 ++++++++--------\n> 5 files changed, 27 insertions(+), 27 deletions(-)\n> \n> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n> index 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_;\n> diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\n> index 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);\n> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n> index b14b4051dca606b9..3c9b05feef4e0861 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,10 @@ 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\tif (formats_.find(code) == formats_.end())\n> +\t\t\tcontinue;\n> \n> -\t\tfor (const SizeRange &range : ranges) {\n> +\t\tfor (const SizeRange &range : formats_.at(code)) {\n\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 : formats->second) {\n\nto avoid a double lookup. Feel free to rename formats to ranges or to\niter (or to something else) if you think it would be more readable.\n\n> \t\t\tconst Size &sz = range.max;\n> \n> \t\t\tif (sz.width < size.width || sz.height < size.height)\n> diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\n> index 32c6c7acc11a6a3f..6dbe6d7590e4ae16 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,12 +359,7 @@ 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\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;\n> -\t\t\treturn {};\n> -\t\t}\n> +\t\tformats[code] = sizes;\n\nDo we want to keep the error check ? If so, it could be done with\ninsert(), which returns a std::pair where the bool tells\nwhether the insertion takes place or an element was already present.\nWith C++17 that could be written\n\n\t\tconst auto [iter, success] = formats.insert(sizes);\n\t\tif (!success) {\n\t\t\t...\n\t\t}\n\nbut with C++14 we would need\n\n\t\tconst auto inserted = formats.insert(sizes);\n\t\tif (!inserted.second) {\n\t\t\t...\n\t\t}\n\nwhich is less nice. Maybe it's not worth it.\n\nReviewed-by: Laurent Pinchart \n\n> \t}\n> \n> \treturn formats;\n> diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp\n> index 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;","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 98B70BFFE2\n\tfor ;\n\tThu, 2 Jul 2020 14:04:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 66CCF60C5C;\n\tThu, 2 Jul 2020 16:04:57 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 973CD603B4\n\tfor ;\n\tThu, 2 Jul 2020 16:04:55 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B9EEB293;\n\tThu, 2 Jul 2020 16:04:54 +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=\"Hxhx0xH0\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593698695;\n\tbh=WQwr0bSS6iSBsw6szaWimoOPD8EH08h5Hf04hYqFR9I=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Hxhx0xH0o0oiBCy1kYaPe24YfMv+OTh37jLSQJCZo1XK7qVQoMBGRbywxHnmFTXLS\n\t1OEl1Ib9sbCXmq8wMMbgXtZAuxhzYVYCsu7alWOZYoY15Uokj7zI6EnwKxlNX6JfD5\n\tesMy2INp9b6otWyc2nwR5DMLXrl8jY/S2Z/7Pv0U=","Date":"Thu, 2 Jul 2020 17:04:50 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Message-ID":"<20200702140450.GI12562@pendragon.ideasonboard.com>","References":"<20200701211650.1002567-1-niklas.soderlund@ragnatech.se>\n\t<20200701211650.1002567-2-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200701211650.1002567-2-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [RFC 1/2] 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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":11079,"web_url":"https://patchwork.libcamera.org/comment/11079/","msgid":"<99eebe7a-fff5-2a7d-a529-8b144c6e0348@ideasonboard.com>","date":"2020-07-02T14:13:12","subject":"Re: [libcamera-devel] [RFC 1/2] libcamera: v4l2_subdevice: Replace\n\tImageFormats with a map","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 02/07/2020 15:04, Laurent Pinchart wrote:\n> Hi Niklas,\n> \n> Thank you for the patch.\n> \n> On Wed, Jul 01, 2020 at 11:16:49PM +0200, Niklas Söderlund wrote:\n>> Replace the V4L2Subdevice usage of the ImageForamts class with a\n> \n> s/ImageForamts/ImageFormats/\n> \n>> std::map and the utils::map_keys() helper.\n>>\n>> Signed-off-by: Niklas Söderlund \n>> ---\n>> include/libcamera/internal/camera_sensor.h | 6 ++----\n>> include/libcamera/internal/v4l2_subdevice.h | 4 +++-\n>> src/libcamera/camera_sensor.cpp | 12 ++++++------\n>> src/libcamera/v4l2_subdevice.cpp | 16 ++++++++--------\n>> test/v4l2_subdevice/list_formats.cpp | 16 ++++++++--------\n>> 5 files changed, 27 insertions(+), 27 deletions(-)\n>>\n>> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n>> index 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_;\n>> diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\n>> index 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);\n>> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n>> index b14b4051dca606b9..3c9b05feef4e0861 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,10 @@ 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\tif (formats_.find(code) == formats_.end())\n>> +\t\t\tcontinue;\n>> \n>> -\t\tfor (const SizeRange &range : ranges) {\n>> +\t\tfor (const SizeRange &range : formats_.at(code)) {\n> \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 : formats->second) {\n> \n> to avoid a double lookup. Feel free to rename formats to ranges or to\n> iter (or to something else) if you think it would be more readable.\n> \n>> \t\t\tconst Size &sz = range.max;\n>> \n>> \t\t\tif (sz.width < size.width || sz.height < size.height)\n>> diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\n>> index 32c6c7acc11a6a3f..6dbe6d7590e4ae16 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,12 +359,7 @@ 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\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;\n>> -\t\t\treturn {};\n>> -\t\t}\n>> +\t\tformats[code] = sizes;\n> \n> Do we want to keep the error check ? If so, it could be done with\n> insert(), which returns a std::pair where the bool tells\n> whether the insertion takes place or an element was already present.\n> With C++17 that could be written\n> \n> \t\tconst auto [iter, success] = formats.insert(sizes);\n> \t\tif (!success) {\n> \t\t\t...\n> \t\t}\n> \n> but with C++14 we would need\n> \n> \t\tconst auto inserted = formats.insert(sizes);\n> \t\tif (!inserted.second) {\n> \t\t\t...\n> \t\t}\n> \n> which is less nice. Maybe it's not worth it.\n> \n> Reviewed-by: Laurent Pinchart \n> \n\nWith [0], GCC 11 will move to C++17 by default, and that .first .second\nusage from std::pair makes me cringe horribly every time I see it.\n\nWhat points hold us back from moving to C++17 ? and do you foresee a\nparticular point that we could upgrade? or are we going to remain at\nC++14 for the foreseeable future ?\n\n\n[0]\nhttps://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=0801f419440c14f6772b28f763ad7d40f7f7a580\n(c++: Change the default dialect to C++17.)\n\n--\nKieran\n\n\n>> \t}\n>> \n>> \treturn formats;\n>> diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp\n>> index 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>","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 56E10BE905\n\tfor ;\n\tThu, 2 Jul 2020 14:13:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C6E5160C57;\n\tThu, 2 Jul 2020 16:13:17 +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 9D616603B4\n\tfor ;\n\tThu, 2 Jul 2020 16:13:16 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8DAE6293;\n\tThu, 2 Jul 2020 16:13:15 +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=\"D8M1b4kW\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593699195;\n\tbh=krCpcz+jlFeXUzmnsWrSLc00/W5KAqbqPmJ4S2yihR8=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=D8M1b4kWvqPQzx8RNmPlj15Klcb5GWk2ayp4xC+V+YUB/SGHUXqlm2kQmF0iqbxMW\n\tfhu9aQcsRyIJdS7gYqDzlLxlaaX9lTHLFGI3cwkQ3dZBeksWjQxnmNGMoPJCmHCJ2c\n\tKM0SuXzm72KGp5k15nRp/qpkDJ2h+uUKKFj5s0AQ=","To":"Laurent Pinchart , =?utf-8?q?Niklas?=\n\t=?utf-8?q?_S=C3=B6derlund?= ","References":"<20200701211650.1002567-1-niklas.soderlund@ragnatech.se>\n\t<20200701211650.1002567-2-niklas.soderlund@ragnatech.se>\n\t<20200702140450.GI12562@pendragon.ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\tmQINBFYE/WYBEACs1PwjMD9rgCu1hlIiUA1AXR4rv2v+BCLUq//vrX5S5bjzxKAryRf0uHat\n\tV/zwz6hiDrZuHUACDB7X8OaQcwhLaVlq6byfoBr25+hbZG7G3+5EUl9cQ7dQEdvNj6V6y/SC\n\trRanWfelwQThCHckbobWiQJfK9n7rYNcPMq9B8e9F020LFH7Kj6YmO95ewJGgLm+idg1Kb3C\n\tpotzWkXc1xmPzcQ1fvQMOfMwdS+4SNw4rY9f07Xb2K99rjMwZVDgESKIzhsDB5GY465sCsiQ\n\tcSAZRxqE49RTBq2+EQsbrQpIc8XiffAB8qexh5/QPzCmR4kJgCGeHIXBtgRj+nIkCJPZvZtf\n\tKr2EAbc6tgg6DkAEHJb+1okosV09+0+TXywYvtEop/WUOWQ+zo+Y/OBd+8Ptgt1pDRyOBzL8\n\tRXa8ZqRf0Mwg75D+dKntZeJHzPRJyrlfQokngAAs4PaFt6UfS+ypMAF37T6CeDArQC41V3ko\n\tlPn1yMsVD0p+6i3DPvA/GPIksDC4owjnzVX9kM8Zc5Cx+XoAN0w5Eqo4t6qEVbuettxx55gq\n\t8K8FieAjgjMSxngo/HST8TpFeqI5nVeq0/lqtBRQKumuIqDg+Bkr4L1V/PSB6XgQcOdhtd36\n\tOe9X9dXB8YSNt7VjOcO7BTmFn/Z8r92mSAfHXpb07YJWJosQOQARAQABtDBLaWVyYW4gQmlu\n\tZ2hhbSA8a2llcmFuLmJpbmdoYW1AaWRlYXNvbmJvYXJkLmNvbT6JAlcEEwEKAEECGwMFCwkI\n\tBwIGFQgJCgsCBBYCAwECHgECF4ACGQEWIQSQLdeYP70o/eNy1HqhHkZyEKRh/QUCXWTtygUJ\n\tCyJXZAAKCRChHkZyEKRh/f8dEACTDsbLN2nioNZMwyLuQRUAFcXNolDX48xcUXsWS2QjxaPm\n\tVsJx8Uy8aYkS85mdPBh0C83OovQR/OVbr8AxhGvYqBs3nQvbWuTl/+4od7DfK2VZOoKBAu5S\n\tQK2FYuUcikDqYcFWJ8DQnubxfE8dvzojHEkXw0sA4igINHDDFX3HJGZtLio+WpEFQtCbfTAG\n\tYZslasz1YZRbwEdSsmO3/kqy5eMnczlm8a21A3fKUo3g8oAZEFM+f4DUNzqIltg31OAB/kZS\n\tenKZQ/SWC8PmLg/ZXBrReYakxXtkP6w3FwMlzOlhGxqhIRNiAJfXJBaRhuUWzPOpEDE9q5YJ\n\tBmqQL2WJm1VSNNVxbXJHpaWMH1sA2R00vmvRrPXGwyIO0IPYeUYQa3gsy6k+En/aMQJd27dp\n\taScf9am9PFICPY5T4ppneeJLif2lyLojo0mcHOV+uyrds9XkLpp14GfTkeKPdPMrLLTsHRfH\n\tfA4I4OBpRrEPiGIZB/0im98MkGY/Mu6qxeZmYLCcgD6qz4idOvfgVOrNh+aA8HzIVR+RMW8H\n\tQGBN9f0E3kfwxuhl3omo6V7lDw8XOdmuWZNC9zPq1UfryVHANYbLGz9KJ4Aw6M+OgBC2JpkD\n\thXMdHUkC+d20dwXrwHTlrJi1YNp6rBc+xald3wsUPOZ5z8moTHUX/uPA/qhGsbkCDQRWBP1m\n\tARAAzijkb+Sau4hAncr1JjOY+KyFEdUNxRy+hqTJdJfaYihxyaj0Ee0P0zEi35CbE6lgU0Uz\n\ttih9fiUbSV3wfsWqg1Ut3/5rTKu7kLFp15kF7eqvV4uezXRD3Qu4yjv/rMmEJbbD4cTvGCYI\n\td6MDC417f7vK3hCbCVIZSp3GXxyC1LU+UQr3fFcOyCwmP9vDUR9JV0BSqHHxRDdpUXE26Dk6\n\tmhf0V1YkspE5St814ETXpEus2urZE5yJIUROlWPIL+hm3NEWfAP06vsQUyLvr/GtbOT79vXl\n\tEn1aulcYyu20dRRxhkQ6iILaURcxIAVJJKPi8dsoMnS8pB0QW12AHWuirPF0g6DiuUfPmrA5\n\tPKe56IGlpkjc8cO51lIxHkWTpCMWigRdPDexKX+Sb+W9QWK/0JjIc4t3KBaiG8O4yRX8ml2R\n\t+rxfAVKM6V769P/hWoRGdgUMgYHFpHGSgEt80OKK5HeUPy2cngDUXzwrqiM5Sz6Od0qw5pCk\n\tNlXqI0W/who0iSVM+8+RmyY0OEkxEcci7rRLsGnM15B5PjLJjh1f2ULYkv8s4SnDwMZ/kE04\n\t/UqCMK/KnX8pwXEMCjz0h6qWNpGwJ0/tYIgQJZh6bqkvBrDogAvuhf60Sogw+mH8b+PBlx1L\n\toeTK396wc+4c3BfiC6pNtUS5GpsPMMjYMk7kVvEAEQEAAYkCPAQYAQoAJgIbDBYhBJAt15g/\n\tvSj943LUeqEeRnIQpGH9BQJdizzIBQkLSKZiAAoJEKEeRnIQpGH9eYgQAJpjaWNgqNOnMTmD\n\tMJggbwjIotypzIXfhHNCeTkG7+qCDlSaBPclcPGYrTwCt0YWPU2TgGgJrVhYT20ierN8LUvj\n\t6qOPTd+Uk7NFzL65qkh80ZKNBFddx1AabQpSVQKbdcLb8OFs85kuSvFdgqZwgxA1vl4TFhNz\n\tPZ79NAmXLackAx3sOVFhk4WQaKRshCB7cSl+RIng5S/ThOBlwNlcKG7j7W2MC06BlTbdEkUp\n\tECzuuRBv8wX4OQl+hbWbB/VKIx5HKlLu1eypen/5lNVzSqMMIYkkZcjV2SWQyUGxSwq0O/sx\n\tS0A8/atCHUXOboUsn54qdxrVDaK+6jIAuo8JiRWctP16KjzUM7MO0/+4zllM8EY57rXrj48j\n\tsbEYX0YQnzaj+jO6kJtoZsIaYR7rMMq9aUAjyiaEZpmP1qF/2sYenDx0Fg2BSlLvLvXM0vU8\n\tpQk3kgDu7kb/7PRYrZvBsr21EIQoIjXbZxDz/o7z95frkP71EaICttZ6k9q5oxxA5WC6sTXc\n\tMW8zs8avFNuA9VpXt0YupJd2ijtZy2mpZNG02fFVXhIn4G807G7+9mhuC4XG5rKlBBUXTvPU\n\tAfYnB4JBDLmLzBFavQfvonSfbitgXwCG3vS+9HEwAjU30Bar1PEOmIbiAoMzuKeRm2LVpmq4\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<99eebe7a-fff5-2a7d-a529-8b144c6e0348@ideasonboard.com>","Date":"Thu, 2 Jul 2020 15:13:12 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.8.0","MIME-Version":"1.0","In-Reply-To":"<20200702140450.GI12562@pendragon.ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [RFC 1/2] 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","Reply-To":"kieran.bingham@ideasonboard.com","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":11081,"web_url":"https://patchwork.libcamera.org/comment/11081/","msgid":"<20200702143320.GL12562@pendragon.ideasonboard.com>","date":"2020-07-02T14:33:20","subject":"Re: [libcamera-devel] [RFC 1/2] libcamera: v4l2_subdevice: Replace\n\tImageFormats with a map","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Thu, Jul 02, 2020 at 03:13:12PM +0100, Kieran Bingham wrote:\n> On 02/07/2020 15:04, Laurent Pinchart wrote:\n> > On Wed, Jul 01, 2020 at 11:16:49PM +0200, Niklas Söderlund wrote:\n> >> Replace the V4L2Subdevice usage of the ImageForamts class with a\n> > \n> > s/ImageForamts/ImageFormats/\n> > \n> >> std::map and the utils::map_keys() helper.\n> >>\n> >> Signed-off-by: Niklas Söderlund \n> >> ---\n> >> include/libcamera/internal/camera_sensor.h | 6 ++----\n> >> include/libcamera/internal/v4l2_subdevice.h | 4 +++-\n> >> src/libcamera/camera_sensor.cpp | 12 ++++++------\n> >> src/libcamera/v4l2_subdevice.cpp | 16 ++++++++--------\n> >> test/v4l2_subdevice/list_formats.cpp | 16 ++++++++--------\n> >> 5 files changed, 27 insertions(+), 27 deletions(-)\n> >>\n> >> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n> >> index 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_;\n> >> diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\n> >> index 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);\n> >> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n> >> index b14b4051dca606b9..3c9b05feef4e0861 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,10 @@ 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\tif (formats_.find(code) == formats_.end())\n> >> +\t\t\tcontinue;\n> >> \n> >> -\t\tfor (const SizeRange &range : ranges) {\n> >> +\t\tfor (const SizeRange &range : formats_.at(code)) {\n> > \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 : formats->second) {\n> > \n> > to avoid a double lookup. Feel free to rename formats to ranges or to\n> > iter (or to something else) if you think it would be more readable.\n> > \n> >> \t\t\tconst Size &sz = range.max;\n> >> \n> >> \t\t\tif (sz.width < size.width || sz.height < size.height)\n> >> diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\n> >> index 32c6c7acc11a6a3f..6dbe6d7590e4ae16 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,12 +359,7 @@ 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\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;\n> >> -\t\t\treturn {};\n> >> -\t\t}\n> >> +\t\tformats[code] = sizes;\n> > \n> > Do we want to keep the error check ? If so, it could be done with\n> > insert(), which returns a std::pair where the bool tells\n> > whether the insertion takes place or an element was already present.\n> > With C++17 that could be written\n> > \n> > \t\tconst auto [iter, success] = formats.insert(sizes);\n> > \t\tif (!success) {\n> > \t\t\t...\n> > \t\t}\n> > \n> > but with C++14 we would need\n> > \n> > \t\tconst auto inserted = formats.insert(sizes);\n> > \t\tif (!inserted.second) {\n> > \t\t\t...\n> > \t\t}\n> > \n> > which is less nice. Maybe it's not worth it.\n> > \n> > Reviewed-by: Laurent Pinchart \n> > \n> \n> With [0], GCC 11 will move to C++17 by default, and that .first .second\n> usage from std::pair makes me cringe horribly every time I see it.\n> \n> What points hold us back from moving to C++17 ?\n\nMostly gcc-5 and gcc-6 support (not sure about clang). I haven't\ninvestigated what dropping gcc-5 and gcc-6 support would mean, whether\nnobody will notice or if there are distributions (including more exotic\nones for the embedded space) still using them actively.\n\n> and do you foresee a\n> particular point that we could upgrade? or are we going to remain at\n> C++14 for the foreseeable future ?\n\nI think it's a matter of balance between the need to support older\ncompilers, and the benefit we would get from C++17. I don't think we\nneed to remain at C++14 for the foreseeable future, but I think we first\nneed to check what dropping gcc-5 and gcc-6 would mean.\n\n> [0]\n> https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=0801f419440c14f6772b28f763ad7d40f7f7a580\n> (c++: Change the default dialect to C++17.)\n> \n> >> \t}\n> >> \n> >> \treturn formats;\n> >> diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp\n> >> index 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;","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 599BFBE905\n\tfor ;\n\tThu, 2 Jul 2020 14:33:26 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EA9FF60C56;\n\tThu, 2 Jul 2020 16:33:25 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6C3B6603B3\n\tfor ;\n\tThu, 2 Jul 2020 16:33:24 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D9978293;\n\tThu, 2 Jul 2020 16:33:23 +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=\"e2lsG58y\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593700404;\n\tbh=kXlnhZVerO0qrCrhCpGey4g/evM13YZdAb9Ed6F+e34=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=e2lsG58yVPXMV0e0ORAuk4ICKzgYwWehocx9b+jBVrJgf4SjSV5y/GZg803Ol3XRM\n\tmMvVVmeaXS/byJcVnm4Gu3FQleIRBiOJ6Fs0qhS40Q+Jan5yO6XSgww4P1JF5ryxNc\n\t+YhrYkeIPS04a/Pay6eogCHB7zHwp8NaceBy22S8=","Date":"Thu, 2 Jul 2020 17:33:20 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Message-ID":"<20200702143320.GL12562@pendragon.ideasonboard.com>","References":"<20200701211650.1002567-1-niklas.soderlund@ragnatech.se>\n\t<20200701211650.1002567-2-niklas.soderlund@ragnatech.se>\n\t<20200702140450.GI12562@pendragon.ideasonboard.com>\n\t<99eebe7a-fff5-2a7d-a529-8b144c6e0348@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<99eebe7a-fff5-2a7d-a529-8b144c6e0348@ideasonboard.com>","Subject":"Re: [libcamera-devel] [RFC 1/2] 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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]