Patch Detail
Show a patch.
GET /api/patches/19479/?format=api
{ "id": 19479, "url": "https://patchwork.libcamera.org/api/patches/19479/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19479/", "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": "<20240212153532.179283-3-dan.scally@ideasonboard.com>", "date": "2024-02-12T15:35:29", "name": "[2/5] libcamera: rkisp1: Standardise frame number tracking", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": true, "hash": "6e479af908a770987ca4701168a24d95264054e2", "submitter": { "id": 156, "url": "https://patchwork.libcamera.org/api/people/156/?format=api", "name": "Dan Scally", "email": "dan.scally@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19479/mbox/", "series": [ { "id": 4166, "url": "https://patchwork.libcamera.org/api/series/4166/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4166", "date": "2024-02-12T15:35:27", "name": "Remove RkISP1FrameInfo class", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4166/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19479/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19479/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 C7C2EBDE17\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 12 Feb 2024 15:35:48 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5F04662812;\n\tMon, 12 Feb 2024 16:35:46 +0100 (CET)", "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 E2C2A61CB6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 12 Feb 2024 16:35:43 +0100 (CET)", "from mail.ideasonboard.com\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 38C7E2D8;\n\tMon, 12 Feb 2024 16:35:42 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"TeH0KGyT\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1707752142;\n\tbh=urcbygLaPvl5pQyS4StU6jBzQQkXgldSc3sRRNYbzaE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=TeH0KGyTgHupZP+NKwxts3n1uyduLcXw0sUtJD8yH7AW6Kuu4sv3TdtxOI07ST0vL\n\tX5q8zLIOsrNkd2cVqciTLyr6D7MbrBOvDHekSTch1ZcYKsTKW6UgozJVQRNSWm/9k6\n\tOuzLYX12vH1q3EAoOn8BmqpojvPqc7B02IvsWUCE=", "From": "Daniel Scally <dan.scally@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[PATCH 2/5] libcamera: rkisp1: Standardise frame number tracking", "Date": "Mon, 12 Feb 2024 15:35:29 +0000", "Message-Id": "<20240212153532.179283-3-dan.scally@ideasonboard.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20240212153532.179283-1-dan.scally@ideasonboard.com>", "References": "<20240212153532.179283-1-dan.scally@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The rkisp1 driver uses a couple of different methods of tracking the\nnumber of the frame - standardise them on request->sequence() and\nremove the frame_ member of RkISP1CameraData which was being used to\ndo the job.\n\nSigned-off-by: Daniel Scally <dan.scally@ideasonboard.com>\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 25 ++++++++++--------------\n 1 file changed, 10 insertions(+), 15 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 5460dc11..22e553fe 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -87,7 +87,7 @@ class RkISP1CameraData : public Camera::Private\n public:\n \tRkISP1CameraData(PipelineHandler *pipe, RkISP1MainPath *mainPath,\n \t\t\t RkISP1SelfPath *selfPath)\n-\t\t: Camera::Private(pipe), frame_(0), frameInfo_(pipe),\n+\t\t: Camera::Private(pipe), frameInfo_(pipe),\n \t\t mainPath_(mainPath), selfPath_(selfPath)\n \t{\n \t}\n@@ -99,7 +99,6 @@ public:\n \tStream selfPathStream_;\n \tstd::unique_ptr<CameraSensor> sensor_;\n \tstd::unique_ptr<DelayedControls> delayedCtrls_;\n-\tunsigned int frame_;\n \tstd::vector<IPABuffer> ipaBuffers_;\n \tRkISP1Frames frameInfo_;\n \n@@ -212,7 +211,7 @@ RkISP1Frames::RkISP1Frames(PipelineHandler *pipe)\n RkISP1FrameInfo *RkISP1Frames::create(const RkISP1CameraData *data, Request *request,\n \t\t\t\t bool isRaw)\n {\n-\tunsigned int frame = data->frame_;\n+\tunsigned int frame = request->sequence();\n \n \tFrameBuffer *paramBuffer = nullptr;\n \tFrameBuffer *statBuffer = nullptr;\n@@ -233,6 +232,7 @@ RkISP1FrameInfo *RkISP1Frames::create(const RkISP1CameraData *data, Request *req\n \n \t\tstatBuffer = pipe_->availableStatBuffers_.front();\n \t\tpipe_->availableStatBuffers_.pop();\n+\t\tstatBuffer->_d()->setRequest(request);\n \t}\n \n \tFrameBuffer *mainPathBuffer = request->findBuffer(&data->mainPathStream_);\n@@ -932,8 +932,6 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlL\n \t\treturn ret;\n \t}\n \n-\tdata->frame_ = 0;\n-\n \tif (!isRaw_) {\n \t\tret = param_->streamOn();\n \t\tif (ret) {\n@@ -1025,7 +1023,7 @@ int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera, Request *request)\n \tif (!info)\n \t\treturn -ENOENT;\n \n-\tdata->ipa_->queueRequest(data->frame_, request->controls());\n+\tdata->ipa_->queueRequest(request->sequence(), request->controls());\n \tif (isRaw_) {\n \t\tif (info->mainPathBuffer)\n \t\t\tdata->mainPath_->queueBuffer(info->mainPathBuffer);\n@@ -1033,12 +1031,10 @@ int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera, Request *request)\n \t\tif (data->selfPath_ && info->selfPathBuffer)\n \t\t\tdata->selfPath_->queueBuffer(info->selfPathBuffer);\n \t} else {\n-\t\tdata->ipa_->fillParamsBuffer(data->frame_,\n+\t\tdata->ipa_->fillParamsBuffer(request->sequence(),\n \t\t\t\t\t info->paramBuffer->cookie());\n \t}\n \n-\tdata->frame_++;\n-\n \treturn 0;\n }\n \n@@ -1269,7 +1265,8 @@ void PipelineHandlerRkISP1::bufferReady(FrameBuffer *buffer)\n \t\tif (isRaw_) {\n \t\t\tconst ControlList &ctrls =\n \t\t\t\tdata->delayedCtrls_->get(metadata.sequence);\n-\t\t\tdata->ipa_->processStatsBuffer(info->frame, 0, ctrls);\n+\t\t\tdata->ipa_->processStatsBuffer(request->sequence(),\n+\t\t\t\t\t\t 0, ctrls);\n \t\t}\n \t} else {\n \t\tif (isRaw_)\n@@ -1284,6 +1281,7 @@ void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer)\n {\n \tASSERT(activeCamera_);\n \tRkISP1CameraData *data = cameraData(activeCamera_);\n+\tRequest *request = buffer->request();\n \n \tRkISP1FrameInfo *info = data->frameInfo_.find(buffer);\n \tif (!info)\n@@ -1295,11 +1293,8 @@ void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer)\n \t\treturn;\n \t}\n \n-\tif (data->frame_ <= buffer->metadata().sequence)\n-\t\tdata->frame_ = buffer->metadata().sequence + 1;\n-\n-\tdata->ipa_->processStatsBuffer(info->frame, info->statBuffer->cookie(),\n-\t\t\t\t data->delayedCtrls_->get(buffer->metadata().sequence));\n+\tdata->ipa_->processStatsBuffer(request->sequence(), info->statBuffer->cookie(),\n+\t\t\t\t data->delayedCtrls_->get(request->sequence()));\n }\n \n REGISTER_PIPELINE_HANDLER(PipelineHandlerRkISP1)\n", "prefixes": [ "2/5" ] }