Patch Detail
Show a patch.
GET /api/1.1/patches/15423/?format=api
{ "id": 15423, "url": "https://patchwork.libcamera.org/api/1.1/patches/15423/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15423/", "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": "<20220305190550.1051708-3-umang.jain@ideasonboard.com>", "date": "2022-03-05T19:05:50", "name": "[libcamera-devel,IPAIPU3,2/2] ipu3: Use the new IPAIPU3 interface", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "f2e3f12b4c8e378f1f8a08d1d70db644a0161a10", "submitter": { "id": 86, "url": "https://patchwork.libcamera.org/api/1.1/people/86/?format=api", "name": "Umang Jain", "email": "umang.jain@ideasonboard.com" }, "delegate": { "id": 12, "url": "https://patchwork.libcamera.org/api/1.1/users/12/?format=api", "username": "uajain", "first_name": "Umang", "last_name": "Jain", "email": "umang.jain@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/15423/mbox/", "series": [ { "id": 2952, "url": "https://patchwork.libcamera.org/api/1.1/series/2952/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2952", "date": "2022-03-05T19:05:48", "name": "ipa: ipu3: Replace event-based ops with dedicated functions", "version": 2, "mbox": "https://patchwork.libcamera.org/series/2952/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15423/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15423/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 DC0BEBE08A\r\n\tfor <parsemail@patchwork.libcamera.org>;\r\n\tSat, 5 Mar 2022 19:06:06 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\r\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 949D5604EC;\r\n\tSat, 5 Mar 2022 20:06:06 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\r\n\t[213.167.242.64])\r\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3E90A604EC\r\n\tfor <libcamera-devel@lists.libcamera.org>;\r\n\tSat, 5 Mar 2022 20:06:04 +0100 (CET)", "from perceval.ideasonboard.com (unknown [103.251.226.47])\r\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C2337488;\r\n\tSat, 5 Mar 2022 20:06:02 +0100 (CET)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\r\n\ts=mail; t=1646507166;\r\n\tbh=mLNfd7Fg64N1zCNn6YUsO20UGr3udq7Oc1+U1A4OL5I=;\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=T64zaKtYEohcYagNjsRI7+gg87BVlQPZi54lOMk/FPO29BfRFEIwpo5b+476L0r0N\r\n\tTewYb3j7qX/nj7wPRFObfW2muWEKd9j3UQhw38c3pc5w4b3qQP6/CBeySKxX8CSG3c\r\n\tdnAd5gS8IKZ25qE35UMeFkmb3CSKGGXX1MmM6K8jdsFCf9GQiV7t0L3ddf/KooB2xd\r\n\t7YZM8GREXR8Ck3IPHjxGS1aNDHwNoQ7SSuKuQez2MRJjqPZuqMfOTqVimYwChQd4bV\r\n\tqtZIb0Xj34CzWxWfhoZ3uin3tLB0UsVF1G59u6Nw6grsJF2yIkxcAtrVH+l6C8d/kH\r\n\tjk7DcLvvI+mBQ==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\r\n\ts=mail; t=1646507163;\r\n\tbh=mLNfd7Fg64N1zCNn6YUsO20UGr3udq7Oc1+U1A4OL5I=;\r\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\r\n\tb=ZPsmfSamSOMllxRvQFLiUN3LqpYBy67bRsMrA9OAeV7a2grMJ22xXKysGA3M5UtDu\r\n\t0G3JVvqpBPv3HhW7N7imGI2dfsWPtzMeonMoLketXf99vFmjVDH1Xjs7EghTbxOUT0\r\n\t1Z4m0KVWBthEWc4iuTyGkczwVLsUAADqMhj9gcF4=" ], "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=\"ZPsmfSam\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sun, 6 Mar 2022 00:35:50 +0530", "Message-Id": "<20220305190550.1051708-3-umang.jain@ideasonboard.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20220305190550.1051708-1-umang.jain@ideasonboard.com>", "References": "<20220305190550.1051708-1-umang.jain@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [IPAIPU3 PATCH 2/2] ipu3: Use the new IPAIPU3\r\n\tinterface", "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": "Use the new IPAIPU3 interface that migrates the event-based ops\nto dedication functions.\n\nSigned-off-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n ipu3.cpp | 108 +++++++++++++++++++++++--------------------------------\n 1 file changed, 45 insertions(+), 63 deletions(-)", "diff": "diff --git a/ipu3.cpp b/ipu3.cpp\r\nindex 6ab86e0..b0f2b21 100644\r\n--- a/ipu3.cpp\r\n+++ b/ipu3.cpp\r\n@@ -49,13 +49,16 @@ public:\r\n \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 IPU3Event &event) override;\r\n+\r\n+\tvoid processParamsBuffer(const uint32_t frame, const uint32_t bufferId) override;\r\n+\tvoid processControls(const uint32_t frame, const ControlList &controls) override;\r\n+\tvoid processStatsBuffer(const uint32_t frame, const int64_t frameTimestamp,\r\n+\t\t\t\tconst uint32_t bufferId, const ControlList &sensorControls) override;\r\n \r\n private:\r\n \tvoid updateControls(const IPACameraSensorInfo &sensorInfo,\r\n \t\t\t const ControlInfoMap &sensorControls,\r\n \t\t\t ControlInfoMap *ipaControls);\r\n-\tvoid processControls(unsigned int frame, const ControlList &metadata);\r\n \tvoid runAiq(unsigned int frame);\r\n \tvoid fillParams(unsigned int frame, ipu3_uapi_params *params);\r\n \tvoid parseStatistics(unsigned int frame,\r\n@@ -321,54 +324,41 @@ void IPAIPU3::unmapBuffers(const std::vector<unsigned int> &ids)\r\n \t}\r\n }\r\n \r\n-void IPAIPU3::processEvent(const IPU3Event &event)\r\n+void IPAIPU3::processControls([[maybe_unused]] unsigned int frame,\r\n+\t\t\t [[maybe_unused]] const ControlList &controls)\r\n {\r\n-\tswitch (event.op) {\r\n-\tcase EventProcessControls: {\r\n-\t\tprocessControls(event.frame, event.controls);\r\n-\t\tbreak;\r\n-\t}\r\n-\tcase EventStatReady: {\r\n-\t\tauto it = buffers_.find(event.bufferId);\r\n-\t\tif (it == buffers_.end()) {\r\n-\t\t\tLOG(IPAIPU3, Error) << \"Could not find stats buffer!\";\r\n-\t\t\treturn;\r\n-\t\t}\r\n-\r\n-\t\tSpan<uint8_t> mem = it->second.maps()[0];\r\n-\t\tconst ipu3_uapi_stats_3a *stats =\r\n-\t\t\treinterpret_cast<ipu3_uapi_stats_3a *>(mem.data());\r\n-\r\n-\t\tparseStatistics(event.frame,\r\n-\t\t\t\tevent.frameTimestamp,\r\n-\t\t\t\tstats,\r\n-\t\t\t\tevent.sensorControls);\r\n-\t\tbreak;\r\n-\t}\r\n-\tcase EventFillParams: {\r\n-\t\tauto it = buffers_.find(event.bufferId);\r\n-\t\tif (it == buffers_.end()) {\r\n-\t\t\tLOG(IPAIPU3, Error) << \"Could not find param buffer!\";\r\n-\t\t\treturn;\r\n-\t\t}\r\n-\r\n-\t\tSpan<uint8_t> mem = it->second.maps()[0];\r\n-\t\tipu3_uapi_params *params =\r\n-\t\t\treinterpret_cast<ipu3_uapi_params *>(mem.data());\r\n-\r\n-\t\tfillParams(event.frame, params);\r\n-\t\tbreak;\r\n-\t}\r\n-\tdefault:\r\n-\t\tLOG(IPAIPU3, Error) << \"Unknown event \" << event.op;\r\n-\t\tbreak;\r\n+\t/* \\todo Start processing for 'frame' based on 'controls'. */\r\n+}\r\n+\r\n+void IPAIPU3::processParamsBuffer(const uint32_t frame, const uint32_t bufferId)\r\n+{\r\n+\tauto it = buffers_.find(bufferId);\r\n+\tif (it == buffers_.end()) {\r\n+\t\tLOG(IPAIPU3, Error) << \"Could not find params buffer\";\r\n+\t\treturn;\r\n \t}\r\n+\r\n+\tSpan<uint8_t> mem = it->second.maps()[0];\r\n+\tipu3_uapi_params *params =\r\n+\t\treinterpret_cast<ipu3_uapi_params *>(mem.data());\r\n+\r\n+\tfillParams(frame, params);\r\n }\r\n \r\n-void IPAIPU3::processControls([[maybe_unused]] unsigned int frame,\r\n-\t\t\t [[maybe_unused]] const ControlList &controls)\r\n+void IPAIPU3::processStatsBuffer(const uint32_t frame, const int64_t frameTimestamp,\r\n+\t\t\t\t const uint32_t bufferId, const ControlList &sensorControls)\r\n {\r\n-\t/* \\todo Start processing for 'frame' based on 'controls'. */\r\n+\tauto it = buffers_.find(bufferId);\r\n+\tif (it == buffers_.end()) {\r\n+\t\tLOG(IPAIPU3, Error) << \"Could not find stats buffer\";\r\n+\t\treturn;\r\n+\t}\r\n+\r\n+\tSpan<uint8_t> mem = it->second.maps()[0];\r\n+\tconst ipu3_uapi_stats_3a *stats =\r\n+\t\treinterpret_cast<ipu3_uapi_stats_3a *>(mem.data());\r\n+\r\n+\tparseStatistics(frame, frameTimestamp, stats, sensorControls);\r\n }\r\n \r\n void IPAIPU3::runAiq([[maybe_unused]] unsigned int frame)\r\n@@ -424,10 +414,7 @@ void IPAIPU3::fillParams(unsigned int frame, ipu3_uapi_params *params)\r\n \r\n \tsetControls(frame);\r\n \r\n-\tIPU3Action 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 IPAIPU3::parseStatistics(unsigned int frame,\r\n@@ -488,27 +475,22 @@ void IPAIPU3::parseStatistics(unsigned int frame,\r\n \t\t\t\t(sensorInfo_.pixelRate / 1e6);\r\n \tctrls.set(controls::FrameDuration, frameDuration);\r\n \r\n-\tIPU3Action op;\r\n-\top.op = ActionMetadataReady;\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 void IPAIPU3::setControls(unsigned int frame)\r\n {\r\n-\tIPU3Action op;\r\n-\top.op = ActionSetSensorControls;\r\n-\r\n-\tControlList sensorCtrls(ctrls_);\r\n-\tsensorCtrls.set(V4L2_CID_EXPOSURE, static_cast<int32_t>(exposure_));\r\n-\tsensorCtrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast<int32_t>(gain_));\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 \r\n-\top.sensorControls = sensorCtrls;\r\n+\tControlList lensCtrls(ctrls_);\r\n+\t/*\r\n+\t * \\todo: lensCtrls.set(V4L2_CID_FOCUS_ABSOLUTE, <lens_position>));\r\n+\t */\r\n \r\n-\top.lensControls.set(V4L2_CID_FOCUS_ABSOLUTE, lensPosition_);\r\n \r\n-\tqueueFrameAction.emit(frame, op);\r\n+\tsetSensorControls.emit(frame, ctrls, lensCtrls);\r\n }\r\n \r\n } /* namespace ipa::ipu3 */", "prefixes": [ "libcamera-devel", "IPAIPU3", "2/2" ] }