Patch Detail
Show a patch.
GET /api/patches/643/?format=api
{ "id": 643, "url": "https://patchwork.libcamera.org/api/patches/643/?format=api", "web_url": "https://patchwork.libcamera.org/patch/643/", "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": "<20190227173837.6902-5-jacopo@jmondi.org>", "date": "2019-02-27T17:38:33", "name": "[libcamera-devel,v4,4/8] libcamera: v4l2_device: Add support for META_CAPTURE devices", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "d56d01c566a150b3bb1c4271a4a958a3cbb46656", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/643/mbox/", "series": [ { "id": 194, "url": "https://patchwork.libcamera.org/api/series/194/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=194", "date": "2019-02-27T17:38:29", "name": "v4l2_(sub)dev: improvements and tests", "version": 4, "mbox": "https://patchwork.libcamera.org/series/194/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/643/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/643/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "Received": [ "from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4BE27610BB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 27 Feb 2019 18:38:16 +0100 (CET)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id DA52C100005;\n\tWed, 27 Feb 2019 17:38:15 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 27 Feb 2019 18:38:33 +0100", "Message-Id": "<20190227173837.6902-5-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190227173837.6902-1-jacopo@jmondi.org>", "References": "<20190227173837.6902-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 4/8] libcamera: v4l2_device: Add\n\tsupport for META_CAPTURE devices", "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, 27 Feb 2019 17:38:16 -0000" }, "content": "Add support for devices that provide video meta-data to v4l2_device.cpp\nand re-arrange bufferType handling in open() method.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/include/v4l2_device.h | 4 +++\n src/libcamera/v4l2_device.cpp | 38 +++++++++++++++++------------\n 2 files changed, 27 insertions(+), 15 deletions(-)", "diff": "diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h\nindex 1d31d1b403bc..733bd69959f3 100644\n--- a/src/libcamera/include/v4l2_device.h\n+++ b/src/libcamera/include/v4l2_device.h\n@@ -53,6 +53,10 @@ struct V4L2Capability final : v4l2_capability {\n \t\treturn device_caps() & (V4L2_CAP_VIDEO_CAPTURE |\n \t\t\t\t\tV4L2_CAP_VIDEO_CAPTURE_MPLANE);\n \t}\n+\tbool isMetaCapture() const\n+\t{\n+\t\treturn device_caps() & V4L2_CAP_META_CAPTURE;\n+\t}\n \tbool isOutput() const\n \t{\n \t\treturn device_caps() & (V4L2_CAP_VIDEO_OUTPUT |\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 24e115554a99..9bfa10e8a151 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -79,6 +79,15 @@ LOG_DEFINE_CATEGORY(V4L2)\n * \\return True if the device can output video frames\n */\n \n+/**\n+ * \\fn bool V4L2Capability::isMetaCapture()\n+ * \\brief Identify if the device is capable of providing video meta-data\n+ *\n+ * TODO: add support for META_OUTPUT, introduced in Linux v5.0\n+ *\n+ * \\return True if the device can capture video meta-data\n+ */\n+\n /**\n * \\fn bool V4L2Capability::hasStreaming()\n * \\brief Determine if the device can perform Streaming I/O\n@@ -280,33 +289,32 @@ int V4L2Device::open()\n \t\t<< \"Opened device \" << caps_.bus_info() << \": \"\n \t\t<< caps_.driver() << \": \" << caps_.card();\n \n-\tif (!caps_.isCapture() && !caps_.isOutput()) {\n-\t\tLOG(V4L2, Debug) << \"Device is not a supported type\";\n-\t\treturn -EINVAL;\n-\t}\n-\n \tif (!caps_.hasStreaming()) {\n \t\tLOG(V4L2, Error) << \"Device does not support streaming I/O\";\n \t\treturn -EINVAL;\n \t}\n \n-\tif (caps_.isCapture())\n+\t/*\n+\t * Set buffer type and wait for read notifications on CAPTURE devices\n+\t * (POLLIN), and write notifications for OUTPUT devices (POLLOUT).\n+\t */\n+\tif (caps_.isCapture()) {\n+\t\tfdEvent_ = new EventNotifier(fd_, EventNotifier::Read);\n \t\tbufferType_ = caps_.isMultiplanar()\n \t\t\t ? V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE\n \t\t\t : V4L2_BUF_TYPE_VIDEO_CAPTURE;\n-\telse\n+\t} else if (caps_.isOutput()) {\n+\t\tfdEvent_ = new EventNotifier(fd_, EventNotifier::Write);\n \t\tbufferType_ = caps_.isMultiplanar()\n \t\t\t ? V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE\n \t\t\t : V4L2_BUF_TYPE_VIDEO_OUTPUT;\n-\n-\t/*\n-\t * We wait for Read notifications on CAPTURE devices (POLLIN), and\n-\t * Write notifications for OUTPUT devices (POLLOUT).\n-\t */\n-\tif (caps_.isCapture())\n+\t} else if (caps_.isMetaCapture()) {\n \t\tfdEvent_ = new EventNotifier(fd_, EventNotifier::Read);\n-\telse\n-\t\tfdEvent_ = new EventNotifier(fd_, EventNotifier::Write);\n+\t\tbufferType_ = V4L2_BUF_TYPE_META_CAPTURE;\n+\t} else {\n+\t\tLOG(V4L2, Debug) << \"Device is not a supported type\";\n+\t\treturn -EINVAL;\n+\t}\n \n \tfdEvent_->activated.connect(this, &V4L2Device::bufferAvailable);\n \tfdEvent_->setEnabled(false);\n", "prefixes": [ "libcamera-devel", "v4", "4/8" ] }