{"id":23799,"url":"https://patchwork.libcamera.org/api/patches/23799/?format=json","web_url":"https://patchwork.libcamera.org/patch/23799/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20250711201232.129264-11-mzamazal@redhat.com>","date":"2025-07-11T20:12:29","name":"[v13,10/12] libcamera: software_isp: Make measurement configurable","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4340bbd25bda717b942133e0f8fd1941f3dd78ae","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23799/mbox/","series":[{"id":5282,"url":"https://patchwork.libcamera.org/api/series/5282/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5282","date":"2025-07-11T20:12:19","name":"Add global configuration file","version":13,"mbox":"https://patchwork.libcamera.org/series/5282/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23799/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23799/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 281D4C3237\n\tfor ;\n\tFri, 11 Jul 2025 20:13:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BE58368F45;\n\tFri, 11 Jul 2025 22:13:11 +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 2C3CF68F27\n\tfor ;\n\tFri, 11 Jul 2025 22:13:10 +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-381-NIcMAUR4N_OQsiIKzXEnBg-1;\n\tFri, 11 Jul 2025 16:13:05 -0400","from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.40])\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 80DA419560AA; Fri, 11 Jul 2025 20:13:04 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.224.49])\n\tby mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 921621955F29; Fri, 11 Jul 2025 20:13:02 +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=\"OJGw4DTy\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1752264789;\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=cbk4esr4ScLuXICUPeHTr2G7bNtOexUC/Q0bd0IArN8=;\n\tb=OJGw4DTy9ZtxiaYOefvI37ERQsVyjUqIdunc8uNelj0wiaH3BDUXfORutBeGdA3Ggj/I+C\n\tWeX7qifZGvmXqNoET0PErIvrIKA/GYBtcRWMKKRelHeygZssDMa0f+y/fYOLzvcxD8VbSB\n\t/Mbiu6DtMGoXIjzyvuwM1SQPhgNOq2g=","X-MC-Unique":"NIcMAUR4N_OQsiIKzXEnBg-1","X-Mimecast-MFC-AGG-ID":"NIcMAUR4N_OQsiIKzXEnBg_1752264784","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 v13 10/12] libcamera: software_isp: Make measurement\n\tconfigurable","Date":"Fri, 11 Jul 2025 22:12:29 +0200","Message-ID":"<20250711201232.129264-11-mzamazal@redhat.com>","In-Reply-To":"<20250711201232.129264-1-mzamazal@redhat.com>","References":"<20250711201232.129264-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.40","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"lkq0XB7Ne94DMfQHwqo2HTEBWrfUbbmndy21LWAxliU_1752264784","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":"Software ISP performs performance measurement on certain part of initial\nframes. Let's make this range configurable.\n\nFor this purpose, this patch introduces new configuration options\npipelines.simple.measure.skip and pipelines.simple.measure.number.\nSetting the latter one to 0 disables the measurement.\n\nInstead of the last frame, the class member and its configuration\nspecify the number of frames to measure. This is easier to use for\nusers and doesn't require to adjust two configuration parameters when\nthe number of the initially skipped frames is changed.\n\nThe patch also changes the names of the class members to make them more\naccurate.\n\nCompletes software ISP TODO #7.\n\nSigned-off-by: Milan Zamazal \n---\n Documentation/runtime_configuration.rst | 6 ++++++\n src/libcamera/software_isp/TODO | 25 ----------------------\n src/libcamera/software_isp/debayer_cpu.cpp | 25 ++++++++++++++--------\n src/libcamera/software_isp/debayer_cpu.h | 7 +++---\n 4 files changed, 25 insertions(+), 38 deletions(-)","diff":"diff --git a/Documentation/runtime_configuration.rst b/Documentation/runtime_configuration.rst\nindex 42f49b686..66f4cc913 100644\n--- a/Documentation/runtime_configuration.rst\n+++ b/Documentation/runtime_configuration.rst\n@@ -55,6 +55,9 @@ file structure:\n ...\n simple:\n copy_input_buffer: # true/false\n+ measure:\n+ skip: # non-negative integer, frames to skip initially\n+ number: # non-negative integer, frames to measure\n supported_devices:\n - driver: # driver name, e.g. `mxc-isi`\n software_isp: # true/false\n@@ -90,6 +93,9 @@ Configuration file example\n min_total_unicam_buffers: 2\n simple:\n copy_input_buffer: false\n+ measure:\n+ skip: 50\n+ number: 30\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 2c919f442..f19e15ae2 100644\n--- a/src/libcamera/software_isp/TODO\n+++ b/src/libcamera/software_isp/TODO\n@@ -71,31 +71,6 @@ per-frame buffers like we do for hardware ISPs.\n \n ---\n \n-7. Performance measurement configuration\n-\n-> void DebayerCpu::process(FrameBuffer *input, FrameBuffer *output, DebayerParams params)\n-> /* Measure before emitting signals */\n-> if (measuredFrames_ < DebayerCpu::kLastFrameToMeasure &&\n-> ++measuredFrames_ > DebayerCpu::kFramesToSkip) {\n-> \ttimespec frameEndTime = {};\n-> \tclock_gettime(CLOCK_MONOTONIC_RAW, &frameEndTime);\n-> \tframeProcessTime_ += timeDiff(frameEndTime, frameStartTime);\n-> \tif (measuredFrames_ == DebayerCpu::kLastFrameToMeasure) {\n-> \t\tconst unsigned int measuredFrames = DebayerCpu::kLastFrameToMeasure -\n-> \t\t\t\t\t\t DebayerCpu::kFramesToSkip;\n-> \t\tLOG(Debayer, Info)\n-> \t\t\t<< \"Processed \" << measuredFrames\n-> \t\t\t<< \" frames in \" << frameProcessTime_ / 1000 << \"us, \"\n-> \t\t\t<< frameProcessTime_ / (1000 * measuredFrames)\n-> \t\t\t<< \" us/frame\";\n-> \t}\n-> }\n-\n-I wonder if there would be a way to control at runtime when/how to\n-perform those measurements. Maybe that's a bit overkill.\n-\n----\n-\n 8. DebayerCpu cleanups\n \n > >> class DebayerCpu : public Debayer, public Object\ndiff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\nindex 704d4e487..d43687f75 100644\n--- a/src/libcamera/software_isp/debayer_cpu.cpp\n+++ b/src/libcamera/software_isp/debayer_cpu.cpp\n@@ -55,6 +55,13 @@ DebayerCpu::DebayerCpu(std::unique_ptr stats, const GlobalConfigurat\n \tenableInputMemcpy_ =\n \t\tconfiguration.option({ \"pipelines\", \"simple\", \"copy_input_buffer\" }).value_or(true);\n \n+\tskipBeforeMeasure_ = configuration.option(\n+\t\t\t\t\t\t { \"pipelines\", \"simple\", \"measure\", \"skip\" })\n+\t\t\t\t .value_or(skipBeforeMeasure_);\n+\tframesToMeasure_ = configuration.option(\n+\t\t\t\t\t\t{ \"pipelines\", \"simple\", \"measure\", \"number\" })\n+\t\t\t\t .value_or(framesToMeasure_);\n+\n \t/* Initialize color lookup tables */\n \tfor (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) {\n \t\tred_[i] = green_[i] = blue_[i] = i;\n@@ -557,7 +564,7 @@ int DebayerCpu::configure(const StreamConfiguration &inputCfg,\n \t\t\tlineBuffers_[i].resize(lineBufferLength_);\n \t}\n \n-\tmeasuredFrames_ = 0;\n+\tencounteredFrames_ = 0;\n \tframeProcessTime_ = 0;\n \n \treturn 0;\n@@ -763,7 +770,10 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output\n {\n \ttimespec frameStartTime;\n \n-\tif (measuredFrames_ < DebayerCpu::kLastFrameToMeasure) {\n+\tbool measure = framesToMeasure_ > 0 &&\n+\t\t encounteredFrames_ < skipBeforeMeasure_ + framesToMeasure_ &&\n+\t\t ++encounteredFrames_ > skipBeforeMeasure_;\n+\tif (measure) {\n \t\tframeStartTime = {};\n \t\tclock_gettime(CLOCK_MONOTONIC_RAW, &frameStartTime);\n \t}\n@@ -820,18 +830,15 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output\n \tdmaSyncers.clear();\n \n \t/* Measure before emitting signals */\n-\tif (measuredFrames_ < DebayerCpu::kLastFrameToMeasure &&\n-\t ++measuredFrames_ > DebayerCpu::kFramesToSkip) {\n+\tif (measure) {\n \t\ttimespec frameEndTime = {};\n \t\tclock_gettime(CLOCK_MONOTONIC_RAW, &frameEndTime);\n \t\tframeProcessTime_ += timeDiff(frameEndTime, frameStartTime);\n-\t\tif (measuredFrames_ == DebayerCpu::kLastFrameToMeasure) {\n-\t\t\tconst unsigned int measuredFrames = DebayerCpu::kLastFrameToMeasure -\n-\t\t\t\t\t\t\t DebayerCpu::kFramesToSkip;\n+\t\tif (encounteredFrames_ == skipBeforeMeasure_ + framesToMeasure_) {\n \t\t\tLOG(Debayer, Info)\n-\t\t\t\t<< \"Processed \" << measuredFrames\n+\t\t\t\t<< \"Processed \" << framesToMeasure_\n \t\t\t\t<< \" frames in \" << frameProcessTime_ / 1000 << \"us, \"\n-\t\t\t\t<< frameProcessTime_ / (1000 * measuredFrames)\n+\t\t\t\t<< frameProcessTime_ / (1000 * framesToMeasure_)\n \t\t\t\t<< \" us/frame\";\n \t\t}\n \t}\ndiff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h\nindex 2f35aa18b..9d343e464 100644\n--- a/src/libcamera/software_isp/debayer_cpu.h\n+++ b/src/libcamera/software_isp/debayer_cpu.h\n@@ -161,11 +161,10 @@ private:\n \tunsigned int xShift_; /* Offset of 0/1 applied to window_.x */\n \tbool enableInputMemcpy_;\n \tbool swapRedBlueGains_;\n-\tunsigned int measuredFrames_;\n+\tunsigned int encounteredFrames_;\n \tint64_t frameProcessTime_;\n-\t/* Skip 30 frames for things to stabilize then measure 30 frames */\n-\tstatic constexpr unsigned int kFramesToSkip = 30;\n-\tstatic constexpr unsigned int kLastFrameToMeasure = 60;\n+\tunsigned int skipBeforeMeasure_ = 30;\n+\tunsigned int framesToMeasure_ = 30;\n };\n \n } /* namespace libcamera */\n","prefixes":["v13","10/12"]}