Patch Detail
Show a patch.
GET /api/patches/21774/?format=api
{ "id": 21774, "url": "https://patchwork.libcamera.org/api/patches/21774/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21774/", "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": "<20241030140609.69550-1-jacopo.mondi@ideasonboard.com>", "date": "2024-10-30T14:06:07", "name": "libcamera: Rationalize IPA and handlers names", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b8e0ecacb87cb9b68e7aabe6d9889033ad823457", "submitter": { "id": 143, "url": "https://patchwork.libcamera.org/api/people/143/?format=api", "name": "Jacopo Mondi", "email": "jacopo.mondi@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21774/mbox/", "series": [ { "id": 4755, "url": "https://patchwork.libcamera.org/api/series/4755/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4755", "date": "2024-10-30T14:06:07", "name": "libcamera: Rationalize IPA and handlers names", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4755/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21774/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21774/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 0A682C3237\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 30 Oct 2024 14:06:32 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EF9F06539E;\n\tWed, 30 Oct 2024 15:06:30 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 015A960360\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 30 Oct 2024 15:06:17 +0100 (CET)", "from ideasonboard.com (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 73BEAB7E;\n\tWed, 30 Oct 2024 15:06:14 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"FYT9AS/B\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1730297174;\n\tbh=78LwhFYQYyWh/ZWpyYLQzO4nS3OFw5NhZIJIiUnagTg=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=FYT9AS/B2x8smY7AXE9QY7Ek8IzMGY5Ett9aCaZLQC7v3zG15X2/LnHVsJeTVQOXE\n\tqI2ImoBs54fe1EvKBn8YeOVnRPO1/1qrXP+gUinaG06BL8UC1B4vl5WEImJyt6dAIj\n\tUseWPLtCOepPEks7jF3NVw5MpKsrsV9HfqN7gXY8=", "From": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>,\n\tMilan Zamazal <mzamazal@redhat.com>", "Subject": "[PATCH] libcamera: Rationalize IPA and handlers names", "Date": "Wed, 30 Oct 2024 15:06:07 +0100", "Message-ID": "<20241030140609.69550-1-jacopo.mondi@ideasonboard.com>", "X-Mailer": "git-send-email 2.47.0", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "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 names used by the IPA interface and the names used for buffer\ncompletions handlers in libcamera clash in the use of the term \"buffer\".\n\nFor example video device buffer completion handler is called\n\"bufferReady\" and the IPA event to ask the IPA to compute parameters are\ncalled \"fillParamsBuffers\". This makes it hard to recognize which\nfunction handles video device completion signals and which ones handle\nthe IPA interface events.\n\nRationalize the naming scheme in the IPA interface function and events\nand the signal handlers in the pipelines, according to the\nfollowing table. Remove the name \"buffer\" from the IPA interface events\nand events handler and reserve it for the buffer completion handlers.\nRename the IPA interface events and function to use the 'params' and\n'stats' names as well.\n\nIPA Interface:\n\n- fillParamsBuffer -> computeParams [FUNCTION]\n- processStatsBuffer -> processStats [FUNCTION]\n- paramFilled -> paramsComputed [EVENT]\n\nPipeline handler:\n\n- bufferReady -> videoBufferReady [BUFFER HANDLER]\n- paramReady -> paramBufferReady [BUFFER HANDLER]\n- statReady -> statBufferReady [BUFFER HANDLER]\n- paramFilled -> paramsComputed [IPA EVENT HANDLER]\n\nCosmetic change only, no functional changes intended.\n\nSigned-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\nReviewed-by: Milan Zamazal <mzamazal@redhat.com>\n---\n include/libcamera/ipa/ipu3.mojom | 8 ++---\n include/libcamera/ipa/rkisp1.mojom | 8 ++---\n include/libcamera/ipa/soft.mojom | 2 +-\n include/libcamera/ipa/vimc.mojom | 4 +--\n src/ipa/ipu3/ipu3-ipa-design-guide.rst | 14 ++++----\n src/ipa/ipu3/ipu3.cpp | 24 ++++++-------\n src/ipa/rkisp1/rkisp1.cpp | 14 ++++----\n src/ipa/simple/soft_simple.cpp | 4 +--\n src/ipa/vimc/vimc.cpp | 6 ++--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 12 +++----\n src/libcamera/pipeline/mali-c55/mali-c55.cpp | 8 ++---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 36 ++++++++++----------\n src/libcamera/pipeline/simple/simple.cpp | 8 ++---\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 6 ++--\n src/libcamera/pipeline/vimc/vimc.cpp | 16 ++++-----\n src/libcamera/software_isp/software_isp.cpp | 2 +-\n 16 files changed, 86 insertions(+), 86 deletions(-)", "diff": "diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom\nindex d1b1c6b867da..d9a50b01db80 100644\n--- a/include/libcamera/ipa/ipu3.mojom\n+++ b/include/libcamera/ipa/ipu3.mojom\n@@ -31,14 +31,14 @@ interface IPAIPU3Interface {\n \tunmapBuffers(array<uint32> ids);\n \n \t[async] queueRequest(uint32 frame, libcamera.ControlList controls);\n-\t[async] fillParamsBuffer(uint32 frame, uint32 bufferId);\n-\t[async] processStatsBuffer(uint32 frame, int64 frameTimestamp,\n-\t\t\t\t uint32 bufferId, libcamera.ControlList sensorControls);\n+\t[async] computeParams(uint32 frame, uint32 bufferId);\n+\t[async] processStats(uint32 frame, int64 frameTimestamp,\n+\t\t\t uint32 bufferId, libcamera.ControlList sensorControls);\n };\n \n interface IPAIPU3EventInterface {\n \tsetSensorControls(uint32 frame, libcamera.ControlList sensorControls,\n \t\t\t libcamera.ControlList lensControls);\n-\tparamsBufferReady(uint32 frame);\n+\tparamsComputed(uint32 frame);\n \tmetadataReady(uint32 frame, libcamera.ControlList metadata);\n };\ndiff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\nindex 80d54a03aa90..043ad27ea199 100644\n--- a/include/libcamera/ipa/rkisp1.mojom\n+++ b/include/libcamera/ipa/rkisp1.mojom\n@@ -31,13 +31,13 @@ interface IPARkISP1Interface {\n \tunmapBuffers(array<uint32> ids);\n \n \t[async] queueRequest(uint32 frame, libcamera.ControlList reqControls);\n-\t[async] fillParamsBuffer(uint32 frame, uint32 bufferId);\n-\t[async] processStatsBuffer(uint32 frame, uint32 bufferId,\n-\t\t\t\t libcamera.ControlList sensorControls);\n+\t[async] computeParams(uint32 frame, uint32 bufferId);\n+\t[async] processStats(uint32 frame, uint32 bufferId,\n+\t\t\t libcamera.ControlList sensorControls);\n };\n \n interface IPARkISP1EventInterface {\n-\tparamsBufferReady(uint32 frame, uint32 bytesused);\n+\tparamsComputed(uint32 frame, uint32 bytesused);\n \tsetSensorControls(uint32 frame, libcamera.ControlList sensorControls);\n \tmetadataReady(uint32 frame, libcamera.ControlList metadata);\n };\ndiff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom\nindex 347fd69b4ab8..a6c086f82a28 100644\n--- a/include/libcamera/ipa/soft.mojom\n+++ b/include/libcamera/ipa/soft.mojom\n@@ -24,7 +24,7 @@ interface IPASoftInterface {\n \t\t=> (int32 ret);\n \n \t[async] queueRequest(uint32 frame, libcamera.ControlList sensorControls);\n-\t[async] fillParamsBuffer(uint32 frame);\n+\t[async] computeParams(uint32 frame);\n \t[async] processStats(uint32 frame,\n \t\t\t uint32 bufferId,\n \t\t\t libcamera.ControlList sensorControls);\ndiff --git a/include/libcamera/ipa/vimc.mojom b/include/libcamera/ipa/vimc.mojom\nindex dd991f7e70c9..c5c5fe83734e 100644\n--- a/include/libcamera/ipa/vimc.mojom\n+++ b/include/libcamera/ipa/vimc.mojom\n@@ -47,9 +47,9 @@ interface IPAVimcInterface {\n \t * interface functions that mimick how other pipeline handlers typically\n \t * handle parameters at runtime.\n \t */\n-\t[async] fillParamsBuffer(uint32 frame, uint32 bufferId);\n+\t[async] computeParams(uint32 frame, uint32 bufferId);\n };\n \n interface IPAVimcEventInterface {\n-\tparamsBufferReady(uint32 bufferId, [flags] TestFlag flags);\n+\tparamsComputed(uint32 bufferId, [flags] TestFlag flags);\n };\ndiff --git a/src/ipa/ipu3/ipu3-ipa-design-guide.rst b/src/ipa/ipu3/ipu3-ipa-design-guide.rst\nindex 725063978adf..85d735c65b59 100644\n--- a/src/ipa/ipu3/ipu3-ipa-design-guide.rst\n+++ b/src/ipa/ipu3/ipu3-ipa-design-guide.rst\n@@ -27,8 +27,8 @@ from applications, and managing events from the pipeline handler.\n └─┬───┬───┬──────┬────┬────┬────┬─┴────▼─┬──┘ 1: init()\n │ │ │ │ ▲ │ ▲ │ ▲ │ ▲ │ 2: configure()\n │1 │2 │3 │4│ │4│ │4│ │4│ │5 3: mapBuffers(), start()\n- │ │ │ │ │ │ │ │ │ │ │ │ 4: (▼) queueRequest(), fillParamsBuffer(), processStatsBuffer()\n- ▼ ▼ ▼ ▼ │ ▼ │ ▼ │ ▼ │ ▼ (▲) setSensorControls, paramsBufferReady, metadataReady Signals\n+ │ │ │ │ │ │ │ │ │ │ │ │ 4: (▼) queueRequest(), computeParams(), processStats()\n+ ▼ ▼ ▼ ▼ │ ▼ │ ▼ │ ▼ │ ▼ (▲) setSensorControls, paramsComputed, metadataReady Signals\n ┌──────────────────┴────┴────┴────┴─────────┐ 5: stop(), unmapBuffers()\n │ IPU3 IPA │\n │ ┌───────────────────────┐ │\n@@ -104,8 +104,8 @@ to operate when running:\n \n - configure()\n - queueRequest()\n-- fillParamsBuffer()\n-- processStatsBuffer()\n+- computeParams()\n+- processStats()\n \n The configuration phase allows the pipeline-handler to inform the IPA of\n the current stream configurations, which is then passed into each\n@@ -119,7 +119,7 @@ When configured, the IPA is notified by the pipeline handler of the\n Camera ``start()`` event, after which incoming requests will be queued\n for processing, requiring a parameter buffer (``ipu3_uapi_params``) to\n be populated for the ImgU. This is given to the IPA through\n-``fillParamsBuffer()``, and then passed directly to each algorithm\n+``computeParams()``, and then passed directly to each algorithm\n through the ``prepare()`` call allowing the ISP configuration to be\n updated for the needs of each component that the algorithm is\n responsible for.\n@@ -129,7 +129,7 @@ structure that it modifies, and it should take care to ensure that any\n structure set by a use flag is fully initialised to suitable values.\n \n The parameter buffer is returned to the pipeline handler through the\n-``paramsBufferReady`` signal, and from there queued to the ImgU along\n+``paramsComputed`` signal, and from there queued to the ImgU along\n with a raw frame captured with the CIO2.\n \n Post-frame completion\n@@ -138,7 +138,7 @@ Post-frame completion\n When the capture of an image is completed, and successfully processed\n through the ImgU, the generated statistics buffer\n (``ipu3_uapi_stats_3a``) is given to the IPA through\n-``processStatsBuffer()``. This provides the IPA with an opportunity to\n+``processStats()``. This provides the IPA with an opportunity to\n examine the results of the ISP and run the calculations required by each\n algorithm on the new data. The algorithms may require context from the\n operations of other algorithms, for example, the AWB might choose to use\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 10a8c86d8e64..89c3192c6295 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -87,14 +87,14 @@ namespace ipa::ipu3 {\n * parameter buffer, and adapting the settings of the sensor attached to the\n * IPU3 CIO2 through sensor-specific V4L2 controls.\n *\n- * In fillParamsBuffer(), we populate the ImgU parameter buffer with\n+ * In computeParams(), we populate the ImgU parameter buffer with\n * settings to configure the device in preparation for handling the frame\n * queued in the Request.\n *\n * When the frame has completed processing, the ImgU will generate a statistics\n- * buffer which is given to the IPA with processStatsBuffer(). In this we run the\n+ * buffer which is given to the IPA with processStats(). In this we run the\n * algorithms to parse the statistics and cache any results for the next\n- * fillParamsBuffer() call.\n+ * computeParams() call.\n *\n * The individual algorithms are split into modular components that are called\n * iteratively to allow them to process statistics from the ImgU in the order\n@@ -155,10 +155,10 @@ public:\n \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override;\n \n \tvoid queueRequest(const uint32_t frame, const ControlList &controls) override;\n-\tvoid fillParamsBuffer(const uint32_t frame, const uint32_t bufferId) override;\n-\tvoid processStatsBuffer(const uint32_t frame, const int64_t frameTimestamp,\n-\t\t\t\tconst uint32_t bufferId,\n-\t\t\t\tconst ControlList &sensorControls) override;\n+\tvoid computeParams(const uint32_t frame, const uint32_t bufferId) override;\n+\tvoid processStats(const uint32_t frame, const int64_t frameTimestamp,\n+\t\t\t const uint32_t bufferId,\n+\t\t\t const ControlList &sensorControls) override;\n \n protected:\n \tstd::string logPrefix() const override;\n@@ -538,7 +538,7 @@ void IPAIPU3::unmapBuffers(const std::vector<unsigned int> &ids)\n * Algorithms are expected to fill the IPU3 parameter buffer for the next\n * frame given their most recent processing of the ImgU statistics.\n */\n-void IPAIPU3::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n+void IPAIPU3::computeParams(const uint32_t frame, const uint32_t bufferId)\n {\n \tauto it = buffers_.find(bufferId);\n \tif (it == buffers_.end()) {\n@@ -566,7 +566,7 @@ void IPAIPU3::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n \tfor (auto const &algo : algorithms())\n \t\talgo->prepare(context_, frame, frameContext, params);\n \n-\tparamsBufferReady.emit(frame);\n+\tparamsComputed.emit(frame);\n }\n \n /**\n@@ -580,9 +580,9 @@ void IPAIPU3::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n * statistics are passed to each algorithm module to run their calculations and\n * update their state accordingly.\n */\n-void IPAIPU3::processStatsBuffer(const uint32_t frame,\n-\t\t\t\t [[maybe_unused]] const int64_t frameTimestamp,\n-\t\t\t\t const uint32_t bufferId, const ControlList &sensorControls)\n+void IPAIPU3::processStats(const uint32_t frame,\n+\t\t\t [[maybe_unused]] const int64_t frameTimestamp,\n+\t\t\t const uint32_t bufferId, const ControlList &sensorControls)\n {\n \tauto it = buffers_.find(bufferId);\n \tif (it == buffers_.end()) {\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 9e161cabdea4..0cbd1521991f 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -65,9 +65,9 @@ public:\n \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override;\n \n \tvoid queueRequest(const uint32_t frame, const ControlList &controls) override;\n-\tvoid fillParamsBuffer(const uint32_t frame, const uint32_t bufferId) override;\n-\tvoid processStatsBuffer(const uint32_t frame, const uint32_t bufferId,\n-\t\t\t\tconst ControlList &sensorControls) override;\n+\tvoid computeParams(const uint32_t frame, const uint32_t bufferId) override;\n+\tvoid processStats(const uint32_t frame, const uint32_t bufferId,\n+\t\t\t const ControlList &sensorControls) override;\n \n protected:\n \tstd::string logPrefix() const override;\n@@ -335,7 +335,7 @@ void IPARkISP1::queueRequest(const uint32_t frame, const ControlList &controls)\n \t}\n }\n \n-void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n+void IPARkISP1::computeParams(const uint32_t frame, const uint32_t bufferId)\n {\n \tIPAFrameContext &frameContext = context_.frameContexts.get(frame);\n \n@@ -345,11 +345,11 @@ void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n \tfor (auto const &algo : algorithms())\n \t\talgo->prepare(context_, frame, frameContext, ¶ms);\n \n-\tparamsBufferReady.emit(frame, params.size());\n+\tparamsComputed.emit(frame, params.size());\n }\n \n-void IPARkISP1::processStatsBuffer(const uint32_t frame, const uint32_t bufferId,\n-\t\t\t\t const ControlList &sensorControls)\n+void IPARkISP1::processStats(const uint32_t frame, const uint32_t bufferId,\n+\t\t\t const ControlList &sensorControls)\n {\n \tIPAFrameContext &frameContext = context_.frameContexts.get(frame);\n \ndiff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp\nindex c8ad55a2183d..ac2a942107cc 100644\n--- a/src/ipa/simple/soft_simple.cpp\n+++ b/src/ipa/simple/soft_simple.cpp\n@@ -57,7 +57,7 @@ public:\n \tvoid stop() override;\n \n \tvoid queueRequest(const uint32_t frame, const ControlList &controls) override;\n-\tvoid fillParamsBuffer(const uint32_t frame) override;\n+\tvoid computeParams(const uint32_t frame) override;\n \tvoid processStats(const uint32_t frame, const uint32_t bufferId,\n \t\t\t const ControlList &sensorControls) override;\n \n@@ -272,7 +272,7 @@ void IPASoftSimple::queueRequest(const uint32_t frame, const ControlList &contro\n \t\talgo->queueRequest(context_, frame, frameContext, controls);\n }\n \n-void IPASoftSimple::fillParamsBuffer(const uint32_t frame)\n+void IPASoftSimple::computeParams(const uint32_t frame)\n {\n \tIPAFrameContext &frameContext = context_.frameContexts.get(frame);\n \tfor (auto const &algo : algorithms())\ndiff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp\nindex 5495401f1731..a1351a0f45ce 100644\n--- a/src/ipa/vimc/vimc.cpp\n+++ b/src/ipa/vimc/vimc.cpp\n@@ -48,7 +48,7 @@ public:\n \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override;\n \n \tvoid queueRequest(uint32_t frame, const ControlList &controls) override;\n-\tvoid fillParamsBuffer(uint32_t frame, uint32_t bufferId) override;\n+\tvoid computeParams(uint32_t frame, uint32_t bufferId) override;\n \n private:\n \tvoid initTrace();\n@@ -150,7 +150,7 @@ void IPAVimc::queueRequest([[maybe_unused]] uint32_t frame,\n {\n }\n \n-void IPAVimc::fillParamsBuffer([[maybe_unused]] uint32_t frame, uint32_t bufferId)\n+void IPAVimc::computeParams([[maybe_unused]] uint32_t frame, uint32_t bufferId)\n {\n \tauto it = buffers_.find(bufferId);\n \tif (it == buffers_.end()) {\n@@ -159,7 +159,7 @@ void IPAVimc::fillParamsBuffer([[maybe_unused]] uint32_t frame, uint32_t bufferI\n \t}\n \n \tFlags<ipa::vimc::TestFlag> flags;\n-\tparamsBufferReady.emit(bufferId, flags);\n+\tparamsComputed.emit(bufferId, flags);\n }\n \n void IPAVimc::initTrace()\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 29d3c6c194c1..0069d5e2558f 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -88,7 +88,7 @@ public:\n \n private:\n \tvoid metadataReady(unsigned int id, const ControlList &metadata);\n-\tvoid paramsBufferReady(unsigned int id);\n+\tvoid paramsComputed(unsigned int id);\n \tvoid setSensorControls(unsigned int id, const ControlList &sensorControls,\n \t\t\t const ControlList &lensControls);\n };\n@@ -1156,7 +1156,7 @@ int IPU3CameraData::loadIPA()\n \t\treturn -ENOENT;\n \n \tipa_->setSensorControls.connect(this, &IPU3CameraData::setSensorControls);\n-\tipa_->paramsBufferReady.connect(this, &IPU3CameraData::paramsBufferReady);\n+\tipa_->paramsComputed.connect(this, &IPU3CameraData::paramsComputed);\n \tipa_->metadataReady.connect(this, &IPU3CameraData::metadataReady);\n \n \t/*\n@@ -1217,7 +1217,7 @@ void IPU3CameraData::setSensorControls([[maybe_unused]] unsigned int id,\n \tfocusLens->setFocusPosition(focusValue.get<int32_t>());\n }\n \n-void IPU3CameraData::paramsBufferReady(unsigned int id)\n+void IPU3CameraData::paramsComputed(unsigned int id)\n {\n \tIPU3Frames::Info *info = frameInfos_.find(id);\n \tif (!info)\n@@ -1328,7 +1328,7 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n \tif (request->findBuffer(&rawStream_))\n \t\tpipe()->completeBuffer(request, buffer);\n \n-\tipa_->fillParamsBuffer(info->id, info->paramBuffer->cookie());\n+\tipa_->computeParams(info->id, info->paramBuffer->cookie());\n }\n \n void IPU3CameraData::paramBufferReady(FrameBuffer *buffer)\n@@ -1372,8 +1372,8 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n \t\treturn;\n \t}\n \n-\tipa_->processStatsBuffer(info->id, request->metadata().get(controls::SensorTimestamp).value_or(0),\n-\t\t\t\t info->statBuffer->cookie(), info->effectiveSensorControls);\n+\tipa_->processStats(info->id, request->metadata().get(controls::SensorTimestamp).value_or(0),\n+\t\t\t info->statBuffer->cookie(), info->effectiveSensorControls);\n }\n \n /*\ndiff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\nindex 45c71c1dd619..52c8eb58d8b0 100644\n--- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n+++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n@@ -464,7 +464,7 @@ public:\n \n \tint queueRequestDevice(Camera *camera, Request *request) override;\n \n-\tvoid bufferReady(FrameBuffer *buffer);\n+\tvoid imageBufferReady(FrameBuffer *buffer);\n \n \tbool match(DeviceEnumerator *enumerator) override;\n \n@@ -878,7 +878,7 @@ int PipelineHandlerMaliC55::queueRequestDevice(Camera *camera, Request *request)\n \treturn 0;\n }\n \n-void PipelineHandlerMaliC55::bufferReady(FrameBuffer *buffer)\n+void PipelineHandlerMaliC55::imageBufferReady(FrameBuffer *buffer)\n {\n \tRequest *request = buffer->request();\n \n@@ -992,7 +992,7 @@ bool PipelineHandlerMaliC55::match(DeviceEnumerator *enumerator)\n \tif (frPipe->cap->open() < 0)\n \t\treturn false;\n \n-\tfrPipe->cap->bufferReady.connect(this, &PipelineHandlerMaliC55::bufferReady);\n+\tfrPipe->cap->bufferReady.connect(this, &PipelineHandlerMaliC55::imageBufferReady);\n \n \tdsFitted_ = !!media_->getEntityByName(\"mali-c55 ds\");\n \tif (dsFitted_) {\n@@ -1008,7 +1008,7 @@ bool PipelineHandlerMaliC55::match(DeviceEnumerator *enumerator)\n \t\tif (dsPipe->cap->open() < 0)\n \t\t\treturn false;\n \n-\t\tdsPipe->cap->bufferReady.connect(this, &PipelineHandlerMaliC55::bufferReady);\n+\t\tdsPipe->cap->bufferReady.connect(this, &PipelineHandlerMaliC55::imageBufferReady);\n \t}\n \n \tispSink = isp_->entity()->getPadByIndex(0);\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex c7b0b3927da1..dfee965bcc0b 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -114,7 +114,7 @@ public:\n \tControlInfoMap ipaControls_;\n \n private:\n-\tvoid paramFilled(unsigned int frame, unsigned int bytesused);\n+\tvoid paramsComputed(unsigned int frame, unsigned int bytesused);\n \tvoid setSensorControls(unsigned int frame,\n \t\t\t const ControlList &sensorControls);\n \n@@ -180,9 +180,9 @@ private:\n \t\t const RkISP1CameraConfiguration &config);\n \tint createCamera(MediaEntity *sensor);\n \tvoid tryCompleteRequest(RkISP1FrameInfo *info);\n-\tvoid bufferReady(FrameBuffer *buffer);\n-\tvoid paramReady(FrameBuffer *buffer);\n-\tvoid statReady(FrameBuffer *buffer);\n+\tvoid imageBufferReady(FrameBuffer *buffer);\n+\tvoid paramBufferReady(FrameBuffer *buffer);\n+\tvoid statBufferReady(FrameBuffer *buffer);\n \tvoid dewarpBufferReady(FrameBuffer *buffer);\n \tvoid frameStart(uint32_t sequence);\n \n@@ -367,7 +367,7 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n \t\treturn -ENOENT;\n \n \tipa_->setSensorControls.connect(this, &RkISP1CameraData::setSensorControls);\n-\tipa_->paramsBufferReady.connect(this, &RkISP1CameraData::paramFilled);\n+\tipa_->paramsComputed.connect(this, &RkISP1CameraData::paramsComputed);\n \tipa_->metadataReady.connect(this, &RkISP1CameraData::metadataReady);\n \n \t/*\n@@ -400,7 +400,7 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n \treturn 0;\n }\n \n-void RkISP1CameraData::paramFilled(unsigned int frame, unsigned int bytesused)\n+void RkISP1CameraData::paramsComputed(unsigned int frame, unsigned int bytesused)\n {\n \tPipelineHandlerRkISP1 *pipe = RkISP1CameraData::pipe();\n \tRkISP1FrameInfo *info = frameInfo_.find(frame);\n@@ -1120,8 +1120,8 @@ 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\t\t\t\t info->paramBuffer->cookie());\n+\t\tdata->ipa_->computeParams(data->frame_,\n+\t\t\t\t\t info->paramBuffer->cookie());\n \t}\n \n \tdata->frame_++;\n@@ -1334,11 +1334,11 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \tif (hasSelfPath_ && !selfPath_.init(media_))\n \t\treturn false;\n \n-\tmainPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::bufferReady);\n+\tmainPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::imageBufferReady);\n \tif (hasSelfPath_)\n-\t\tselfPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::bufferReady);\n-\tstat_->bufferReady.connect(this, &PipelineHandlerRkISP1::statReady);\n-\tparam_->bufferReady.connect(this, &PipelineHandlerRkISP1::paramReady);\n+\t\tselfPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::imageBufferReady);\n+\tstat_->bufferReady.connect(this, &PipelineHandlerRkISP1::statBufferReady);\n+\tparam_->bufferReady.connect(this, &PipelineHandlerRkISP1::paramBufferReady);\n \n \t/* If dewarper is present, create its instance. */\n \tDeviceMatch dwp(\"dw100\");\n@@ -1399,7 +1399,7 @@ void PipelineHandlerRkISP1::tryCompleteRequest(RkISP1FrameInfo *info)\n \tcompleteRequest(request);\n }\n \n-void PipelineHandlerRkISP1::bufferReady(FrameBuffer *buffer)\n+void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)\n {\n \tASSERT(activeCamera_);\n \tRkISP1CameraData *data = cameraData(activeCamera_);\n@@ -1424,7 +1424,7 @@ 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_->processStats(info->frame, 0, ctrls);\n \t\t}\n \t} else {\n \t\tif (isRaw_)\n@@ -1508,7 +1508,7 @@ void PipelineHandlerRkISP1::dewarpBufferReady(FrameBuffer *buffer)\n \ttryCompleteRequest(info);\n }\n \n-void PipelineHandlerRkISP1::paramReady(FrameBuffer *buffer)\n+void PipelineHandlerRkISP1::paramBufferReady(FrameBuffer *buffer)\n {\n \tASSERT(activeCamera_);\n \tRkISP1CameraData *data = cameraData(activeCamera_);\n@@ -1521,7 +1521,7 @@ void PipelineHandlerRkISP1::paramReady(FrameBuffer *buffer)\n \ttryCompleteRequest(info);\n }\n \n-void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer)\n+void PipelineHandlerRkISP1::statBufferReady(FrameBuffer *buffer)\n {\n \tASSERT(activeCamera_);\n \tRkISP1CameraData *data = cameraData(activeCamera_);\n@@ -1539,8 +1539,8 @@ void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer)\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_->processStats(info->frame, info->statBuffer->cookie(),\n+\t\t\t\t data->delayedCtrls_->get(buffer->metadata().sequence));\n }\n \n REGISTER_PIPELINE_HANDLER(PipelineHandlerRkISP1, \"rkisp1\")\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 3ddce71d3757..d85ff27ae9f5 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -225,7 +225,7 @@ public:\n \tint setupFormats(V4L2SubdeviceFormat *format,\n \t\t\t V4L2Subdevice::Whence whence,\n \t\t\t Transform transform = Transform::Identity);\n-\tvoid bufferReady(FrameBuffer *buffer);\n+\tvoid imageBufferReady(FrameBuffer *buffer);\n \n \tunsigned int streamIndex(const Stream *stream) const\n \t{\n@@ -784,7 +784,7 @@ int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,\n \treturn 0;\n }\n \n-void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n+void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n {\n \tSimplePipelineHandler *pipe = SimpleCameraData::pipe();\n \n@@ -1360,7 +1360,7 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL\n \t\treturn ret;\n \t}\n \n-\tvideo->bufferReady.connect(data, &SimpleCameraData::bufferReady);\n+\tvideo->bufferReady.connect(data, &SimpleCameraData::imageBufferReady);\n \n \tret = video->streamOn();\n \tif (ret < 0) {\n@@ -1404,7 +1404,7 @@ void SimplePipelineHandler::stopDevice(Camera *camera)\n \tvideo->streamOff();\n \tvideo->releaseBuffers();\n \n-\tvideo->bufferReady.disconnect(data, &SimpleCameraData::bufferReady);\n+\tvideo->bufferReady.disconnect(data, &SimpleCameraData::imageBufferReady);\n \n \tdata->conversionBuffers_.clear();\n \ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 7fa01bb71744..8c2c6baf3575 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -47,7 +47,7 @@ public:\n \tint init(MediaDevice *media);\n \tvoid addControl(uint32_t cid, const ControlInfo &v4l2info,\n \t\t\tControlInfoMap::Map *ctrls);\n-\tvoid bufferReady(FrameBuffer *buffer);\n+\tvoid imageBufferReady(FrameBuffer *buffer);\n \n \tconst std::string &id() const { return id_; }\n \n@@ -476,7 +476,7 @@ int UVCCameraData::init(MediaDevice *media)\n \tif (ret)\n \t\treturn ret;\n \n-\tvideo_->bufferReady.connect(this, &UVCCameraData::bufferReady);\n+\tvideo_->bufferReady.connect(this, &UVCCameraData::imageBufferReady);\n \n \t/* Generate the camera ID. */\n \tif (!generateId()) {\n@@ -747,7 +747,7 @@ void UVCCameraData::addControl(uint32_t cid, const ControlInfo &v4l2Info,\n \tctrls->emplace(id, info);\n }\n \n-void UVCCameraData::bufferReady(FrameBuffer *buffer)\n+void UVCCameraData::imageBufferReady(FrameBuffer *buffer)\n {\n \tRequest *request = buffer->request();\n \ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 2165bae890cb..4f72e801741f 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -56,8 +56,8 @@ public:\n \n \tint init();\n \tint allocateMockIPABuffers();\n-\tvoid bufferReady(FrameBuffer *buffer);\n-\tvoid paramsBufferReady(unsigned int id, const Flags<ipa::vimc::TestFlag> flags);\n+\tvoid imageBufferReady(FrameBuffer *buffer);\n+\tvoid paramsComputed(unsigned int id, const Flags<ipa::vimc::TestFlag> flags);\n \n \tMediaDevice *media_;\n \tstd::unique_ptr<CameraSensor> sensor_;\n@@ -492,7 +492,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n \t\treturn false;\n \t}\n \n-\tdata->ipa_->paramsBufferReady.connect(data.get(), &VimcCameraData::paramsBufferReady);\n+\tdata->ipa_->paramsComputed.connect(data.get(), &VimcCameraData::paramsComputed);\n \n \tstd::string conf = data->ipa_->configurationFile(\"vimc.conf\");\n \tFlags<ipa::vimc::TestFlag> inFlags = ipa::vimc::TestFlag::Flag2;\n@@ -549,7 +549,7 @@ int VimcCameraData::init()\n \tif (video_->open())\n \t\treturn -ENODEV;\n \n-\tvideo_->bufferReady.connect(this, &VimcCameraData::bufferReady);\n+\tvideo_->bufferReady.connect(this, &VimcCameraData::imageBufferReady);\n \n \traw_ = V4L2VideoDevice::fromEntityName(media_, \"Raw Capture 1\");\n \tif (raw_->open())\n@@ -597,7 +597,7 @@ int VimcCameraData::init()\n \treturn 0;\n }\n \n-void VimcCameraData::bufferReady(FrameBuffer *buffer)\n+void VimcCameraData::imageBufferReady(FrameBuffer *buffer)\n {\n \tPipelineHandlerVimc *pipe =\n \t\tstatic_cast<PipelineHandlerVimc *>(this->pipe());\n@@ -622,7 +622,7 @@ void VimcCameraData::bufferReady(FrameBuffer *buffer)\n \tpipe->completeBuffer(request, buffer);\n \tpipe->completeRequest(request);\n \n-\tipa_->fillParamsBuffer(request->sequence(), mockIPABufs_[0]->cookie());\n+\tipa_->computeParams(request->sequence(), mockIPABufs_[0]->cookie());\n }\n \n int VimcCameraData::allocateMockIPABuffers()\n@@ -640,8 +640,8 @@ int VimcCameraData::allocateMockIPABuffers()\n \treturn video_->exportBuffers(kBufCount, &mockIPABufs_);\n }\n \n-void VimcCameraData::paramsBufferReady([[maybe_unused]] unsigned int id,\n-\t\t\t\t [[maybe_unused]] const Flags<ipa::vimc::TestFlag> flags)\n+void VimcCameraData::paramsComputed([[maybe_unused]] unsigned int id,\n+\t\t\t\t [[maybe_unused]] const Flags<ipa::vimc::TestFlag> flags)\n {\n }\n \ndiff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\nindex 47677784d240..d809cd77e824 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -351,7 +351,7 @@ void SoftwareIsp::stop()\n */\n void SoftwareIsp::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output)\n {\n-\tipa_->fillParamsBuffer(frame);\n+\tipa_->computeParams(frame);\n \tdebayer_->invokeMethod(&DebayerCpu::process,\n \t\t\t ConnectionTypeQueued, frame, input, output, debayerParams_);\n }\n", "prefixes": [] }