Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 693,
    "url": "https://patchwork.libcamera.org/api/1.1/patches/693/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/693/",
    "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": "<20190301115139.11060-5-jacopo@jmondi.org>",
    "date": "2019-03-01T11:51:38",
    "name": "[libcamera-devel,v6,4/5] libcamera: v4l2_device: Add support for META_CAPTURE devices",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": false,
    "hash": "bad1bfa730d86f48ff4d78fd7ce47e6d0ed593a8",
    "submitter": {
        "id": 3,
        "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api",
        "name": "Jacopo Mondi",
        "email": "jacopo@jmondi.org"
    },
    "delegate": null,
    "mbox": "https://patchwork.libcamera.org/patch/693/mbox/",
    "series": [
        {
            "id": 200,
            "url": "https://patchwork.libcamera.org/api/1.1/series/200/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=200",
            "date": "2019-03-01T11:51:34",
            "name": "v4l2_(sub)dev: improvements and tests",
            "version": 6,
            "mbox": "https://patchwork.libcamera.org/series/200/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/693/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/693/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "<jacopo@jmondi.org>",
        "Received": [
            "from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 02364610F5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  1 Mar 2019 12:52:47 +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 relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 57CE5C0006;\n\tFri,  1 Mar 2019 11:52:45 +0000 (UTC)"
        ],
        "X-Originating-IP": "2.224.242.101",
        "From": "Jacopo Mondi <jacopo@jmondi.org>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Date": "Fri,  1 Mar 2019 12:51:38 +0100",
        "Message-Id": "<20190301115139.11060-5-jacopo@jmondi.org>",
        "X-Mailer": "git-send-email 2.20.1",
        "In-Reply-To": "<20190301115139.11060-1-jacopo@jmondi.org>",
        "References": "<20190301115139.11060-1-jacopo@jmondi.org>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[libcamera-devel] [PATCH v6 4/5] 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": "Fri, 01 Mar 2019 11:52:47 -0000"
    },
    "content": "Add support for devices that provide video meta-data to v4l2_device.cpp\nand re-arrange bufferType handling in open() method.\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/include/v4l2_device.h | 26 ++++++++++-\n src/libcamera/v4l2_device.cpp       | 70 +++++++++++++++++++++--------\n 2 files changed, 76 insertions(+), 20 deletions(-)",
    "diff": "diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h\nindex 622c9722c992..5c379fac66dc 100644\n--- a/src/libcamera/include/v4l2_device.h\n+++ b/src/libcamera/include/v4l2_device.h\n@@ -51,13 +51,37 @@ struct V4L2Capability final : v4l2_capability {\n \tbool isCapture() const\n \t{\n \t\treturn device_caps() & (V4L2_CAP_VIDEO_CAPTURE |\n-\t\t\t\t\tV4L2_CAP_VIDEO_CAPTURE_MPLANE);\n+\t\t\t\t\tV4L2_CAP_VIDEO_CAPTURE_MPLANE |\n+\t\t\t\t\tV4L2_CAP_META_CAPTURE);\n \t}\n \tbool isOutput() const\n \t{\n \t\treturn device_caps() & (V4L2_CAP_VIDEO_OUTPUT |\n \t\t\t\t\tV4L2_CAP_VIDEO_OUTPUT_MPLANE);\n \t}\n+\tbool isVideo() const\n+\t{\n+\t\treturn device_caps() & (V4L2_CAP_VIDEO_CAPTURE |\n+\t\t\t\t\tV4L2_CAP_VIDEO_CAPTURE_MPLANE |\n+\t\t\t\t\tV4L2_CAP_VIDEO_OUTPUT |\n+\t\t\t\t\tV4L2_CAP_VIDEO_OUTPUT_MPLANE);\n+\t}\n+\tbool isMeta() const\n+\t{\n+\t\treturn device_caps() & V4L2_CAP_META_CAPTURE;\n+\t}\n+\tbool isVideoCapture() const\n+\t{\n+\t\treturn isVideo() && isCapture();\n+\t}\n+\tbool isVideoOutput() const\n+\t{\n+\t\treturn isVideo() && isOutput();\n+\t}\n+\tbool isMetaCapture() const\n+\t{\n+\t\treturn isMeta() && isCapture();\n+\t}\n \tbool hasStreaming() const\n \t{\n \t\treturn device_caps() & V4L2_CAP_STREAMING;\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 4c670185bb7c..b19cf9f78029 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -69,14 +69,47 @@ LOG_DEFINE_CATEGORY(V4L2)\n \n /**\n  * \\fn bool V4L2Capability::isCapture()\n- * \\brief Identify if the device is capable of capturing video\n- * \\return True if the device can capture video frames\n+ * \\brief Identify if the device captures data\n+ * \\return True if the device can capture data\n  */\n \n /**\n  * \\fn bool V4L2Capability::isOutput()\n- * \\brief Identify if the device is capable of outputting video\n- * \\return True if the device can output video frames\n+ * \\brief Identify if the device outputs data\n+ * \\return True if the device can output data\n+ */\n+\n+/**\n+ * \\fn bool V4L2Capability::isVideo()\n+ * \\brief Identify if the device captures or outputs images\n+ * \\return True if the device can capture or output images\n+ */\n+\n+/**\n+ * \\fn bool V4L2Capability::isMeta()\n+ * \\brief Identify if the device captures or outputs image meta-data\n+ *\n+ * \\todo Add support for META_CAPTURE introduced in Linux v5.0\n+ *\n+ * \\return True if the device can capture or output image meta-data\n+ */\n+\n+/**\n+ * \\fn bool V4L2Capability::isVideoCapture()\n+ * \\brief Identify if the device captures images\n+ * \\return True if the device can capture images\n+ */\n+\n+/**\n+ * \\fn bool V4L2Capability::isVideoOutput()\n+ * \\brief Identify if the device outputs images\n+ * \\return True if the device can output images\n+ */\n+\n+/**\n+ * \\fn bool V4L2Capability::isMetaCapture()\n+ * \\brief Identify if the device captures image meta-data\n+ * \\return True if the device can capture image meta-data\n  */\n \n /**\n@@ -280,33 +313,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_.isVideoCapture()) {\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_.isVideoOutput()) {\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",
        "v6",
        "4/5"
    ]
}