Patch Detail
Show a patch.
GET /api/1.1/patches/4087/?format=api
{ "id": 4087, "url": "https://patchwork.libcamera.org/api/1.1/patches/4087/?format=api", "web_url": "https://patchwork.libcamera.org/patch/4087/", "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-8-paul.elder@ideasonboard.com>", "date": "2020-06-19T05:41:13", "name": "[libcamera-devel,v2,07/17] v4l2: v4l2_camera_proxy: Implement VIDIOC_ENUM_FRAMESIZES", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "25053a1eaadd8e1cd81008df9e8e94fc6f485a25", "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/4087/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/4087/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/4087/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 42A7C609E1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 19 Jun 2020 07:41:51 +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 76A78556;\n\tFri, 19 Jun 2020 07:41:49 +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=\"r0cOPaQk\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1592545311;\n\tbh=vGb0v2Qe4a5GkACDESiVUZkH+2mUvCWPa0Kz/ayyStQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=r0cOPaQkJtQAN1pvlixK7rIdoHvlvhAhuKf73sdzAraUE6ffsVpooBhetB62QTnG2\n\txWpt/LHSQcEhvK73OB4gVLxKCGmFXLEtVjTKa7az/rBxq1bLlCO4PkVCwKKyYeVVJH\n\tpF4PjtE7EwJVxmE2bT/78FrkUlkVvR2s4R+S8ulA=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 19 Jun 2020 14:41:13 +0900", "Message-Id": "<20200619054123.19052-8-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 07/17] v4l2: v4l2_camera_proxy:\n\tImplement VIDIOC_ENUM_FRAMESIZES", "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:51 -0000" }, "content": "Implement VIDIOC_ENUM_FRAMESIZES in the V4L2 compatibility layer.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n---\nChanges in v2:\n- use V4L2CameraFile instead of fd\n- added todo for not many pipeline handlers reporting StreamFormats\n---\n src/v4l2/v4l2_camera_proxy.cpp | 26 ++++++++++++++++++++++++++\n src/v4l2/v4l2_camera_proxy.h | 1 +\n 2 files changed, 27 insertions(+)", "diff": "diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 3ac9068..c3032f5 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -241,6 +241,28 @@ int V4L2CameraProxy::vidioc_querycap(struct v4l2_capability *arg)\n \treturn 0;\n }\n \n+int V4L2CameraProxy::vidioc_enum_framesizes(V4L2CameraFile *cf, struct v4l2_frmsizeenum *arg)\n+{\n+\tLOG(V4L2Compat, Debug) << \"Servicing vidioc_enum_framesizes fd = \" << cf->efd();\n+\n+\tPixelFormat argFormat = v4l2ToDrm(arg->pixel_format);\n+\t/*\n+\t * \\todo This might need to be expanded as few pipeline handlers\n+\t * report StreamFormats.\n+\t */\n+\tconst std::vector<Size> &frameSizes = streamConfig_.formats().sizes(argFormat);\n+\n+\tif (arg->index >= frameSizes.size())\n+\t\treturn -EINVAL;\n+\n+\targ->type = V4L2_FRMSIZE_TYPE_DISCRETE;\n+\targ->discrete.width = frameSizes[arg->index].width;\n+\targ->discrete.height = frameSizes[arg->index].height;\n+\tmemset(arg->reserved, 0, sizeof(arg->reserved));\n+\n+\treturn 0;\n+}\n+\n int V4L2CameraProxy::vidioc_enum_fmt(V4L2CameraFile *cf, struct v4l2_fmtdesc *arg)\n {\n \tLOG(V4L2Compat, Debug) << \"Servicing vidioc_enum_fmt fd = \" << cf->efd();\n@@ -624,6 +646,7 @@ int V4L2CameraProxy::vidioc_streamoff(V4L2CameraFile *cf, int *arg)\n \n std::set<unsigned long> V4L2CameraProxy::supportedIoctls_ = {\n \tVIDIOC_QUERYCAP,\n+\tVIDIOC_ENUM_FRAMESIZES,\n \tVIDIOC_ENUM_FMT,\n \tVIDIOC_G_FMT,\n \tVIDIOC_S_FMT,\n@@ -658,6 +681,9 @@ int V4L2CameraProxy::ioctl(V4L2CameraFile *cf, unsigned long request, void *arg)\n \tcase VIDIOC_QUERYCAP:\n \t\tret = vidioc_querycap(static_cast<struct v4l2_capability *>(arg));\n \t\tbreak;\n+\tcase VIDIOC_ENUM_FRAMESIZES:\n+\t\tret = vidioc_enum_framesizes(cf, static_cast<struct v4l2_frmsizeenum *>(arg));\n+\t\tbreak;\n \tcase VIDIOC_ENUM_FMT:\n \t\tret = vidioc_enum_fmt(cf, static_cast<struct v4l2_fmtdesc *>(arg));\n \t\tbreak;\ndiff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h\nindex 46573e7..363d366 100644\n--- a/src/v4l2/v4l2_camera_proxy.h\n+++ b/src/v4l2/v4l2_camera_proxy.h\n@@ -47,6 +47,7 @@ private:\n \tint freeBuffers();\n \n \tint vidioc_querycap(struct v4l2_capability *arg);\n+\tint vidioc_enum_framesizes(V4L2CameraFile *cf, struct v4l2_frmsizeenum *arg);\n \tint vidioc_enum_fmt(V4L2CameraFile *cf, struct v4l2_fmtdesc *arg);\n \tint vidioc_g_fmt(V4L2CameraFile *cf, struct v4l2_format *arg);\n \tint vidioc_s_fmt(V4L2CameraFile *cf, struct v4l2_format *arg);\n", "prefixes": [ "libcamera-devel", "v2", "07/17" ] }