Patch Detail
Show a patch.
GET /api/patches/1302/?format=api
{ "id": 1302, "url": "https://patchwork.libcamera.org/api/patches/1302/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1302/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190527001543.13593-9-niklas.soderlund@ragnatech.se>", "date": "2019-05-27T00:15:34", "name": "[libcamera-devel,08/17] libcamera: v4l2_subdevice: Replace FormatEnum with V4L2SubdeviceFormats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "38fcdceadf6662a298f4bafdeda0d06791e7049e", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1302/mbox/", "series": [ { "id": 328, "url": "https://patchwork.libcamera.org/api/series/328/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=328", "date": "2019-05-27T00:15:28", "name": "libcamera: Add support for format information and validation", "version": 1, "mbox": "https://patchwork.libcamera.org/series/328/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1302/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1302/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9700E6191B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 27 May 2019 02:16:10 +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 9e8d1e9d-8014-11e9-8ab4-005056917a89;\n\tMon, 27 May 2019 02:16:06 +0200 (CEST)" ], "X-Halon-ID": "9e8d1e9d-8014-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": "Mon, 27 May 2019 02:15:34 +0200", "Message-Id": "<20190527001543.13593-9-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190527001543.13593-1-niklas.soderlund@ragnatech.se>", "References": "<20190527001543.13593-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 08/17] libcamera: v4l2_subdevice: Replace\n\tFormatEnum with V4L2SubdeviceFormats", "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": "Mon, 27 May 2019 00:16:13 -0000" }, "content": "Replace all usage of FormatEnum with V4L2SubdeviceFormats and completely\nremove FormatEnum which is no longer needed.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/libcamera/camera_sensor.cpp | 12 +++++-------\n src/libcamera/formats.cpp | 11 -----------\n src/libcamera/include/formats.h | 2 --\n src/libcamera/include/v4l2_subdevice.h | 2 +-\n src/libcamera/v4l2_subdevice.cpp | 6 +++---\n test/v4l2_subdevice/list_formats.cpp | 10 +++++-----\n 6 files changed, 14 insertions(+), 29 deletions(-)", "diff": "diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 2b9d8fa593c13177..e46bc28c7ac4a8e1 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -90,27 +90,25 @@ int CameraSensor::init()\n \t\treturn ret;\n \n \t/* Enumerate and cache media bus codes and sizes. */\n-\tconst FormatEnum formats = subdev_->formats(0);\n+\tconst V4L2SubdeviceFormats formats = subdev_->formats(0);\n \tif (formats.empty()) {\n \t\tLOG(CameraSensor, Error) << \"No image format found\";\n \t\treturn -EINVAL;\n \t}\n \n-\tstd::transform(formats.begin(), formats.end(),\n-\t\t std::back_inserter(mbusCodes_),\n-\t\t [](decltype(*formats.begin()) f) { return f.first; });\n+\tmbusCodes_ = formats.codes();\n \n \t/*\n \t * Extract the supported sizes from the first format as we only support\n \t * sensors that offer the same frame sizes for all media bus codes.\n \t * Verify this assumption and reject the sensor if it isn't true.\n \t */\n-\tconst std::vector<SizeRange> &sizes = formats.begin()->second;\n+\tconst std::vector<SizeRange> &sizes = formats.sizes(mbusCodes_[0]);\n \tstd::transform(sizes.begin(), sizes.end(), std::back_inserter(sizes_),\n \t\t [](const SizeRange &range) { return range.max; });\n \n-\tfor (auto it = ++formats.begin(); it != formats.end(); ++it) {\n-\t\tif (it->second != sizes) {\n+\tfor (unsigned int code : mbusCodes_) {\n+\t\tif (formats.sizes(code) != sizes) {\n \t\t\tLOG(CameraSensor, Error)\n \t\t\t\t<< \"Frame sizes differ between media bus codes\";\n \t\t\treturn -EINVAL;\ndiff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\nindex f5841b38cea5686c..7b2097413c3b7378 100644\n--- a/src/libcamera/formats.cpp\n+++ b/src/libcamera/formats.cpp\n@@ -14,17 +14,6 @@\n \n namespace libcamera {\n \n-/**\n- * \\typedef FormatEnum\n- * \\brief Type definition for the map of image formats and sizes\n- *\n- * Type definition used to enumerate the supported pixel formats and image\n- * frame sizes. The type associates in a map a pixel format (for memory\n- * formats) or a media bus code (for bus formats), to a vector of image\n- * resolutions represented by SizeRange items.\n- */\n-\n-\n /**\n * \\class DeviceFormats\n * \\brief Base class for V4L2Device and V4L2SubDevice Formats\ndiff --git a/src/libcamera/include/formats.h b/src/libcamera/include/formats.h\nindex 372f6e6d71b236dd..2e849e70c4a88aeb 100644\n--- a/src/libcamera/include/formats.h\n+++ b/src/libcamera/include/formats.h\n@@ -15,8 +15,6 @@\n \n namespace libcamera {\n \n-typedef std::map<unsigned int, std::vector<SizeRange>> FormatEnum;\n-\n class DeviceFormats\n {\n public:\ndiff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h\nindex c6fdf417b43c0423..a6d691ea540a4e5e 100644\n--- a/src/libcamera/include/v4l2_subdevice.h\n+++ b/src/libcamera/include/v4l2_subdevice.h\n@@ -45,7 +45,7 @@ public:\n \tint setCrop(unsigned int pad, Rectangle *rect);\n \tint setCompose(unsigned int pad, Rectangle *rect);\n \n-\tFormatEnum formats(unsigned int pad);\n+\tV4L2SubdeviceFormats formats(unsigned int pad);\n \n \tint getFormat(unsigned int pad, V4L2SubdeviceFormat *format);\n \tint setFormat(unsigned int pad, V4L2SubdeviceFormat *format);\ndiff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\nindex 8720013600ddb95f..fe393c66729e8511 100644\n--- a/src/libcamera/v4l2_subdevice.cpp\n+++ b/src/libcamera/v4l2_subdevice.cpp\n@@ -200,9 +200,9 @@ int V4L2Subdevice::setCompose(unsigned int pad, Rectangle *rect)\n * \\return A map of image formats associated with a list of image sizes, or\n * an empty map on error or if the pad does not exist\n */\n-FormatEnum V4L2Subdevice::formats(unsigned int pad)\n+V4L2SubdeviceFormats V4L2Subdevice::formats(unsigned int pad)\n {\n-\tFormatEnum formatMap = {};\n+\tstd::map<unsigned int, std::vector<SizeRange>> formatMap = {};\n \n \tif (pad >= entity_->pads().size()) {\n \t\tLOG(V4L2Subdev, Error) << \"Invalid pad: \" << pad;\n@@ -212,7 +212,7 @@ FormatEnum V4L2Subdevice::formats(unsigned int pad)\n \tfor (unsigned int code : enumPadCodes(pad))\n \t\tformatMap[code] = enumPadSizes(pad, code);\n \n-\treturn formatMap;\n+\treturn V4L2SubdeviceFormats(formatMap);\n }\n \n /**\ndiff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp\nindex 3f0edafcdcd72d6b..1c044a969961d172 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-\tstd::map<unsigned int, std::vector<SizeRange>> formats;\n+\tV4L2SubdeviceFormats formats;\n \n \tformats = scaler_->formats(0);\n \tif (formats.empty()) {\n@@ -55,8 +55,8 @@ int ListFormatsTest::run()\n \t\t << scaler_->entity()->name() << endl;\n \t\treturn TestFail;\n \t}\n-\tfor (auto it = formats.begin(); it != formats.end(); ++it)\n-\t\tprintFormats(0, it->first, it->second);\n+\tfor (unsigned int code : formats.codes())\n+\t\tprintFormats(0, code, formats.sizes(code));\n \n \tformats = scaler_->formats(1);\n \tif (formats.empty()) {\n@@ -64,8 +64,8 @@ int ListFormatsTest::run()\n \t\t << scaler_->entity()->name() << endl;\n \t\treturn TestFail;\n \t}\n-\tfor (auto it = formats.begin(); it != formats.end(); ++it)\n-\t\tprintFormats(1, it->first, it->second);\n+\tfor (unsigned int code : formats.codes())\n+\t\tprintFormats(1, code, formats.sizes(code));\n \n \t/* List format on a non-existing pad, format vector shall be empty. */\n \tformats = scaler_->formats(2);\n", "prefixes": [ "libcamera-devel", "08/17" ] }