Patch Detail
Show a patch.
GET /api/patches/10338/?format=api
{ "id": 10338, "url": "https://patchwork.libcamera.org/api/patches/10338/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10338/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20201105001546.1690179-2-niklas.soderlund@ragnatech.se>", "date": "2020-11-05T00:15:36", "name": "[libcamera-devel,01/11] libcamera: pipeline_handler: Remove Camera argument from request handling", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "def13a09d140a2e0894e8eb622506e6a129cce35", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": { "id": 16, "url": "https://patchwork.libcamera.org/api/users/16/?format=api", "username": "neg", "first_name": "Niklas", "last_name": "Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "mbox": "https://patchwork.libcamera.org/patch/10338/mbox/", "series": [ { "id": 1447, "url": "https://patchwork.libcamera.org/api/series/1447/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1447", "date": "2020-11-05T00:15:35", "name": "libcamera: ipu3: Attach to an skeleton IPA", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1447/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10338/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10338/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 DEA6ABE081\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 5 Nov 2020 00:16:13 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 14E2462CA3;\n\tThu, 5 Nov 2020 01:16:13 +0100 (CET)", "from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3D11B62C7D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 5 Nov 2020 01:16:12 +0100 (CET)", "from bismarck.berto.se (p4fca2458.dip0.t-ipconnect.de\n\t[79.202.36.88])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 688917b5-1efa-11eb-8a9c-005056917a89;\n\tThu, 05 Nov 2020 01:04:01 +0100 (CET)" ], "X-Halon-ID": "688917b5-1efa-11eb-8a9c-005056917a89", "Authorized-sender": "niklas.soderlund@fsdn.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 5 Nov 2020 01:15:36 +0100", "Message-Id": "<20201105001546.1690179-2-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.29.2", "In-Reply-To": "<20201105001546.1690179-1-niklas.soderlund@ragnatech.se>", "References": "<20201105001546.1690179-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 01/11] libcamera: pipeline_handler: Remove\n\tCamera argument from request handling", "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>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "There is no need to pass the Camera pointer to queueRequest(),\ncompleteBuffer() and completeRequest() as the Request also passed\ncontains the same information. Remove the Camera argument to avoid\nsituations where the information in the Request and the argument differ.\n\nThere is no functional change and no public API change as the interface\nis only used between the Camera and PipelineHandler.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n include/libcamera/internal/pipeline_handler.h | 7 +++----\n src/libcamera/camera.cpp | 2 +-\n src/libcamera/pipeline/ipu3/ipu3.cpp | 8 ++++----\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 8 ++++----\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 ++---\n src/libcamera/pipeline/simple/simple.cpp | 12 ++++++------\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 4 ++--\n src/libcamera/pipeline/vimc/vimc.cpp | 4 ++--\n src/libcamera/pipeline_handler.cpp | 14 +++++++-------\n 9 files changed, 31 insertions(+), 33 deletions(-)", "diff": "diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex c12c8904858e7536..ca1997bc0771b139 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -81,11 +81,10 @@ public:\n \tvirtual int start(Camera *camera) = 0;\n \tvirtual void stop(Camera *camera) = 0;\n \n-\tint queueRequest(Camera *camera, Request *request);\n+\tint queueRequest(Request *request);\n \n-\tbool completeBuffer(Camera *camera, Request *request,\n-\t\t\t FrameBuffer *buffer);\n-\tvoid completeRequest(Camera *camera, Request *request);\n+\tbool completeBuffer(Request *request, FrameBuffer *buffer);\n+\tvoid completeRequest(Request *request);\n \n \tconst char *name() const { return name_; }\n \ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 9590ab7249d39e2f..f868161f2a620264 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -914,7 +914,7 @@ int Camera::queueRequest(Request *request)\n \t}\n \n \treturn p_->pipe_->invokeMethod(&PipelineHandler::queueRequest,\n-\t\t\t\t ConnectionTypeQueued, this, request);\n+\t\t\t\t ConnectionTypeQueued, request);\n }\n \n /**\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 5a6ee1a83e45ff75..3f0232bc1eaad048 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -836,13 +836,13 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n {\n \tRequest *request = buffer->request();\n \n-\tif (!pipe_->completeBuffer(camera_, request, buffer))\n+\tif (!pipe_->completeBuffer(request, buffer))\n \t\t/* Request not completed yet, return here. */\n \t\treturn;\n \n \t/* Mark the request as complete. */\n \trequest->metadata().set(controls::draft::PipelineDepth, 3);\n-\tpipe_->completeRequest(camera_, request);\n+\tpipe_->completeRequest(request);\n }\n \n /**\n@@ -865,10 +865,10 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n \t * now as there's no need for ImgU processing.\n \t */\n \tif (request->findBuffer(&rawStream_)) {\n-\t\tbool isComplete = pipe_->completeBuffer(camera_, request, buffer);\n+\t\tbool isComplete = pipe_->completeBuffer(request, buffer);\n \t\tif (isComplete) {\n \t\t\trequest->metadata().set(controls::draft::PipelineDepth, 2);\n-\t\t\tpipe_->completeRequest(camera_, request);\n+\t\t\tpipe_->completeRequest(request);\n \t\t\treturn;\n \t\t}\n \t}\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 220b9c51849662f3..630b876985459d2f 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -1463,10 +1463,10 @@ void RPiCameraData::clearIncompleteRequests()\n \t\t\t * request? If not, do so now.\n \t\t\t */\n \t\t\tif (buffer && buffer->request())\n-\t\t\t\tpipe_->completeBuffer(camera_, request, buffer);\n+\t\t\t\tpipe_->completeBuffer(request, buffer);\n \t\t}\n \n-\t\tpipe_->completeRequest(camera_, request);\n+\t\tpipe_->completeRequest(request);\n \t\trequestQueue_.pop_front();\n \t}\n }\n@@ -1490,7 +1490,7 @@ void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n \t\t\t * Tag the buffer as completed, returning it to the\n \t\t\t * application.\n \t\t\t */\n-\t\t\tpipe_->completeBuffer(camera_, request, buffer);\n+\t\t\tpipe_->completeBuffer(request, buffer);\n \t\t} else {\n \t\t\t/*\n \t\t\t * This buffer was not part of the Request, or there is no\n@@ -1554,7 +1554,7 @@ void RPiCameraData::checkRequestCompleted()\n \t\tif (state_ != State::IpaComplete)\n \t\t\treturn;\n \n-\t\tpipe_->completeRequest(camera_, request);\n+\t\tpipe_->completeRequest(request);\n \t\trequestQueue_.pop_front();\n \t\trequestCompleted = true;\n \t}\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 424099d087528fb1..70a10853bf83b6a5 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -1042,15 +1042,14 @@ void PipelineHandlerRkISP1::tryCompleteRequest(Request *request)\n \n \tdata->frameInfo_.destroy(info->frame);\n \n-\tcompleteRequest(activeCamera_, request);\n+\tcompleteRequest(request);\n }\n \n void PipelineHandlerRkISP1::bufferReady(FrameBuffer *buffer)\n {\n-\tASSERT(activeCamera_);\n \tRequest *request = buffer->request();\n \n-\tcompleteBuffer(activeCamera_, request, buffer);\n+\tcompleteBuffer(request, buffer);\n \ttryCompleteRequest(request);\n }\n \ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 3d2039f3f26951bf..dc55304fc6ebb202 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -903,8 +903,8 @@ void SimplePipelineHandler::bufferReady(FrameBuffer *buffer)\n \t\t}\n \n \t\tRequest *request = buffer->request();\n-\t\tcompleteBuffer(activeCamera_, request, buffer);\n-\t\tcompleteRequest(activeCamera_, request);\n+\t\tcompleteBuffer(request, buffer);\n+\t\tcompleteRequest(request);\n \t\treturn;\n \t}\n \n@@ -928,8 +928,8 @@ void SimplePipelineHandler::bufferReady(FrameBuffer *buffer)\n \n \t/* Otherwise simply complete the request. */\n \tRequest *request = buffer->request();\n-\tcompleteBuffer(activeCamera_, request, buffer);\n-\tcompleteRequest(activeCamera_, request);\n+\tcompleteBuffer(request, buffer);\n+\tcompleteRequest(request);\n }\n \n void SimplePipelineHandler::converterDone(FrameBuffer *input,\n@@ -940,8 +940,8 @@ void SimplePipelineHandler::converterDone(FrameBuffer *input,\n \n \t/* Complete the request. */\n \tRequest *request = output->request();\n-\tcompleteBuffer(activeCamera_, request, output);\n-\tcompleteRequest(activeCamera_, request);\n+\tcompleteBuffer(request, output);\n+\tcompleteRequest(request);\n \n \t/* Queue the input buffer back for capture. */\n \tdata->video_->queueBuffer(input);\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 3862631b7bedf604..272e4c6bf50e82e4 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -650,8 +650,8 @@ void UVCCameraData::bufferReady(FrameBuffer *buffer)\n {\n \tRequest *request = buffer->request();\n \n-\tpipe_->completeBuffer(camera_, request, buffer);\n-\tpipe_->completeRequest(camera_, request);\n+\tpipe_->completeBuffer(request, buffer);\n+\tpipe_->completeRequest(request);\n }\n \n REGISTER_PIPELINE_HANDLER(PipelineHandlerUVC)\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 7416c37c6f5a243c..99b0fa2742269147 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -529,8 +529,8 @@ void VimcCameraData::bufferReady(FrameBuffer *buffer)\n {\n \tRequest *request = buffer->request();\n \n-\tpipe_->completeBuffer(camera_, request, buffer);\n-\tpipe_->completeRequest(camera_, request);\n+\tpipe_->completeBuffer(request, buffer);\n+\tpipe_->completeRequest(request);\n }\n \n REGISTER_PIPELINE_HANDLER(PipelineHandlerVimc)\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 894200ee4e936735..e60b962d66183e19 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -376,7 +376,6 @@ const ControlList &PipelineHandler::properties(const Camera *camera) const\n /**\n * \\fn PipelineHandler::queueRequest()\n * \\brief Queue a request to the camera\n- * \\param[in] camera The camera to queue the request to\n * \\param[in] request The request to queue\n *\n * This method queues a capture request to the pipeline handler for processing.\n@@ -391,8 +390,9 @@ const ControlList &PipelineHandler::properties(const Camera *camera) const\n *\n * \\return 0 on success or a negative error code otherwise\n */\n-int PipelineHandler::queueRequest(Camera *camera, Request *request)\n+int PipelineHandler::queueRequest(Request *request)\n {\n+\tCamera *camera = request->camera_;\n \tCameraData *data = cameraData(camera);\n \tdata->queuedRequests_.push_back(request);\n \n@@ -422,7 +422,6 @@ int PipelineHandler::queueRequest(Camera *camera, Request *request)\n \n /**\n * \\brief Complete a buffer for a request\n- * \\param[in] camera The camera the request belongs to\n * \\param[in] request The request the buffer belongs to\n * \\param[in] buffer The buffer that has completed\n *\n@@ -438,16 +437,15 @@ int PipelineHandler::queueRequest(Camera *camera, Request *request)\n * \\return True if all buffers contained in the request have completed, false\n * otherwise\n */\n-bool PipelineHandler::completeBuffer(Camera *camera, Request *request,\n-\t\t\t\t FrameBuffer *buffer)\n+bool PipelineHandler::completeBuffer(Request *request, FrameBuffer *buffer)\n {\n+\tCamera *camera = request->camera_;\n \tcamera->bufferCompleted.emit(request, buffer);\n \treturn request->completeBuffer(buffer);\n }\n \n /**\n * \\brief Signal request completion\n- * \\param[in] camera The camera that the request belongs to\n * \\param[in] request The request that has completed\n *\n * The pipeline handler shall call this method to notify the \\a camera that the\n@@ -460,8 +458,10 @@ bool PipelineHandler::completeBuffer(Camera *camera, Request *request,\n *\n * \\context This function shall be called from the CameraManager thread.\n */\n-void PipelineHandler::completeRequest(Camera *camera, Request *request)\n+void PipelineHandler::completeRequest(Request *request)\n {\n+\tCamera *camera = request->camera_;\n+\n \trequest->complete();\n \n \tCameraData *data = cameraData(camera);\n", "prefixes": [ "libcamera-devel", "01/11" ] }