{"id":12810,"url":"https://patchwork.libcamera.org/api/patches/12810/?format=json","web_url":"https://patchwork.libcamera.org/patch/12810/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210705182434.1034556-1-nfraprado@collabora.com>","date":"2021-07-05T18:24:34","name":"[libcamera-devel,v2] libcamera: pipeline: uvcvideo: Add internal request queue","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2fb006bd26cd41bd875bca0be4cf71a974689abb","submitter":{"id":84,"url":"https://patchwork.libcamera.org/api/people/84/?format=json","name":"Nícolas F. R. A. Prado","email":"nfraprado@collabora.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12810/mbox/","series":[{"id":2210,"url":"https://patchwork.libcamera.org/api/series/2210/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2210","date":"2021-07-05T18:24:34","name":"[libcamera-devel,v2] libcamera: pipeline: uvcvideo: Add internal request queue","version":2,"mbox":"https://patchwork.libcamera.org/series/2210/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12810/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12810/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id CBA95BD794\n\tfor ;\n\tMon, 5 Jul 2021 18:25:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 36FD8684F9;\n\tMon, 5 Jul 2021 20:25:23 +0200 (CEST)","from bhuna.collabora.co.uk (bhuna.collabora.co.uk\n\t[IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 88D2C6050A\n\tfor ;\n\tMon, 5 Jul 2021 20:25:22 +0200 (CEST)","from localhost.localdomain (unknown\n\t[IPv6:2804:14c:1a9:2434:6553:ad0c:9d2a:24db])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits))\n\t(No client certificate requested) (Authenticated sender: nfraprado)\n\tby bhuna.collabora.co.uk (Postfix) with ESMTPSA id EEF0E1F42D55;\n\tMon, 5 Jul 2021 19:25:20 +0100 (BST)"],"From":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 5 Jul 2021 15:24:34 -0300","Message-Id":"<20210705182434.1034556-1-nfraprado@collabora.com>","X-Mailer":"git-send-email 2.32.0","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2] libcamera: pipeline: uvcvideo: Add\n\tinternal request queue","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kernel@collabora.com, =?utf-8?q?Andr=C3=A9_Almeida?=\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add an internal queue that stores requests until there are v4l2 buffer\nslots available. This avoids the need to cancel requests when there is a\nshortage of said buffers.\n\nSigned-off-by: Nícolas F. R. A. Prado \n---\nChanges in v2:\n- Thanks to Jacopo:\n - Added missing call to cancelPendingRequests() in stop()\n\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 65 +++++++++++++++++---\n 1 file changed, 55 insertions(+), 10 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 0f634b8da609..ee03b7ed7a7d 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -10,6 +10,7 @@\n #include \n #include \n #include \n+#include \n #include \n \n #include \n@@ -45,6 +46,11 @@ public:\n \t\t\tControlInfoMap::Map *ctrls);\n \tvoid bufferReady(FrameBuffer *buffer);\n \n+\tvoid queuePendingRequests();\n+\tvoid cancelPendingRequests();\n+\n+\tstd::queue pendingRequests_;\n+\n \tstd::unique_ptr video_;\n \tStream stream_;\n };\n@@ -79,12 +85,13 @@ public:\n \n \tbool match(DeviceEnumerator *enumerator) override;\n \n+\tint processControls(UVCCameraData *data, Request *request);\n+\n private:\n \tstd::string generateId(const UVCCameraData *data);\n \n \tint processControl(ControlList *controls, unsigned int id,\n \t\t\t const ControlValue &value);\n-\tint processControls(UVCCameraData *data, Request *request);\n \n \tUVCCameraData *cameraData(const Camera *camera)\n \t{\n@@ -253,6 +260,7 @@ int PipelineHandlerUVC::start(Camera *camera, [[maybe_unused]] const ControlList\n void PipelineHandlerUVC::stop(Camera *camera)\n {\n \tUVCCameraData *data = cameraData(camera);\n+\tdata->cancelPendingRequests();\n \tdata->video_->streamOff();\n \tdata->video_->releaseBuffers();\n }\n@@ -363,24 +371,59 @@ int PipelineHandlerUVC::processControls(UVCCameraData *data, Request *request)\n \treturn ret;\n }\n \n+void UVCCameraData::cancelPendingRequests()\n+{\n+\twhile (!pendingRequests_.empty()) {\n+\t\tRequest *request = pendingRequests_.front();\n+\t\tFrameBuffer *buffer = request->findBuffer(&stream_);\n+\n+\t\tbuffer->cancel();\n+\t\tpipe_->completeBuffer(request, buffer);\n+\t\tpipe_->completeRequest(request);\n+\n+\t\tpendingRequests_.pop();\n+\t}\n+}\n+\n+void UVCCameraData::queuePendingRequests()\n+{\n+\tPipelineHandlerUVC *pipe = static_cast(pipe_);\n+\n+\twhile (!pendingRequests_.empty()) {\n+\t\tRequest *request = pendingRequests_.front();\n+\t\tFrameBuffer *buffer = request->findBuffer(&stream_);\n+\n+\t\tint ret = pipe->processControls(this, request);\n+\t\tif (ret < 0) {\n+\t\t\tbuffer->cancel();\n+\t\t\tpipe_->completeBuffer(request, buffer);\n+\t\t\tpipe_->completeRequest(request);\n+\t\t\tpendingRequests_.pop();\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\t/* If we're missing v4l2 buffer slots, try again later */\n+\t\tret = video_->queueBuffer(buffer);\n+\t\tif (ret < 0)\n+\t\t\tbreak;\n+\n+\t\tpendingRequests_.pop();\n+\t}\n+}\n+\n int PipelineHandlerUVC::queueRequestDevice(Camera *camera, Request *request)\n {\n \tUVCCameraData *data = cameraData(camera);\n-\tFrameBuffer *buffer = request->findBuffer(&data->stream_);\n-\tif (!buffer) {\n+\n+\tif (!request->findBuffer(&data->stream_)) {\n \t\tLOG(UVC, Error)\n \t\t\t<< \"Attempt to queue request with invalid stream\";\n \n \t\treturn -ENOENT;\n \t}\n \n-\tint ret = processControls(data, request);\n-\tif (ret < 0)\n-\t\treturn ret;\n-\n-\tret = data->video_->queueBuffer(buffer);\n-\tif (ret < 0)\n-\t\treturn ret;\n+\tdata->pendingRequests_.push(request);\n+\tdata->queuePendingRequests();\n \n \treturn 0;\n }\n@@ -668,6 +711,8 @@ void UVCCameraData::bufferReady(FrameBuffer *buffer)\n \n \tpipe_->completeBuffer(request, buffer);\n \tpipe_->completeRequest(request);\n+\n+\tqueuePendingRequests();\n }\n \n REGISTER_PIPELINE_HANDLER(PipelineHandlerUVC)\n","prefixes":["libcamera-devel","v2"]}