{"id":23573,"url":"https://patchwork.libcamera.org/api/1.1/patches/23573/?format=json","web_url":"https://patchwork.libcamera.org/patch/23573/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250616084733.18707-11-mzamazal@redhat.com>","date":"2025-06-16T08:47:28","name":"[v10,10/13] libcamera: software_isp: Make input buffer copying configurable","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c0873e283e01c0468e8276682b3c8759877e428e","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23573/mbox/","series":[{"id":5220,"url":"https://patchwork.libcamera.org/api/1.1/series/5220/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5220","date":"2025-06-16T08:47:18","name":"Add global configuration file","version":10,"mbox":"https://patchwork.libcamera.org/series/5220/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23573/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23573/checks/","tags":{},"headers":{"Return-Path":"","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 CC191C3237\n\tfor ;\n\tMon, 16 Jun 2025 08:48:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 83C1968DE5;\n\tMon, 16 Jun 2025 10:48:21 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6311F68DDA\n\tfor ;\n\tMon, 16 Jun 2025 10:48:19 +0200 (CEST)","from mx-prod-mc-01.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-678-ZOM7FbHVNCOOSOrViMJ2Kg-1;\n\tMon, 16 Jun 2025 04:48:15 -0400","from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.15])\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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id E95501956096; Mon, 16 Jun 2025 08:48:13 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.226.135])\n\tby mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id EF4F11956094; Mon, 16 Jun 2025 08:48:11 +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=\"AV0jJmao\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1750063698;\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=QnrY38GoVIiMKctOGvjeeQJcN9tul6u+eMh5CdYoedk=;\n\tb=AV0jJmaoU+n1iJGnkspLkPYp0bf+7DZVhqhPQl/9eZiTrRQB3lwadrBTf50bW6ewiQlLQA\n\tDsStQUCoyxvaquTZwa9hElwi++zRZ5fpyjTXO3NCCK0N8DgGWEV/uENfvhDcCSyPGFQYE5\n\tJehLWDTPcgt5Fa0oLieDaiD1J2Kp8DE=","X-MC-Unique":"ZOM7FbHVNCOOSOrViMJ2Kg-1","X-Mimecast-MFC-AGG-ID":"ZOM7FbHVNCOOSOrViMJ2Kg_1750063694","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , Kieran Bingham\n\t, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t, Laurent Pinchart\n\t","Subject":"[PATCH v10 10/13] libcamera: software_isp: Make input buffer copying\n\tconfigurable","Date":"Mon, 16 Jun 2025 10:47:28 +0200","Message-ID":"<20250616084733.18707-11-mzamazal@redhat.com>","In-Reply-To":"<20250616084733.18707-1-mzamazal@redhat.com>","References":"<20250616084733.18707-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.15","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"k9-Ivip7mTZIn4BhTr-xS5NIajHTN2SOLpQ7Bgs_ICQ_1750063694","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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"On some platforms, working directly on the input buffer is very slow due\nto disabled caching. This is why we copy the input buffer into standard\n(cached) memory. This is an unnecessary overhead on platforms with\ncached buffers.\n\nLet's make input buffer copying configurable. The default is still\ncopying, as it's overhead is much lower than contingent operations on\nnon-cached memory. Ideally, we should improve this in future to set the\ndefault to non-copying if we can be sure under observable circumstances\nthat we are working with cached buffers.\n\nCompletes software ISP TODO #6.\n\nSigned-off-by: Milan Zamazal \n---\n Documentation/runtime_configuration.rst | 2 ++\n src/libcamera/software_isp/TODO | 11 -----------\n src/libcamera/software_isp/debayer_cpu.cpp | 7 +++++--\n src/libcamera/software_isp/debayer_cpu.h | 3 ++-\n src/libcamera/software_isp/software_isp.cpp | 4 ++--\n 5 files changed, 11 insertions(+), 16 deletions(-)","diff":"diff --git a/Documentation/runtime_configuration.rst b/Documentation/runtime_configuration.rst\nindex d7b5f35ee..9fc5e4548 100644\n--- a/Documentation/runtime_configuration.rst\n+++ b/Documentation/runtime_configuration.rst\n@@ -49,6 +49,7 @@ file structure:\n rpi:\n config_file: # full path\n simple:\n+ copy_input_buffer: # true/false\n supported_devices:\n - driver: # driver name, e.g. `mxc-isi`\n software_isp: # true/false\n@@ -80,6 +81,7 @@ Configuration file example\n rpi:\n config_file: /usr/local/share/libcamera/pipeline/rpi/vc4/minimal_mem.yaml\n simple:\n+ copy_input_buffer: false\n supported_devices:\n - driver: mxc-isi\n software_isp: true\ndiff --git a/src/libcamera/software_isp/TODO b/src/libcamera/software_isp/TODO\nindex a50db668e..2c919f442 100644\n--- a/src/libcamera/software_isp/TODO\n+++ b/src/libcamera/software_isp/TODO\n@@ -71,17 +71,6 @@ per-frame buffers like we do for hardware ISPs.\n \n ---\n \n-6. Input buffer copying configuration\n-\n-> DebayerCpu::DebayerCpu(std::unique_ptr stats)\n-> \t: stats_(std::move(stats)), gammaCorrection_(1.0)\n-> {\n-> \tenableInputMemcpy_ = true;\n-\n-Set this appropriately and/or make it configurable.\n-\n----\n-\n 7. Performance measurement configuration\n \n > void DebayerCpu::process(FrameBuffer *input, FrameBuffer *output, DebayerParams params)\ndiff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\nindex 66f6038c1..3b5587164 100644\n--- a/src/libcamera/software_isp/debayer_cpu.cpp\n+++ b/src/libcamera/software_isp/debayer_cpu.cpp\n@@ -24,6 +24,7 @@\n #include \"libcamera/internal/bayer_format.h\"\n #include \"libcamera/internal/dma_buf_allocator.h\"\n #include \"libcamera/internal/framebuffer.h\"\n+#include \"libcamera/internal/global_configuration.h\"\n #include \"libcamera/internal/mapped_framebuffer.h\"\n \n namespace libcamera {\n@@ -38,8 +39,9 @@ namespace libcamera {\n /**\n * \\brief Constructs a DebayerCpu object\n * \\param[in] stats Pointer to the stats object to use\n+ * \\param[in] configuration The global configuration\n */\n-DebayerCpu::DebayerCpu(std::unique_ptr stats)\n+DebayerCpu::DebayerCpu(std::unique_ptr stats, const GlobalConfiguration &configuration)\n \t: stats_(std::move(stats))\n {\n \t/*\n@@ -50,7 +52,8 @@ DebayerCpu::DebayerCpu(std::unique_ptr stats)\n \t * always set it to true as the safer choice but this should be changed in\n \t * future.\n \t */\n-\tenableInputMemcpy_ = true;\n+\tenableInputMemcpy_ =\n+\t\tconfiguration.option(\"pipelines.simple.copy_input_buffer\").value_or(true);\n \n \t/* Initialize color lookup tables */\n \tfor (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) {\ndiff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h\nindex 926195e98..2f35aa18b 100644\n--- a/src/libcamera/software_isp/debayer_cpu.h\n+++ b/src/libcamera/software_isp/debayer_cpu.h\n@@ -18,6 +18,7 @@\n #include \n \n #include \"libcamera/internal/bayer_format.h\"\n+#include \"libcamera/internal/global_configuration.h\"\n \n #include \"debayer.h\"\n #include \"swstats_cpu.h\"\n@@ -27,7 +28,7 @@ namespace libcamera {\n class DebayerCpu : public Debayer, public Object\n {\n public:\n-\tDebayerCpu(std::unique_ptr stats);\n+\tDebayerCpu(std::unique_ptr stats, const GlobalConfiguration &configuration);\n \t~DebayerCpu();\n \n \tint configure(const StreamConfiguration &inputCfg,\ndiff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\nindex 3ce354111..a0ad88cac 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -115,7 +115,8 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,\n \t}\n \tstats->statsReady.connect(this, &SoftwareIsp::statsReady);\n \n-\tdebayer_ = std::make_unique(std::move(stats));\n+\tconst GlobalConfiguration &configuration = pipe->cameraManager()->_d()->configuration();\n+\tdebayer_ = std::make_unique(std::move(stats), configuration);\n \tdebayer_->inputBufferReady.connect(this, &SoftwareIsp::inputReady);\n \tdebayer_->outputBufferReady.connect(this, &SoftwareIsp::outputReady);\n \n@@ -131,7 +132,6 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,\n \t * The API tuning file is made from the sensor name. If the tuning file\n \t * isn't found, fall back to the 'uncalibrated' file.\n \t */\n-\tconst GlobalConfiguration &configuration = pipe->cameraManager()->_d()->configuration();\n \tstd::string ipaTuningFile =\n \t\tipa_->configurationFile(sensor->model() + \".yaml\", configuration, \"uncalibrated.yaml\");\n \n","prefixes":["v10","10/13"]}