Patch Detail
Show a patch.
GET /api/patches/15434/?format=api
{ "id": 15434, "url": "https://patchwork.libcamera.org/api/patches/15434/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15434/", "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": "<20220308091520.34607-3-umang.jain@ideasonboard.com>", "date": "2022-03-08T09:15:20", "name": "[libcamera-devel,2/2] ipa: rkisp1: Replace event-based ops with dedicated functions", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "99bdd3d79a2aaf34ab2fcc0d49b174340a694a80", "submitter": { "id": 86, "url": "https://patchwork.libcamera.org/api/people/86/?format=api", "name": "Umang Jain", "email": "umang.jain@ideasonboard.com" }, "delegate": { "id": 12, "url": "https://patchwork.libcamera.org/api/users/12/?format=api", "username": "uajain", "first_name": "Umang", "last_name": "Jain", "email": "umang.jain@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/15434/mbox/", "series": [ { "id": 2955, "url": "https://patchwork.libcamera.org/api/series/2955/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2955", "date": "2022-03-08T09:15:18", "name": "ipa: rkisp1: Replace event-based ops with dedicated functions", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2955/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15434/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15434/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\r\n\t[92.243.16.209])\r\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id F0AFEBF415\r\n\tfor <parsemail@patchwork.libcamera.org>;\r\n\tTue, 8 Mar 2022 09:15:37 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\r\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 41F376118E;\r\n\tTue, 8 Mar 2022 10:15:37 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\r\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\r\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F123A604E9\r\n\tfor <libcamera-devel@lists.libcamera.org>;\r\n\tTue, 8 Mar 2022 10:15:35 +0100 (CET)", "from perceval.ideasonboard.com (unknown [103.251.226.72])\r\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 11222488;\r\n\tTue, 8 Mar 2022 10:15:34 +0100 (CET)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\r\n\ts=mail; t=1646730937;\r\n\tbh=Zlkww4U0hVCtPNF/Hx756pBPj1vNFkogLkp42673DKk=;\r\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\r\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\r\n\tFrom;\r\n\tb=i5MCS2bm5kYsHfpknd0sn2xS4qJ7HpHh7G8uq9DyiAr5I71/iI10QU4lhqJuyVd46\r\n\tBLjFgSFdM/OqypGsCffyecWZf0zBm3/N7/5pXnxiYXe7ecLUXKARG7lYKFdY577SkX\r\n\tC5SMPtzZdLKU1cmhE7Fb+ur9yKKE4D7xYGS8mug58QnDvTxY9yalbbXHKKvJVoAAg/\r\n\tnaubJNoiL9x8yudX63PrfK8XT7DuPqMf65E7Z3uzv9ojTSYJy2whQeoCRd6tGZWY8m\r\n\thIBzm3607af9TsENSHWH0WZaqXbstcg6G6tEtgPKJesTOcWWDdKRn+mgCoUjl0+7ab\r\n\t6cTXkCua1HeTw==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\r\n\ts=mail; t=1646730935;\r\n\tbh=Zlkww4U0hVCtPNF/Hx756pBPj1vNFkogLkp42673DKk=;\r\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\r\n\tb=aby8VAmh2QIcM9wUMGXEKkCi6RYA5qBpkCIwEXV1iE60AwDV2JNX+6ghTYtsXgElu\r\n\tQeMhWKL4IL75pbgp3qkwfvjmXSnxUX3eK8C9Qu/RTuDkz7SOhhy/7nGkmjXAbpohfn\r\n\tJZau1RFSfCJHjnhtptjv+XMF0lStmXNbIjrbX+KE=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \r\n\tunprotected) header.d=ideasonboard.com\r\n\theader.i=@ideasonboard.com\r\n\theader.b=\"aby8VAmh\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 8 Mar 2022 14:45:20 +0530", "Message-Id": "<20220308091520.34607-3-umang.jain@ideasonboard.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20220308091520.34607-1-umang.jain@ideasonboard.com>", "References": "<20220308091520.34607-1-umang.jain@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 2/2] ipa: rkisp1: Replace event-based ops\r\n\twith dedicated functions", "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>,\r\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>,\r\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Umang Jain via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Umang Jain <umang.jain@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The IPARkISP1Interface currently uses event-type based structures in\norder to communicate with the pipeline-handler (and vice-versa).\nReplace the event based structures with dedicated functions associated\nto each operation.\n\nThe translated naming scheme of operations to dedicated functions:\n ActionV4L2Set => setSensorControls\n ActionParamFilled => paramsBufferReady\n ActionMetadata => statsBufferReady\n EventSignalStatBuffer => processStatsBuffer()\n EventQueueRequest => queueRequest()\n\nSigned-off-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n include/libcamera/ipa/rkisp1.mojom | 31 ++-------\n src/ipa/rkisp1/rkisp1.cpp | 82 +++++++-----------------\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 71 ++++++++------------\n 3 files changed, 56 insertions(+), 128 deletions(-)", "diff": "diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\r\nindex c3a6d8e1..a0b92b84 100644\r\n--- a/include/libcamera/ipa/rkisp1.mojom\r\n+++ b/include/libcamera/ipa/rkisp1.mojom\r\n@@ -8,28 +8,6 @@ module ipa.rkisp1;\r\n \r\n import \"include/libcamera/ipa/core.mojom\";\r\n \r\n-enum RkISP1Operations {\r\n-\tActionV4L2Set = 1,\r\n-\tActionParamFilled = 2,\r\n-\tActionMetadata = 3,\r\n-\tEventSignalStatBuffer = 4,\r\n-\tEventQueueRequest = 5,\r\n-};\r\n-\r\n-struct RkISP1Event {\r\n-\tRkISP1Operations op;\r\n-\tuint32 frame;\r\n-\tuint32 bufferId;\r\n-\tlibcamera.ControlList controls;\r\n-\tlibcamera.ControlList sensorControls;\r\n-};\r\n-\r\n-struct RkISP1Action {\r\n-\tRkISP1Operations op;\r\n-\tlibcamera.ControlList controls;\r\n-\tlibcamera.ControlList sensorControls;\r\n-};\r\n-\r\n interface IPARkISP1Interface {\r\n \tinit(libcamera.IPASettings settings,\r\n \t uint32 hwRevision)\r\n@@ -45,9 +23,14 @@ interface IPARkISP1Interface {\r\n \tmapBuffers(array<libcamera.IPABuffer> buffers);\r\n \tunmapBuffers(array<uint32> ids);\r\n \r\n-\t[async] processEvent(RkISP1Event ev);\r\n+\t[async] queueRequest(uint32 frame, uint32 bufferId,\r\n+\t\t\t libcamera.ControlList reqControls);\r\n+\t[async] processStatsBuffer(uint32 frame, uint32 bufferId,\r\n+\t\t\t\t libcamera.ControlList sensorControls);\r\n };\r\n \r\n interface IPARkISP1EventInterface {\r\n-\tqueueFrameAction(uint32 frame, RkISP1Action action);\r\n+\tparamsBufferReady(uint32 frame);\r\n+\tsetSensorControls(uint32 frame, libcamera.ControlList sensorControls);\r\n+\tstatsBufferReady(uint32 frame, libcamera.ControlList metadata);\r\n };\r\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\r\nindex 129afddd..dc00c1f8 100644\r\n--- a/src/ipa/rkisp1/rkisp1.cpp\r\n+++ b/src/ipa/rkisp1/rkisp1.cpp\r\n@@ -51,14 +51,12 @@ public:\r\n \t\t const std::map<uint32_t, ControlInfoMap> &entityControls) override;\r\n \tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override;\r\n \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override;\r\n-\tvoid processEvent(const RkISP1Event &event) override;\r\n \r\n+\tvoid queueRequest(const uint32_t frame, const uint32_t bufferId,\r\n+\t\t\t const ControlList &controls) override;\r\n+\tvoid processStatsBuffer(const uint32_t frame, const uint32_t bufferId,\r\n+\t\t\t\tconst ControlList &sensorControls) override;\r\n private:\r\n-\tvoid queueRequest(unsigned int frame, rkisp1_params_cfg *params,\r\n-\t\t\t const ControlList &controls);\r\n-\tvoid updateStatistics(unsigned int frame,\r\n-\t\t\t const rkisp1_stat_buffer *stats);\r\n-\r\n \tvoid setControls(unsigned int frame);\r\n \tvoid metadataReady(unsigned int frame, unsigned int aeState);\r\n \r\n@@ -231,60 +229,34 @@ void IPARkISP1::unmapBuffers(const std::vector<unsigned int> &ids)\r\n \t}\r\n }\r\n \r\n-void IPARkISP1::processEvent(const RkISP1Event &event)\r\n-{\r\n-\tswitch (event.op) {\r\n-\tcase EventSignalStatBuffer: {\r\n-\t\tunsigned int frame = event.frame;\r\n-\t\tunsigned int bufferId = event.bufferId;\r\n-\r\n-\t\tconst rkisp1_stat_buffer *stats =\r\n-\t\t\treinterpret_cast<rkisp1_stat_buffer *>(\r\n-\t\t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\r\n-\r\n-\t\tcontext_.frameContext.sensor.exposure =\r\n-\t\t\tevent.sensorControls.get(V4L2_CID_EXPOSURE).get<int32_t>();\r\n-\t\tcontext_.frameContext.sensor.gain =\r\n-\t\t\tcamHelper_->gain(event.sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get<int32_t>());\r\n-\r\n-\t\tupdateStatistics(frame, stats);\r\n-\t\tbreak;\r\n-\t}\r\n-\tcase EventQueueRequest: {\r\n-\t\tunsigned int frame = event.frame;\r\n-\t\tunsigned int bufferId = event.bufferId;\r\n-\r\n-\t\trkisp1_params_cfg *params =\r\n-\t\t\treinterpret_cast<rkisp1_params_cfg *>(\r\n-\t\t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\r\n-\r\n-\t\tqueueRequest(frame, params, event.controls);\r\n-\t\tbreak;\r\n-\t}\r\n-\tdefault:\r\n-\t\tLOG(IPARkISP1, Error) << \"Unknown event \" << event.op;\r\n-\t\tbreak;\r\n-\t}\r\n-}\r\n-\r\n-void IPARkISP1::queueRequest(unsigned int frame, rkisp1_params_cfg *params,\r\n+void IPARkISP1::queueRequest(const uint32_t frame, const uint32_t bufferId,\r\n \t\t\t [[maybe_unused]] const ControlList &controls)\r\n {\r\n+\trkisp1_params_cfg *params =\r\n+\t\treinterpret_cast<rkisp1_params_cfg *>(\r\n+\t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\r\n+\r\n \t/* Prepare parameters buffer. */\r\n \tmemset(params, 0, sizeof(*params));\r\n \r\n \tfor (auto const &algo : algorithms_)\r\n \t\talgo->prepare(context_, params);\r\n \r\n-\tRkISP1Action op;\r\n-\top.op = ActionParamFilled;\r\n-\r\n-\tqueueFrameAction.emit(frame, op);\r\n+\tparamsBufferReady.emit(frame);\r\n }\r\n \r\n-void IPARkISP1::updateStatistics(unsigned int frame,\r\n-\t\t\t\t const rkisp1_stat_buffer *stats)\r\n+void IPARkISP1::processStatsBuffer(const uint32_t frame, const uint32_t bufferId,\r\n+\t\t\t\t const ControlList &sensorControls)\r\n {\r\n+\tconst rkisp1_stat_buffer *stats =\r\n+\t\treinterpret_cast<rkisp1_stat_buffer *>(\r\n+\t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\r\n+\r\n+\tcontext_.frameContext.sensor.exposure =\r\n+\t\tsensorControls.get(V4L2_CID_EXPOSURE).get<int32_t>();\r\n+\tcontext_.frameContext.sensor.gain =\r\n+\t\tcamHelper_->gain(sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get<int32_t>());\r\n+\r\n \tunsigned int aeState = 0;\r\n \r\n \tfor (auto const &algo : algorithms_)\r\n@@ -297,18 +269,14 @@ void IPARkISP1::updateStatistics(unsigned int frame,\r\n \r\n void IPARkISP1::setControls(unsigned int frame)\r\n {\r\n-\tRkISP1Action op;\r\n-\top.op = ActionV4L2Set;\r\n-\r\n \tuint32_t exposure = context_.frameContext.agc.exposure;\r\n \tuint32_t gain = camHelper_->gainCode(context_.frameContext.agc.gain);\r\n \r\n \tControlList ctrls(ctrls_);\r\n \tctrls.set(V4L2_CID_EXPOSURE, static_cast<int32_t>(exposure));\r\n \tctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast<int32_t>(gain));\r\n-\top.sensorControls = ctrls;\r\n \r\n-\tqueueFrameAction.emit(frame, op);\r\n+\tsetSensorControls.emit(frame, ctrls);\r\n }\r\n \r\n void IPARkISP1::metadataReady(unsigned int frame, unsigned int aeState)\r\n@@ -318,11 +286,7 @@ void IPARkISP1::metadataReady(unsigned int frame, unsigned int aeState)\r\n \tif (aeState)\r\n \t\tctrls.set(controls::AeLocked, aeState == 2);\r\n \r\n-\tRkISP1Action op;\r\n-\top.op = ActionMetadata;\r\n-\top.controls = ctrls;\r\n-\r\n-\tqueueFrameAction.emit(frame, op);\r\n+\tstatsBufferReady.emit(frame, ctrls);\r\n }\r\n \r\n } /* namespace ipa::rkisp1 */\r\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\r\nindex 8cca8a15..d395e335 100644\r\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\r\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\r\n@@ -104,8 +104,9 @@ public:\r\n \tstd::unique_ptr<ipa::rkisp1::IPAProxyRkISP1> ipa_;\r\n \r\n private:\r\n-\tvoid queueFrameAction(unsigned int frame,\r\n-\t\t\t const ipa::rkisp1::RkISP1Action &action);\r\n+\tvoid paramFilled(unsigned int frame);\r\n+\tvoid setSensorControls(unsigned int frame,\r\n+\t\t\t const ControlList &sensorControls);\r\n \r\n \tvoid metadataReady(unsigned int frame, const ControlList &metadata);\r\n };\r\n@@ -316,8 +317,9 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\r\n \tif (!ipa_)\r\n \t\treturn -ENOENT;\r\n \r\n-\tipa_->queueFrameAction.connect(this,\r\n-\t\t\t\t &RkISP1CameraData::queueFrameAction);\r\n+\tipa_->setSensorControls.connect(this, &RkISP1CameraData::setSensorControls);\r\n+\tipa_->paramsBufferReady.connect(this, &RkISP1CameraData::paramFilled);\r\n+\tipa_->statsBufferReady.connect(this, &RkISP1CameraData::metadataReady);\r\n \r\n \tint ret = ipa_->init(IPASettings{ \"\", sensor_->model() }, hwRevision);\r\n \tif (ret < 0) {\r\n@@ -328,39 +330,27 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\r\n \treturn 0;\r\n }\r\n \r\n-void RkISP1CameraData::queueFrameAction(unsigned int frame,\r\n-\t\t\t\t\tconst ipa::rkisp1::RkISP1Action &action)\r\n+void RkISP1CameraData::paramFilled(unsigned int frame)\r\n {\r\n-\tswitch (action.op) {\r\n-\tcase ipa::rkisp1::ActionV4L2Set: {\r\n-\t\tconst ControlList &controls = action.sensorControls;\r\n-\t\tdelayedCtrls_->push(controls);\r\n-\t\tbreak;\r\n-\t}\r\n-\tcase ipa::rkisp1::ActionParamFilled: {\r\n-\t\tPipelineHandlerRkISP1 *pipe = RkISP1CameraData::pipe();\r\n-\t\tRkISP1FrameInfo *info = frameInfo_.find(frame);\r\n-\t\tif (!info)\r\n-\t\t\tbreak;\r\n+\tPipelineHandlerRkISP1 *pipe = RkISP1CameraData::pipe();\r\n+\tRkISP1FrameInfo *info = frameInfo_.find(frame);\r\n+\tif (!info)\r\n+\t\treturn;\r\n \r\n-\t\tpipe->param_->queueBuffer(info->paramBuffer);\r\n-\t\tpipe->stat_->queueBuffer(info->statBuffer);\r\n+\tpipe->param_->queueBuffer(info->paramBuffer);\r\n+\tpipe->stat_->queueBuffer(info->statBuffer);\r\n \r\n-\t\tif (info->mainPathBuffer)\r\n-\t\t\tmainPath_->queueBuffer(info->mainPathBuffer);\r\n+\tif (info->mainPathBuffer)\r\n+\t\tmainPath_->queueBuffer(info->mainPathBuffer);\r\n \r\n-\t\tif (info->selfPathBuffer)\r\n-\t\t\tselfPath_->queueBuffer(info->selfPathBuffer);\r\n+\tif (info->selfPathBuffer)\r\n+\t\tselfPath_->queueBuffer(info->selfPathBuffer);\r\n+}\r\n \r\n-\t\tbreak;\r\n-\t}\r\n-\tcase ipa::rkisp1::ActionMetadata:\r\n-\t\tmetadataReady(frame, action.controls);\r\n-\t\tbreak;\r\n-\tdefault:\r\n-\t\tLOG(RkISP1, Error) << \"Unknown action \" << action.op;\r\n-\t\tbreak;\r\n-\t}\r\n+void RkISP1CameraData::setSensorControls([[maybe_unused]] unsigned int frame,\r\n+\t\t\t\t\t const ControlList &sensorControls)\r\n+{\r\n+\tdelayedCtrls_->push(sensorControls);\r\n }\r\n \r\n void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &metadata)\r\n@@ -865,13 +855,8 @@ int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera, Request *request)\r\n \tif (!info)\r\n \t\treturn -ENOENT;\r\n \r\n-\tipa::rkisp1::RkISP1Event ev;\r\n-\tev.op = ipa::rkisp1::EventQueueRequest;\r\n-\tev.frame = data->frame_;\r\n-\tev.bufferId = info->paramBuffer->cookie();\r\n-\tev.controls = request->controls();\r\n-\tdata->ipa_->processEvent(ev);\r\n-\r\n+\tdata->ipa_->queueRequest(data->frame_, info->paramBuffer->cookie(),\r\n+\t\t\t\t request->controls());\r\n \tdata->frame_++;\r\n \r\n \treturn 0;\r\n@@ -1120,12 +1105,8 @@ void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer)\r\n \tif (data->frame_ <= buffer->metadata().sequence)\r\n \t\tdata->frame_ = buffer->metadata().sequence + 1;\r\n \r\n-\tipa::rkisp1::RkISP1Event ev;\r\n-\tev.op = ipa::rkisp1::EventSignalStatBuffer;\r\n-\tev.frame = info->frame;\r\n-\tev.bufferId = info->statBuffer->cookie();\r\n-\tev.sensorControls = data->delayedCtrls_->get(buffer->metadata().sequence);\r\n-\tdata->ipa_->processEvent(ev);\r\n+\tdata->ipa_->processStatsBuffer(info->frame, info->statBuffer->cookie(),\r\n+\t\t\t\t data->delayedCtrls_->get(buffer->metadata().sequence));\r\n }\r\n \r\n REGISTER_PIPELINE_HANDLER(PipelineHandlerRkISP1)", "prefixes": [ "libcamera-devel", "2/2" ] }