Patch Detail

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

{
    "id": 403,
    "url": "https://patchwork.libcamera.org/api/1.1/patches/403/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/403/",
    "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": "<20190126151318.28087-3-jacopo@jmondi.org>",
    "date": "2019-01-26T15:13:17",
    "name": "[libcamera-devel,RFC,2/3] libcamera: v4l2_device: Add methods to get/set format",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": false,
    "hash": "7a118f1865f1a18184cba934605506e3dda38ca3",
    "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/403/mbox/",
    "series": [
        {
            "id": 140,
            "url": "https://patchwork.libcamera.org/api/1.1/series/140/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=140",
            "date": "2019-01-26T15:13:15",
            "name": "v4l2-device: set and get format",
            "version": 1,
            "mbox": "https://patchwork.libcamera.org/series/140/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/403/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/403/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 29AC760C78\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 26 Jan 2019 16:13:14 +0100 (CET)",
            "from uno.homenet.telecomitalia.it\n\t(host20-49-dynamic.18-79-r.retail.telecomitalia.it [79.18.49.20])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 55906100005;\n\tSat, 26 Jan 2019 15:13:13 +0000 (UTC)"
        ],
        "From": "Jacopo Mondi <jacopo@jmondi.org>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Date": "Sat, 26 Jan 2019 16:13:17 +0100",
        "Message-Id": "<20190126151318.28087-3-jacopo@jmondi.org>",
        "X-Mailer": "git-send-email 2.20.1",
        "In-Reply-To": "<20190126151318.28087-1-jacopo@jmondi.org>",
        "References": "<20190126151318.28087-1-jacopo@jmondi.org>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[libcamera-devel] [RFC 2/3] libcamera: v4l2_device: Add methods to\n\tget/set format",
        "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": "Sat, 26 Jan 2019 15:13:14 -0000"
    },
    "content": "Add methods to set and get the image format programmed on a V4L2Device\nfor both the single and multi planar use case.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/include/v4l2_device.h |  13 +++\n src/libcamera/v4l2_device.cpp       | 131 ++++++++++++++++++++++++++++\n 2 files changed, 144 insertions(+)",
    "diff": "diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h\nindex ee0c4eb..01dbf45 100644\n--- a/src/libcamera/include/v4l2_device.h\n+++ b/src/libcamera/include/v4l2_device.h\n@@ -14,6 +14,7 @@\n \n #include <libcamera/buffer.h>\n #include <libcamera/event_notifier.h>\n+#include <libcamera/stream.h>\n \n namespace libcamera {\n \n@@ -81,6 +82,9 @@ public:\n \tint requestBuffers(unsigned int qty = 8);\n \tint requestBuffers(unsigned int qty, std::vector<FrameBuffer *> &buffers);\n \n+\tint format(StreamConfiguration *config);\n+\tint setFormat(StreamConfiguration *config);\n+\n \tint queueBuffer(FrameBuffer *frame);\n \tFrameBuffer *dequeueBuffer();\n \n@@ -93,6 +97,7 @@ private:\n \tstd::string deviceNode_;\n \tint fd_;\n \tV4L2Capability caps_;\n+\tunsigned int buftype_;\n \n \tenum v4l2_memory memoryType_;\n \tenum v4l2_buf_type bufferType_;\n@@ -101,6 +106,14 @@ private:\n \tvoid bufferAvailable(EventNotifier *notifier);\n \n \tEventNotifier *fdEvent_;\n+\n+\tunsigned int getPlanesFromFormat(unsigned int pixfmt);\n+\tunsigned int getBppFromFormat(unsigned int pixfmt);\n+\tint getFormatSingleplane(StreamConfiguration *config);\n+\tint setFormatSingleplane(StreamConfiguration *config);\n+\n+\tint getFormatMultiplane(StreamConfiguration *config);\n+\tint setFormatMultiplane(StreamConfiguration *config);\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 4d39c85..d16691d 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -203,6 +203,15 @@ int V4L2Device::open()\n \t\treturn -EINVAL;\n \t}\n \n+\tif (caps_.isCapture())\n+\t\tbuftype_ = 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\tbuftype_ = caps_.isMultiplanar() ?\n+\t\t\t   V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE :\n+\t\t\t   V4L2_BUF_TYPE_VIDEO_OUTPUT;\n+\n \treturn 0;\n }\n \n@@ -314,6 +323,26 @@ int V4L2Device::requestBuffers(unsigned int qty, std::vector<FrameBuffer *> &buf\n \treturn 0;\n }\n \n+/**\n+ * \\brief Retrieve the image format set on the V4L2 device\n+ * \\return 0 for success, a negative error code otherwise\n+ */\n+int V4L2Device::format(StreamConfiguration *config)\n+{\n+\treturn caps_.isMultiplanar() ? getFormatMultiplane(config) :\n+\t\t\t\t       getFormatSingleplane(config);\n+}\n+\n+/**\n+ * \\brief Program an image format on the V4L2 device\n+ * \\return 0 for success, a negative error code otherwise\n+ */\n+int V4L2Device::setFormat(StreamConfiguration *config)\n+{\n+\treturn caps_.isMultiplanar() ? setFormatMultiplane(config) :\n+\t\t\t\t       setFormatSingleplane(config);\n+}\n+\n int V4L2Device::queueBuffer(FrameBuffer *frame)\n {\n \tstruct v4l2_buffer buf = {};\n@@ -422,6 +451,108 @@ int V4L2Device::streamOff()\n \t}\n \n \tdelete fdEvent_;\n+}\n+\n+/* TODO: this is a simple stub at the moment. */\n+unsigned int V4L2Device::getPlanesFromFormat(unsigned int pixfmt)\n+{\n+\treturn 1;\n+}\n+\n+/* TODO: this is a simple stub at the moment. */\n+unsigned int V4L2Device::getBppFromFormat(unsigned int pixfmt)\n+{\n+\treturn 16;\n+}\n+\n+int V4L2Device::getFormatSingleplane(StreamConfiguration *config)\n+{\n+\tstruct v4l2_format v4l2Fmt;\n+\tstruct v4l2_pix_format *pix = &v4l2Fmt.fmt.pix;\n+\tint ret;\n+\n+\tret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Fmt);\n+\tif (ret) {\n+\t\tret = -errno;\n+\t\tLOG(Error) << \"Unable to get format: \" << strerror(-ret);\n+\t\treturn ret;\n+\t}\n+\n+\tconfig->setWidth(pix->width);\n+\tconfig->setHeight(pix->height);\n+\tconfig->setPixelFormat(pix->pixelformat);\n+\n+\treturn 0;\n+}\n+\n+int V4L2Device::setFormatSingleplane(StreamConfiguration *config)\n+{\n+\tstruct v4l2_format v4l2Fmt;\n+\tstruct v4l2_pix_format *pix = &v4l2Fmt.fmt.pix;\n+\tint ret;\n+\n+\tv4l2Fmt.type = buftype_;\n+\tpix->width = config->width();\n+\tpix->height = config->height();\n+\n+\tpix->width = config->width();\n+\tpix->height = config->height();\n+\tpix->pixelformat = config->pixelformat();\n+\n+\tret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Fmt);\n+\tif (ret) {\n+\t\tret = -errno;\n+\t\tLOG(Error) << \"Unable to set format: \" << strerror(-ret);\n+\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+int V4L2Device::getFormatMultiplane(StreamConfiguration *config)\n+{\n+\tstruct v4l2_format v4l2Fmt;\n+\tstruct v4l2_pix_format_mplane *pix = &v4l2Fmt.fmt.pix_mp;\n+\tint ret;\n+\n+\tret = ioctl(fd_, VIDIOC_G_FMT, &v4l2Fmt);\n+\tif (ret) {\n+\t\tret = -errno;\n+\t\tLOG(Error) << \"Unable to get format: \" << strerror(-ret);\n+\t\treturn ret;\n+\t}\n+\n+\tconfig->setWidth(pix->width);\n+\tconfig->setHeight(pix->height);\n+\tconfig->setPixelFormat(pix->pixelformat);\n+\n+\treturn 0;\n+}\n+\n+int V4L2Device::setFormatMultiplane(StreamConfiguration *config)\n+{\n+\tstruct v4l2_format v4l2Fmt;\n+\tstruct v4l2_pix_format_mplane *pix = &v4l2Fmt.fmt.pix_mp;\n+\tint ret;\n+\n+\tv4l2Fmt.type = buftype_;\n+\tpix->width = config->width();\n+\tpix->height = config->height();\n+\tpix->pixelformat = config->pixelformat();\n+\n+\tunsigned int numPlanes = getPlanesFromFormat(pix->pixelformat);\n+\tunsigned int bpp = getBppFromFormat(pix->pixelformat);\n+\tfor (unsigned int i = 0; i < numPlanes; ++i) {\n+\t\tpix->plane_fmt[i].bytesperline = bpp * pix->width;\n+\t\tpix->plane_fmt[i].sizeimage = bpp * pix->width * pix->height;\n+\t}\n+\n+\tret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Fmt);\n+\tif (ret) {\n+\t\tret = -errno;\n+\t\tLOG(Error) << \"Unable to set format: \" << strerror(-ret);\n+\t\treturn ret;\n+\t}\n \n \treturn 0;\n }\n",
    "prefixes": [
        "libcamera-devel",
        "RFC",
        "2/3"
    ]
}