Patch Detail
Show a patch.
GET /api/1.1/patches/4097/?format=api
{ "id": 4097, "url": "https://patchwork.libcamera.org/api/1.1/patches/4097/?format=api", "web_url": "https://patchwork.libcamera.org/patch/4097/", "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-18-paul.elder@ideasonboard.com>", "date": "2020-06-19T05:41:23", "name": "[libcamera-devel,v2,17/17] v4l2: v4l2_camera_proxy: Fix buffer flags related to queueing", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "0e84e46aa06cc87e6c1434f25409131cd676ae3b", "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/4097/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/4097/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/4097/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 56B57609DD\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 19 Jun 2020 07:42:12 +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 8DA68556;\n\tFri, 19 Jun 2020 07:42:10 +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=\"p+VW1rl2\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1592545331;\n\tbh=YxEW6VVufPyBPGSwpSB8itMRgrhhLx4SYQq5aw0s6XE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=p+VW1rl23g5zu8J9jwp7+1nuYMYtJIi4tK33a5uGzVMs+mNlvIWUXUn+AxJl2B68o\n\tkqLlsexAanYpUSZNDZxpMZXZCz0YyED4GgloHROX49uLQvbb72F7316lagTNUrrIa+\n\tbOFluVTlPWfTTPG9FAF7zN73r+Lsym/O93WMU2XA=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 19 Jun 2020 14:41:23 +0900", "Message-Id": "<20200619054123.19052-18-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 17/17] v4l2: v4l2_camera_proxy: Fix\n\tbuffer flags related to queueing", "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:42:12 -0000" }, "content": "Fix buffer flags related to queueing and dequeueing:\n- don't allow a buffer with the same index that is already in the queue\n to be enqueued again\n- don't set the done flag on dequeueing\n- set the mapped flag on enqueueing\n- set the flags in V4L2CameraProxy's internal buffers, and not just in\n the buffers returned from qbuf\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\n---\nNew in v2\n- split from \"Fix v4l2-compliance streaming tests\"\n---\n src/v4l2/v4l2_camera_proxy.cpp | 9 +++++++--\n 1 file changed, 7 insertions(+), 2 deletions(-)", "diff": "diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 2eb2fcc..3e5fb7c 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -221,7 +221,6 @@ void V4L2CameraProxy::updateBuffers()\n \t\t\tbuf.timestamp.tv_usec = fmd.timestamp % 1000000;\n \t\t\tbuf.sequence = fmd.sequence;\n \n-\t\t\tbuf.flags |= V4L2_BUF_FLAG_DONE;\n \t\t\tbreak;\n \t\tcase FrameMetadata::FrameError:\n \t\t\tbuf.flags |= V4L2_BUF_FLAG_ERROR;\n@@ -569,6 +568,9 @@ int V4L2CameraProxy::vidioc_qbuf(V4L2CameraFile *cf, struct v4l2_buffer *arg)\n \tif (arg->index >= bufferCount_)\n \t\treturn -EINVAL;\n \n+\tif (buffers_[arg->index].flags & V4L2_BUF_FLAG_QUEUED)\n+\t\treturn -EINVAL;\n+\n \tint ret = lock(cf);\n \tif (ret < 0)\n \t\treturn ret;\n@@ -582,9 +584,12 @@ int V4L2CameraProxy::vidioc_qbuf(V4L2CameraFile *cf, struct v4l2_buffer *arg)\n \tif (ret < 0)\n \t\treturn ret;\n \n-\targ->flags |= V4L2_BUF_FLAG_QUEUED;\n+\targ->flags |= V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_MAPPED;\n \targ->flags &= ~V4L2_BUF_FLAG_DONE;\n \n+\tbuffers_[arg->index].flags |= V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_MAPPED;\n+\tbuffers_[arg->index].flags &= ~V4L2_BUF_FLAG_DONE;\n+\n \treturn ret;\n }\n \n", "prefixes": [ "libcamera-devel", "v2", "17/17" ] }