Patch Detail
Show a patch.
GET /api/patches/26853/?format=api
{ "id": 26853, "url": "https://patchwork.libcamera.org/api/patches/26853/?format=api", "web_url": "https://patchwork.libcamera.org/patch/26853/", "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": "<20260608150349.134371-12-mzamazal@redhat.com>", "date": "2026-06-08T15:03:40", "name": "[RFC,v4,11/17] libcamera: software_isp: Share parameters buffers with debayering", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "50f649c852463fcbc3a06c092f25dde8e95907cd", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/26853/mbox/", "series": [ { "id": 5982, "url": "https://patchwork.libcamera.org/api/series/5982/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5982", "date": "2026-06-08T15:03:29", "name": "Software ISP: Share params and stats buffers", "version": 4, "mbox": "https://patchwork.libcamera.org/series/5982/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/26853/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/26853/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 A78F5C328C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 8 Jun 2026 15:04:32 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5047161F04;\n\tMon, 8 Jun 2026 17:04:32 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C9B0261EF3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 8 Jun 2026 17:04:29 +0200 (CEST)", "from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-623-lzLsk2XMPd-syTh0vc0_Ew-1;\n\tMon, 08 Jun 2026 11:04:25 -0400", "from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.111])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 7001A1955DB5; Mon, 8 Jun 2026 15:04:24 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.48.51])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 45A551800351; Mon, 8 Jun 2026 15:04:22 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"bzSGxadf\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1780931068;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=eOTl/dhElN1S6LTb941TqfLtMsJGLLcpaCsDYwz5j04=;\n\tb=bzSGxadf5u6x0ySnZ5bAxjxQLdKc6nGbIKz4v7e9Kfwx8ZcIAfz5rUZf2A4dSjms+6bFLN\n\t/RKXaqxvbhWn84xLzpXWfSwCU92VLrBobYpIZzJ5a0svFIC4eUaKsxpc21q0jEIYhQxNEL\n\tDDmCL53GQ0IClxNbXNVdovi0gkJ4090=", "X-MC-Unique": "lzLsk2XMPd-syTh0vc0_Ew-1", "X-Mimecast-MFC-AGG-ID": "lzLsk2XMPd-syTh0vc0_Ew_1780931064", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>, Kieran Bingham\n\t<kieran.bingham@ideasonboard.com>, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t<barnabas.pocze@ideasonboard.com>, johannes.goede@oss.qualcomm.com", "Subject": "[RFC PATCH v4 11/17] libcamera: software_isp: Share parameters\n\tbuffers with debayering", "Date": "Mon, 8 Jun 2026 17:03:40 +0200", "Message-ID": "<20260608150349.134371-12-mzamazal@redhat.com>", "In-Reply-To": "<20260608150349.134371-1-mzamazal@redhat.com>", "References": "<20260608150349.134371-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.111", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "gry6bqs3MTM7vxkUX_5DGMpJBUP4cgcA6RsfTs5u1No_1780931064", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "content-type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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": "Share the multiple parameters buffers with debayering rather than\ncopying the current parameters buffer there. This is done in a similar\nway as sharing the buffers with IPA in the preceding patch.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n .../internal/software_isp/software_isp.h | 2 -\n src/libcamera/software_isp/debayer.cpp | 29 ++++++--\n src/libcamera/software_isp/debayer.h | 9 +--\n src/libcamera/software_isp/debayer_cpu.cpp | 66 ++++++++++---------\n src/libcamera/software_isp/debayer_cpu.h | 12 ++--\n src/libcamera/software_isp/debayer_egl.cpp | 15 +++--\n src/libcamera/software_isp/debayer_egl.h | 7 +-\n src/libcamera/software_isp/software_isp.cpp | 21 +++---\n 8 files changed, 91 insertions(+), 70 deletions(-)", "diff": "diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h\nindex e3419305b..9ea0ed4db 100644\n--- a/include/libcamera/internal/software_isp/software_isp.h\n+++ b/include/libcamera/internal/software_isp/software_isp.h\n@@ -89,7 +89,6 @@ public:\n \tSignal<const ControlList &> setSensorControls;\n \n private:\n-\tvoid saveIspParams(const uint32_t paramsBufferId);\n \tvoid paramsBufferReady(const uint32_t paramsBufferId);\n \tbool allocateParamsBuffers(const unsigned int bufferCount);\n \tvoid setSensorCtrls(const ControlList &sensorControls);\n@@ -99,7 +98,6 @@ private:\n \tstd::unique_ptr<Debayer> debayer_;\n \tThread ispWorkerThread_;\n \tstd::map<uint32_t, SharedMemObject<DebayerParams>> sharedParams_;\n-\tDebayerParams debayerParams_;\n \tstd::vector<uint32_t> availableParams_;\n \tDmaBufAllocator dmaHeap_;\n \tbool ccmEnabled_;\ndiff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp\nindex 7b1be52b2..28e04d0df 100644\n--- a/src/libcamera/software_isp/debayer.cpp\n+++ b/src/libcamera/software_isp/debayer.cpp\n@@ -11,6 +11,8 @@\n \n #include \"debayer.h\"\n \n+#include <sys/mman.h>\n+\n namespace libcamera {\n \n /**\n@@ -54,15 +56,29 @@ LOG_DEFINE_CATEGORY(Debayer)\n \n /**\n * \\brief Construct a Debayer object\n+ * \\param[in] paramsBuffers ids and SharedFDs of parameter buffers\n * \\param[in] cm The camera manager\n */\n-Debayer::Debayer(const CameraManager &cm)\n+Debayer::Debayer(const std::map<uint32_t, SharedFD> ¶msBuffers, const CameraManager &cm)\n \t: bench_(cm, \"Debayer\")\n {\n+\tfor (auto &[bufferId, sharedFd] : paramsBuffers) {\n+\t\tvoid *mem = mmap(nullptr, sizeof(DebayerParams),\n+\t\t\t\t PROT_READ | PROT_WRITE, MAP_SHARED,\n+\t\t\t\t sharedFd.get(), 0);\n+\t\tif (mem == MAP_FAILED) {\n+\t\t\tLOG(Debayer, Error) << \"Unable to map Parameters\";\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tparamsBuffers_[bufferId] = static_cast<DebayerParams *>(mem);\n+\t}\n }\n \n Debayer::~Debayer()\n {\n+\tfor (auto &item : paramsBuffers_)\n+\t\tmunmap(item.second, sizeof(DebayerParams));\n }\n \n /**\n@@ -104,16 +120,12 @@ Debayer::~Debayer()\n */\n \n /**\n- * \\fn void Debayer::process(uint32_t frame, const uint32_t paramsBufferId, FrameBuffer *input, FrameBuffer *output, DebayerParams params)\n+ * \\fn void Debayer::process(uint32_t frame, const uint32_t paramsBufferId, FrameBuffer *input, FrameBuffer *output)\n * \\brief Process the bayer data into the requested format\n * \\param[in] frame The frame number\n * \\param[in] paramsBufferId The id of the params buffer in use\n * \\param[in] input The input buffer\n * \\param[in] output The output buffer\n- * \\param[in] params The parameters to be used in debayering\n- *\n- * \\note DebayerParams is passed by value deliberately so that a copy is passed\n- * when this is run in another thread by invokeMethod().\n */\n \n /**\n@@ -240,6 +252,11 @@ Debayer::~Debayer()\n * reversed.\n */\n \n+/**\n+ * \\var Debayer::paramsBuffers_\n+ * \\brief Ring of debayering parameters buffers\n+ */\n+\n /**\n * \\var Debayer::bench_\n * \\brief Benchmarking utility instance for performance measurements\ndiff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h\nindex 9a97851b7..6cefa4c01 100644\n--- a/src/libcamera/software_isp/debayer.h\n+++ b/src/libcamera/software_isp/debayer.h\n@@ -1,7 +1,7 @@\n /* SPDX-License-Identifier: LGPL-2.1-or-later */\n /*\n * Copyright (C) 2023, Linaro Ltd\n- * Copyright (C) 2023, Red Hat Inc.\n+ * Copyright (C) 2023-2026 Red Hat Inc.\n *\n * Authors:\n * Hans de Goede <hdegoede@redhat.com>\n@@ -35,7 +35,8 @@ LOG_DECLARE_CATEGORY(Debayer)\n class Debayer : public Object\n {\n public:\n-\tDebayer(const CameraManager &cm);\n+\tDebayer(const std::map<uint32_t, SharedFD> ¶msBuffers,\n+\t\tconst CameraManager &cm);\n \tvirtual ~Debayer() = 0;\n \n \tvirtual int configure(const StreamConfiguration &inputCfg,\n@@ -49,8 +50,7 @@ public:\n \n \tvirtual void process(uint32_t frame,\n \t\t\t const uint32_t paramsBufferId,\n-\t\t\t FrameBuffer *input, FrameBuffer *output,\n-\t\t\t const DebayerParams ¶ms) = 0;\n+\t\t\t FrameBuffer *input, FrameBuffer *output) = 0;\n \tvirtual int start() { return 0; }\n \tvirtual void stop() {}\n \n@@ -83,6 +83,7 @@ public:\n \tPixelFormat inputPixelFormat_;\n \tPixelFormat outputPixelFormat_;\n \tbool swapRedBlueGains_;\n+\tstd::map<uint32_t, DebayerParams *> paramsBuffers_;\n \tBenchmark bench_;\n \n private:\ndiff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\nindex 21ce22c0d..eb30ae047 100644\n--- a/src/libcamera/software_isp/debayer_cpu.cpp\n+++ b/src/libcamera/software_isp/debayer_cpu.cpp\n@@ -12,12 +12,12 @@\n #include \"debayer_cpu.h\"\n \n #include <algorithm>\n-#include <stdlib.h>\n #include <sys/ioctl.h>\n #include <utility>\n \n #include <linux/dma-buf.h>\n \n+#include <libcamera/base/shared_fd.h>\n #include <libcamera/base/thread.h>\n \n #include <libcamera/formats.h>\n@@ -90,10 +90,13 @@ DebayerCpuThread::DebayerCpuThread(DebayerCpu *debayer, unsigned int threadIndex\n /**\n * \\brief Constructs a DebayerCpu object\n * \\param[in] stats Pointer to the stats object to use\n+ * \\param[in] paramsBuffers SharedFDs of parameter buffers\n * \\param[in] cm The camera manager\n */\n-DebayerCpu::DebayerCpu(std::unique_ptr<SwStatsCpu> stats, const CameraManager &cm)\n-\t: Debayer(cm), stats_(std::move(stats))\n+DebayerCpu::DebayerCpu(std::unique_ptr<SwStatsCpu> stats,\n+\t\t const std::map<uint32_t, SharedFD> ¶msBuffers,\n+\t\t const CameraManager &cm)\n+\t: Debayer(paramsBuffers, cm), stats_(std::move(stats))\n {\n \t/*\n \t * Reading from uncached buffers may be very slow.\n@@ -977,13 +980,13 @@ void DebayerCpuThread::process4(uint32_t frame, const uint8_t *src, uint8_t *dst\n \t}\n }\n \n-void DebayerCpu::updateGammaTable(const DebayerParams ¶ms)\n+void DebayerCpu::updateGammaTable(const DebayerParams *params)\n {\n-\tconst RGB<float> blackLevel = params.blackLevel;\n+\tconst RGB<float> blackLevel = params->blackLevel;\n \t/* Take let's say the green channel black level */\n \tconst unsigned int blackIndex = blackLevel[1] * gammaTable_.size();\n-\tconst float gamma = params.gamma;\n-\tconst float contrastExp = params.contrastExp;\n+\tconst float gamma = params->gamma;\n+\tconst float contrastExp = params->contrastExp;\n \n \tconst float divisor = gammaTable_.size() - blackIndex - 1.0;\n \tfor (unsigned int i = blackIndex; i < gammaTable_.size(); i++) {\n@@ -1007,12 +1010,12 @@ void DebayerCpu::updateGammaTable(const DebayerParams ¶ms)\n \t\t gammaTable_[blackIndex]);\n }\n \n-void DebayerCpu::updateLookupTables(const DebayerParams ¶ms)\n+void DebayerCpu::updateLookupTables(const DebayerParams *params)\n {\n \tconst bool gammaUpdateNeeded =\n-\t\tparams.gamma != params_.gamma ||\n-\t\tparams.blackLevel != params_.blackLevel ||\n-\t\tparams.contrastExp != params_.contrastExp;\n+\t\tparams->gamma != params_.gamma ||\n+\t\tparams->blackLevel != params_.blackLevel ||\n+\t\tparams->contrastExp != params_.contrastExp;\n \tif (gammaUpdateNeeded)\n \t\tupdateGammaTable(params);\n \n@@ -1023,7 +1026,7 @@ void DebayerCpu::updateLookupTables(const DebayerParams ¶ms)\n \tconst double div = static_cast<double>(kRGBLookupSize) / gammaTableSize;\n \tif (ccmEnabled_) {\n \t\tif (gammaUpdateNeeded ||\n-\t\t matrixChanged(params.combinedMatrix, params_.combinedMatrix)) {\n+\t\t matrixChanged(params->combinedMatrix, params_.combinedMatrix)) {\n \t\t\tauto &red = swapRedBlueGains_ ? blueCcm_ : redCcm_;\n \t\t\tauto &green = greenCcm_;\n \t\t\tauto &blue = swapRedBlueGains_ ? redCcm_ : blueCcm_;\n@@ -1031,21 +1034,21 @@ void DebayerCpu::updateLookupTables(const DebayerParams ¶ms)\n \t\t\tconst unsigned int greenIndex = 1;\n \t\t\tconst unsigned int blueIndex = swapRedBlueGains_ ? 0 : 2;\n \t\t\tfor (unsigned int i = 0; i < kRGBLookupSize; i++) {\n-\t\t\t\tred[i].r = std::round(i * params.combinedMatrix[redIndex][0]);\n-\t\t\t\tred[i].g = std::round(i * params.combinedMatrix[greenIndex][0]);\n-\t\t\t\tred[i].b = std::round(i * params.combinedMatrix[blueIndex][0]);\n-\t\t\t\tgreen[i].r = std::round(i * params.combinedMatrix[redIndex][1]);\n-\t\t\t\tgreen[i].g = std::round(i * params.combinedMatrix[greenIndex][1]);\n-\t\t\t\tgreen[i].b = std::round(i * params.combinedMatrix[blueIndex][1]);\n-\t\t\t\tblue[i].r = std::round(i * params.combinedMatrix[redIndex][2]);\n-\t\t\t\tblue[i].g = std::round(i * params.combinedMatrix[greenIndex][2]);\n-\t\t\t\tblue[i].b = std::round(i * params.combinedMatrix[blueIndex][2]);\n+\t\t\t\tred[i].r = std::round(i * params->combinedMatrix[redIndex][0]);\n+\t\t\t\tred[i].g = std::round(i * params->combinedMatrix[greenIndex][0]);\n+\t\t\t\tred[i].b = std::round(i * params->combinedMatrix[blueIndex][0]);\n+\t\t\t\tgreen[i].r = std::round(i * params->combinedMatrix[redIndex][1]);\n+\t\t\t\tgreen[i].g = std::round(i * params->combinedMatrix[greenIndex][1]);\n+\t\t\t\tgreen[i].b = std::round(i * params->combinedMatrix[blueIndex][1]);\n+\t\t\t\tblue[i].r = std::round(i * params->combinedMatrix[redIndex][2]);\n+\t\t\t\tblue[i].g = std::round(i * params->combinedMatrix[greenIndex][2]);\n+\t\t\t\tblue[i].b = std::round(i * params->combinedMatrix[blueIndex][2]);\n \t\t\t\tgammaLut_[i] = gammaTable_[i / div];\n \t\t\t}\n \t\t}\n \t} else {\n-\t\tif (gammaUpdateNeeded || params.gains != params_.gains) {\n-\t\t\tauto &gains = params.gains;\n+\t\tif (gammaUpdateNeeded || params->gains != params_.gains) {\n+\t\t\tauto &gains = params->gains;\n \t\t\tauto &red = swapRedBlueGains_ ? blue_ : red_;\n \t\t\tauto &green = green_;\n \t\t\tauto &blue = swapRedBlueGains_ ? red_ : blue_;\n@@ -1060,18 +1063,17 @@ void DebayerCpu::updateLookupTables(const DebayerParams ¶ms)\n \t}\n \n \tLOG(Debayer, Debug)\n-\t\t<< \"Debayer parameters: blackLevel=\" << params.blackLevel\n-\t\t<< \"; gamma=\" << params.gamma\n-\t\t<< \"; contrastExp=\" << params.contrastExp\n-\t\t<< \"; gains=\" << params.gains\n-\t\t<< \"; matrix=\" << params.combinedMatrix;\n+\t\t<< \"Debayer parameters: blackLevel=\" << params->blackLevel\n+\t\t<< \"; gamma=\" << params->gamma\n+\t\t<< \"; contrastExp=\" << params->contrastExp\n+\t\t<< \"; gains=\" << params->gains\n+\t\t<< \"; matrix=\" << params->combinedMatrix;\n \n-\tparams_ = params;\n+\tparams_ = *params;\n }\n \n void DebayerCpu::process(uint32_t frame, const uint32_t paramsBufferId,\n-\t\t\t FrameBuffer *input, FrameBuffer *output,\n-\t\t\t const DebayerParams ¶ms)\n+\t\t\t FrameBuffer *input, FrameBuffer *output)\n {\n \tbench_.startFrame();\n \n@@ -1079,8 +1081,8 @@ void DebayerCpu::process(uint32_t frame, const uint32_t paramsBufferId,\n \n \tdmaSyncBegin(dmaSyncers, input, output);\n \n+\tDebayerParams *params = paramsBuffers_.at(paramsBufferId);\n \tupdateLookupTables(params);\n-\n \tparamsBufferReady.emit(paramsBufferId);\n \n \t/* Copy metadata from the input buffer */\ndiff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h\nindex 9f8389623..dc626f55c 100644\n--- a/src/libcamera/software_isp/debayer_cpu.h\n+++ b/src/libcamera/software_isp/debayer_cpu.h\n@@ -17,6 +17,7 @@\n \n #include <libcamera/base/mutex.h>\n #include <libcamera/base/object.h>\n+#include <libcamera/base/shared_fd.h>\n \n #include <libcamera/camera_manager.h>\n \n@@ -32,7 +33,9 @@ class DebayerCpuThread;\n class DebayerCpu : public Debayer\n {\n public:\n-\tDebayerCpu(std::unique_ptr<SwStatsCpu> stats, const CameraManager &cm);\n+\tDebayerCpu(std::unique_ptr<SwStatsCpu> stats,\n+\t\t const std::map<uint32_t, SharedFD> ¶msBuffers,\n+\t\t const CameraManager &cm);\n \t~DebayerCpu();\n \n \tint configure(const StreamConfiguration &inputCfg,\n@@ -43,8 +46,7 @@ public:\n \tstd::tuple<unsigned int, unsigned int>\n \tstrideAndFrameSize(const PixelFormat &outputFormat, const Size &size) override;\n \tvoid process(uint32_t frame, const uint32_t paramsBufferId,\n-\t\t FrameBuffer *input, FrameBuffer *output,\n-\t\t const DebayerParams ¶ms) override;\n+\t\t FrameBuffer *input, FrameBuffer *output) override;\n \tint start() override;\n \tvoid stop() override;\n \tSizeRange sizes(PixelFormat inputFormat, const Size &inputSize) override;\n@@ -128,8 +130,8 @@ private:\n \tint setDebayerFunctions(PixelFormat inputFormat,\n \t\t\t\tPixelFormat outputFormat,\n \t\t\t\tbool ccmEnabled);\n-\tvoid updateGammaTable(const DebayerParams ¶ms);\n-\tvoid updateLookupTables(const DebayerParams ¶ms);\n+\tvoid updateGammaTable(const DebayerParams *params);\n+\tvoid updateLookupTables(const DebayerParams *params);\n \n \tstatic constexpr unsigned int kRGBLookupSize = 256;\n \tstatic constexpr unsigned int kGammaLookupSize = 1024;\ndiff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp\nindex e3429f47f..a0a957db7 100644\n--- a/src/libcamera/software_isp/debayer_egl.cpp\n+++ b/src/libcamera/software_isp/debayer_egl.cpp\n@@ -37,10 +37,13 @@ namespace libcamera {\n /**\n * \\brief Construct a DebayerEGL object\n * \\param[in] stats Statistics processing object\n+ * \\param[in] paramsBuffers SharedFDs of parameter buffers\n * \\param[in] cm The camera manager\n */\n-DebayerEGL::DebayerEGL(std::unique_ptr<SwStatsCpu> stats, const CameraManager &cm)\n-\t: Debayer(cm), stats_(std::move(stats))\n+DebayerEGL::DebayerEGL(std::unique_ptr<SwStatsCpu> stats,\n+\t\t const std::map<uint32_t, SharedFD> ¶msBuffers,\n+\t\t const CameraManager &cm)\n+\t: Debayer(paramsBuffers, cm), stats_(std::move(stats))\n {\n }\n \n@@ -556,8 +559,7 @@ int DebayerEGL::debayerGPU(FrameBuffer *input, FrameBuffer *output, const Debaye\n }\n \n void DebayerEGL::process(uint32_t frame, const uint32_t paramsBufferId,\n-\t\t\t FrameBuffer *input, FrameBuffer *output,\n-\t\t\t const DebayerParams ¶ms)\n+\t\t\t FrameBuffer *input, FrameBuffer *output)\n {\n \tbench_.startFrame();\n \n@@ -570,11 +572,13 @@ void DebayerEGL::process(uint32_t frame, const uint32_t paramsBufferId,\n \tstd::optional<MappedFrameBuffer> inMapped;\n \tstd::optional<DmaSyncer> inDmaSyncer;\n \n+\tDebayerParams params = *paramsBuffers_.at(paramsBufferId);\n+\tparamsBufferReady.emit(paramsBufferId);\n+\n \tif (debayerGPU(input, output, params, &inMapped, &inDmaSyncer)) {\n \t\tLOG(Debayer, Error) << \"debayerGPU failed\";\n \t\tgoto error;\n \t}\n-\tparamsBufferReady.emit(paramsBufferId);\n \n \tmetadata.planes()[0].bytesused = output->planes()[0].length;\n \n@@ -605,7 +609,6 @@ void DebayerEGL::process(uint32_t frame, const uint32_t paramsBufferId,\n \treturn;\n \n error:\n-\tparamsBufferReady.emit(paramsBufferId);\n \tbench_.finishFrame();\n \tmetadata.status = FrameMetadata::FrameError;\n \treturn;\ndiff --git a/src/libcamera/software_isp/debayer_egl.h b/src/libcamera/software_isp/debayer_egl.h\nindex a3a4448e7..43e3dcb15 100644\n--- a/src/libcamera/software_isp/debayer_egl.h\n+++ b/src/libcamera/software_isp/debayer_egl.h\n@@ -39,7 +39,9 @@ class CameraManager;\n class DebayerEGL : public Debayer\n {\n public:\n-\tDebayerEGL(std::unique_ptr<SwStatsCpu> stats, const CameraManager &cm);\n+\tDebayerEGL(std::unique_ptr<SwStatsCpu> stats,\n+\t\t const std::map<uint32_t, SharedFD> ¶msBuffers,\n+\t\t const CameraManager &cm);\n \t~DebayerEGL();\n \n \tint configure(const StreamConfiguration &inputCfg,\n@@ -52,8 +54,7 @@ public:\n \tstd::tuple<unsigned int, unsigned int> strideAndFrameSize(const PixelFormat &outputFormat, const Size &size) override;\n \n \tvoid process(uint32_t frame, const uint32_t paramsBufferId,\n-\t\t FrameBuffer *input, FrameBuffer *output,\n-\t\t const DebayerParams ¶ms) override;\n+\t\t FrameBuffer *input, FrameBuffer *output) override;\n \tint start() override;\n \tvoid stop() override;\n \ndiff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\nindex 7f3bfe812..dbe4cc270 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -106,6 +106,10 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe,\n \t}\n \tstats->statsReady.connect(this, &SoftwareIsp::statsReady);\n \n+\tstd::map<uint32_t, SharedFD> fdParams;\n+\tfor (auto &[bufferId, item] : sharedParams_)\n+\t\tfdParams[bufferId] = item.fd();\n+\n #if HAVE_DEBAYER_EGL\n \tconst GlobalConfiguration &configuration = cm._d()->configuration();\n \tstd::optional<std::string> softISPMode = configuration.option<std::string>({ \"software_isp\", \"mode\" });\n@@ -120,15 +124,14 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe,\n \t}\n \n \tif (!softISPMode || softISPMode == \"gpu\")\n-\t\tdebayer_ = std::make_unique<DebayerEGL>(std::move(stats), cm);\n+\t\tdebayer_ = std::make_unique<DebayerEGL>(std::move(stats), fdParams,\n+\t\t\t\t\t\t\tcm);\n \n #endif\n \tif (!debayer_)\n-\t\tdebayer_ = std::make_unique<DebayerCpu>(std::move(stats), cm);\n+\t\tdebayer_ = std::make_unique<DebayerCpu>(std::move(stats), fdParams,\n+\t\t\t\t\t\t\tcm);\n \n-\tstd::map<uint32_t, SharedFD> fdParams;\n-\tfor (auto &[bufferId, item] : sharedParams_)\n-\t\tfdParams[bufferId] = item.fd();\n \tdebayer_->inputBufferReady.connect(this, &SoftwareIsp::inputReady);\n \tdebayer_->outputBufferReady.connect(this, &SoftwareIsp::outputReady);\n \tdebayer_->paramsBufferReady.connect(this, &SoftwareIsp::paramsBufferReady);\n@@ -168,7 +171,6 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe,\n \t\treturn;\n \t}\n \n-\tipa_->paramsComputed.connect(this, &SoftwareIsp::saveIspParams);\n \tipa_->metadataReady.connect(this,\n \t\t\t\t [this](uint32_t frame, const ControlList &metadata) {\n \t\t\t\t\t metadataReady.emit(frame, metadata);\n@@ -444,16 +446,11 @@ int SoftwareIsp::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output\n \tipa_->computeParams(frame, paramsBufferId);\n \tdebayer_->invokeMethod(&Debayer::process,\n \t\t\t ConnectionTypeQueued, frame, paramsBufferId,\n-\t\t\t input, output, debayerParams_);\n+\t\t\t input, output);\n \n \treturn 0;\n }\n \n-void SoftwareIsp::saveIspParams(const uint32_t paramsBufferId)\n-{\n-\tdebayerParams_ = *sharedParams_.at(paramsBufferId);\n-}\n-\n void SoftwareIsp::paramsBufferReady(const uint32_t paramsBufferId)\n {\n \tavailableParams_.push_back(paramsBufferId);\n", "prefixes": [ "RFC", "v4", "11/17" ] }