Patch Detail
Show a patch.
GET /api/1.1/patches/1457/?format=api
{ "id": 1457, "url": "https://patchwork.libcamera.org/api/1.1/patches/1457/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1457/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20190619025129.21164-8-niklas.soderlund@ragnatech.se>", "date": "2019-06-19T02:51:20", "name": "[libcamera-devel,v4,07/16] libcamera: v4l2_subdevice: Rework enumPadSizes()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "004ceccb3644f02634f89467e3388fd1c4494e6c", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1457/mbox/", "series": [ { "id": 361, "url": "https://patchwork.libcamera.org/api/1.1/series/361/?format=api", "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/1457/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1457/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 8CAD161A48\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 19 Jun 2019 04:52:27 +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 3d71c56c-923d-11e9-8ab4-005056917a89;\n\tWed, 19 Jun 2019 04:52:13 +0200 (CEST)" ], "X-Halon-ID": "3d71c56c-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:20 +0200", "Message-Id": "<20190619025129.21164-8-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 07/16] libcamera: v4l2_subdevice:\n\tRework enumPadSizes()", "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:28 -0000" }, "content": "Align the enumPadSizes() interface and implementation with that of\nenumPadCodes(). There is no functional change.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/include/v4l2_subdevice.h | 4 +--\n src/libcamera/v4l2_subdevice.cpp | 38 ++++++++++++++------------\n 2 files changed, 22 insertions(+), 20 deletions(-)", "diff": "diff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h\nindex e714e2575022c04d..c6fdf417b43c0423 100644\n--- a/src/libcamera/include/v4l2_subdevice.h\n+++ b/src/libcamera/include/v4l2_subdevice.h\n@@ -58,8 +58,8 @@ protected:\n \n private:\n \tstd::vector<unsigned int> enumPadCodes(unsigned int pad);\n-\tint enumPadSizes(unsigned int pad, unsigned int code,\n-\t\t\t std::vector<SizeRange> *size);\n+\tstd::vector<SizeRange> enumPadSizes(unsigned int pad,\n+\t\t\t\t\t unsigned int code);\n \n \tint setSelection(unsigned int pad, unsigned int target,\n \t\t\t Rectangle *rect);\ndiff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\nindex 99e202fa264af5a6..3296bc010fe8313f 100644\n--- a/src/libcamera/v4l2_subdevice.cpp\n+++ b/src/libcamera/v4l2_subdevice.cpp\n@@ -209,10 +209,14 @@ FormatEnum V4L2Subdevice::formats(unsigned int pad)\n \t\treturn {};\n \t}\n \n-\tfor (unsigned int code : enumPadCodes(pad))\n-\t\tif (enumPadSizes(pad, code, &formatMap[code]))\n+\tfor (unsigned int code : enumPadCodes(pad)) {\n+\t\tstd::vector<SizeRange> sizes = enumPadSizes(pad, code);\n+\t\tif (sizes.empty())\n \t\t\treturn {};\n \n+\t\tformatMap[code] = sizes;\n+\t}\n+\n \treturn formatMap;\n }\n \n@@ -335,25 +339,25 @@ std::vector<unsigned int> V4L2Subdevice::enumPadCodes(unsigned int pad)\n \treturn codes;\n }\n \n-int V4L2Subdevice::enumPadSizes(unsigned int pad,unsigned int code,\n-\t\t\t\tstd::vector<SizeRange> *sizes)\n+std::vector<SizeRange> V4L2Subdevice::enumPadSizes(unsigned int pad,\n+\t\t\t\t\t\t unsigned int code)\n {\n-\tstruct v4l2_subdev_frame_size_enum sizeEnum = {};\n+\tstd::vector<SizeRange> sizes;\n \tint ret;\n \n-\tsizeEnum.index = 0;\n-\tsizeEnum.pad = pad;\n-\tsizeEnum.code = code;\n-\tsizeEnum.which = V4L2_SUBDEV_FORMAT_ACTIVE;\n-\twhile (true) {\n+\tfor (unsigned int index = 0;; index++) {\n+\t\tstruct v4l2_subdev_frame_size_enum sizeEnum = {};\n+\t\tsizeEnum.index = index;\n+\t\tsizeEnum.pad = pad;\n+\t\tsizeEnum.code = code;\n+\t\tsizeEnum.which = V4L2_SUBDEV_FORMAT_ACTIVE;\n+\n \t\tret = ioctl(fd_, VIDIOC_SUBDEV_ENUM_FRAME_SIZE, &sizeEnum);\n \t\tif (ret)\n \t\t\tbreak;\n \n-\t\tsizes->emplace_back(sizeEnum.min_width, sizeEnum.min_height,\n-\t\t\t\t sizeEnum.max_width, sizeEnum.max_height);\n-\n-\t\tsizeEnum.index++;\n+\t\tsizes.emplace_back(sizeEnum.min_width, sizeEnum.min_height,\n+\t\t\t\t sizeEnum.max_width, sizeEnum.max_height);\n \t}\n \n \tif (ret && (errno != EINVAL && errno != ENOTTY)) {\n@@ -361,12 +365,10 @@ int V4L2Subdevice::enumPadSizes(unsigned int pad,unsigned int code,\n \t\tLOG(V4L2Subdev, Error)\n \t\t\t<< \"Unable to enumerate sizes on pad \" << pad\n \t\t\t<< \": \" << strerror(-ret);\n-\t\tsizes->clear();\n-\n-\t\treturn ret;\n+\t\treturn {};\n \t}\n \n-\treturn 0;\n+\treturn sizes;\n }\n \n int V4L2Subdevice::setSelection(unsigned int pad, unsigned int target,\n", "prefixes": [ "libcamera-devel", "v4", "07/16" ] }