Patch Detail
Show a patch.
GET /api/1.1/patches/4086/?format=api
{ "id": 4086, "url": "https://patchwork.libcamera.org/api/1.1/patches/4086/?format=api", "web_url": "https://patchwork.libcamera.org/patch/4086/", "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": "<20200619054123.19052-7-paul.elder@ideasonboard.com>", "date": "2020-06-19T05:41:12", "name": "[libcamera-devel,v2,06/17] v4l2: v4l2_camera_proxy: Implement VIDIOC_ENUMINPUT, VIDIOC_G/S_INPUT", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "fb1bdd05c97e0d5ef20b96d6ef088af5828e5aa1", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/4086/mbox/", "series": [ { "id": 1017, "url": "https://patchwork.libcamera.org/api/1.1/series/1017/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1017", "date": "2020-06-19T05:41:06", "name": "Support v4l2-compliance", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1017/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/4086/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/4086/checks/", "tags": {}, "headers": { "Return-Path": "<paul.elder@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0879D603BF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 19 Jun 2020 07:41:49 +0200 (CEST)", "from jade.flets-east.jp (unknown\n\t[IPv6:2400:4051:61:600:e972:d773:e99a:4f79])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E2139556;\n\tFri, 19 Jun 2020 07:41:46 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"s9tUmBdp\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1592545308;\n\tbh=USR0E8AUhRg8JcikxWau5HbGH0xOr85PKz/bM+2Dn54=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=s9tUmBdpg0W4AoJjY84p/5PzzsgnzSJMSFMtY/nurkVuzHOgsOFCNs9FsjgxWlp4A\n\t41HvIBk1ABlh9LBEIENEgsMkB97hpE4Y9BQeQggnibFXzKahd/vAf9SRvgJG8vtgUt\n\tSRkJeaaIqgxKfYVE2cZmK6nH1otm8Rk7harZUZMU=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 19 Jun 2020 14:41:12 +0900", "Message-Id": "<20200619054123.19052-7-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200619054123.19052-1-paul.elder@ideasonboard.com>", "References": "<20200619054123.19052-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 06/17] v4l2: v4l2_camera_proxy:\n\tImplement VIDIOC_ENUMINPUT, VIDIOC_G/S_INPUT", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "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, 19 Jun 2020 05:41:49 -0000" }, "content": "Implement VIDIOC_ENUMINPUT, VIDIOC_G_INPUT, and VIDIOC_S_INPUT. Only the\nzeroth input device is supported, and the info returned by enuminput is\nhardcoded and basic. This is sufficient to pass v4l2-compliance.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n---\nChanges in v2:\n- use V4L2CameraFile instead of fd\n- remove arg == nullptr check as it has been moved away to the main\n ioctl handler\n---\n src/v4l2/v4l2_camera_proxy.cpp | 48 ++++++++++++++++++++++++++++++++++\n src/v4l2/v4l2_camera_proxy.h | 3 +++\n 2 files changed, 51 insertions(+)", "diff": "diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 3e95645..3ac9068 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -376,6 +376,42 @@ int V4L2CameraProxy::vidioc_s_priority(V4L2CameraFile *cf, enum v4l2_priority *a\n \treturn 0;\n }\n \n+int V4L2CameraProxy::vidioc_enuminput(V4L2CameraFile *cf, struct v4l2_input *arg)\n+{\n+\tLOG(V4L2Compat, Debug) << \"Servicing vidioc_enuminput fd = \" << cf->efd();\n+\n+\tif (arg->index != 0)\n+\t\treturn -EINVAL;\n+\n+\tmemset(arg, 0, sizeof(*arg));\n+\n+\tutils::strlcpy(reinterpret_cast<char *>(arg->name),\n+\t\t reinterpret_cast<char *>(capabilities_.card),\n+\t\t sizeof(arg->name));\n+\targ->type = V4L2_INPUT_TYPE_CAMERA;\n+\n+\treturn 0;\n+}\n+\n+int V4L2CameraProxy::vidioc_g_input(V4L2CameraFile *cf, int *arg)\n+{\n+\tLOG(V4L2Compat, Debug) << \"Servicing vidioc_g_input fd = \" << cf->efd();\n+\n+\t*arg = 0;\n+\n+\treturn 0;\n+}\n+\n+int V4L2CameraProxy::vidioc_s_input(V4L2CameraFile *cf, int *arg)\n+{\n+\tLOG(V4L2Compat, Debug) << \"Servicing vidioc_s_input fd = \" << cf->efd();\n+\n+\tif (*arg != 0)\n+\t\treturn -EINVAL;\n+\n+\treturn 0;\n+}\n+\n int V4L2CameraProxy::freeBuffers()\n {\n \tLOG(V4L2Compat, Debug) << \"Freeing libcamera bufs\";\n@@ -594,6 +630,9 @@ std::set<unsigned long> V4L2CameraProxy::supportedIoctls_ = {\n \tVIDIOC_TRY_FMT,\n \tVIDIOC_G_PRIORITY,\n \tVIDIOC_S_PRIORITY,\n+\tVIDIOC_ENUMINPUT,\n+\tVIDIOC_G_INPUT,\n+\tVIDIOC_S_INPUT,\n \tVIDIOC_REQBUFS,\n \tVIDIOC_QUERYBUF,\n \tVIDIOC_QBUF,\n@@ -637,6 +676,15 @@ int V4L2CameraProxy::ioctl(V4L2CameraFile *cf, unsigned long request, void *arg)\n \tcase VIDIOC_S_PRIORITY:\n \t\tret = vidioc_s_priority(cf, static_cast<enum v4l2_priority *>(arg));\n \t\tbreak;\n+\tcase VIDIOC_ENUMINPUT:\n+\t\tret = vidioc_enuminput(cf, static_cast<struct v4l2_input *>(arg));\n+\t\tbreak;\n+\tcase VIDIOC_G_INPUT:\n+\t\tret = vidioc_g_input(cf, static_cast<int *>(arg));\n+\t\tbreak;\n+\tcase VIDIOC_S_INPUT:\n+\t\tret = vidioc_s_input(cf, static_cast<int *>(arg));\n+\t\tbreak;\n \tcase VIDIOC_REQBUFS:\n \t\tret = vidioc_reqbufs(cf, static_cast<struct v4l2_requestbuffers *>(arg));\n \t\tbreak;\ndiff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h\nindex 3260eec..46573e7 100644\n--- a/src/v4l2/v4l2_camera_proxy.h\n+++ b/src/v4l2/v4l2_camera_proxy.h\n@@ -53,6 +53,9 @@ private:\n \tint vidioc_try_fmt(V4L2CameraFile *cf, struct v4l2_format *arg);\n \tint vidioc_g_priority(V4L2CameraFile *cf, enum v4l2_priority *arg);\n \tint vidioc_s_priority(V4L2CameraFile *cf, enum v4l2_priority *arg);\n+\tint vidioc_enuminput(V4L2CameraFile *cf, struct v4l2_input *arg);\n+\tint vidioc_g_input(V4L2CameraFile *cf, int *arg);\n+\tint vidioc_s_input(V4L2CameraFile *cf, int *arg);\n \tint vidioc_reqbufs(V4L2CameraFile *cf, struct v4l2_requestbuffers *arg);\n \tint vidioc_querybuf(V4L2CameraFile *cf, struct v4l2_buffer *arg);\n \tint vidioc_qbuf(V4L2CameraFile *cf, struct v4l2_buffer *arg);\n", "prefixes": [ "libcamera-devel", "v2", "06/17" ] }