[{"id":36263,"web_url":"https://patchwork.libcamera.org/comment/36263/","msgid":"<176056252287.162040.7194503956362020834@ping.linuxembedded.co.uk>","date":"2025-10-15T21:08:42","subject":"Re: [PATCH v3 09/39] libcamera: software_isp: Move useful items from\n\tDebayerCpu to Debayer base class","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Bryan O'Donoghue (2025-10-15 02:22:21)\n> The DebayerCpu class has a number of variables, embedded structures and\n> methods which are useful to DebayerGpu implementation.\n> \n> Move relevant variables and methods to base class.\n> \n> Since we want to call setParams() from the GPUISP and reuse the code in\n> the existing CPUISP as a first step, we need to move all of the\n> dependent variables in DebayerCPU to the Debayer base class including\n> LookupTable and redCcm_.\n> \n> The DebayerEGL class will ultimately be able to consume both the CCM and\n> non-CCM data.\n\nThis looks like just a code move indeed, so I expect we'll see how it's\nused later.\n\n\nReviewed-by: Kieran Bingham \n\n> \n> Signed-off-by: Bryan O'Donoghue \n> ---\n> src/libcamera/software_isp/debayer.h | 45 +++++++++++++++++++++-\n> src/libcamera/software_isp/debayer_cpu.cpp | 2 +-\n> src/libcamera/software_isp/debayer_cpu.h | 35 +----------------\n> 3 files changed, 46 insertions(+), 36 deletions(-)\n> \n> diff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h\n> index ba033d44..1b195d29 100644\n> --- a/src/libcamera/software_isp/debayer.h\n> +++ b/src/libcamera/software_isp/debayer.h\n> @@ -14,11 +14,14 @@\n> #include \n> \n> #include \n> +#include \n> #include \n> \n> #include \n> #include \n> \n> +#include \"libcamera/internal/global_configuration.h\"\n> +#include \"libcamera/internal/software_isp/benchmark.h\"\n> #include \"libcamera/internal/software_isp/debayer_params.h\"\n> \n> namespace libcamera {\n> @@ -27,9 +30,10 @@ class FrameBuffer;\n> \n> LOG_DECLARE_CATEGORY(Debayer)\n> \n> -class Debayer\n> +class Debayer : public Object\n> {\n> public:\n> + Debayer (const GlobalConfiguration &configuration) : bench_(configuration) {};\n> virtual ~Debayer() = 0;\n> \n> virtual int configure(const StreamConfiguration &inputCfg,\n> @@ -45,8 +49,47 @@ public:\n> \n> virtual SizeRange sizes(PixelFormat inputFormat, const Size &inputSize) = 0;\n> \n> + virtual const SharedFD &getStatsFD() = 0;\n> +\n> + unsigned int frameSize() { return outputConfig_.frameSize; }\n> +\n> Signal inputBufferReady;\n> Signal outputBufferReady;\n> + \n> + /**\n> + * struct DebayerInputConfig \n> + *\n> + * Structure to describe the incoming Bayer parameters.\n> + */\n> + struct DebayerInputConfig {\n> + Size patternSize;\n> + unsigned int bpp; /* Memory used per pixel, not precision */\n> + unsigned int stride;\n> + std::vector outputFormats;\n> + };\n> +\n> + /**\n> + * struct DebayerOutputConfig \n> + *\n> + * Structure to describe the output pattern requested to the Debayer logic.\n> + */\n> + struct DebayerOutputConfig {\n> + unsigned int bpp; /* Memory used per pixel, not precision */\n> + unsigned int stride;\n> + unsigned int frameSize;\n> + };\n> +\n> + DebayerInputConfig inputConfig_;\n> + DebayerOutputConfig outputConfig_;\n> + DebayerParams::LookupTable red_;\n> + DebayerParams::LookupTable green_;\n> + DebayerParams::LookupTable blue_;\n> + DebayerParams::CcmLookupTable redCcm_;\n> + DebayerParams::CcmLookupTable greenCcm_;\n> + DebayerParams::CcmLookupTable blueCcm_;\n> + DebayerParams::LookupTable gammaLut_;\n> + bool swapRedBlueGains_;\n> + Benchmark bench_;\n> \n> private:\n> virtual Size patternSize(PixelFormat inputFormat) = 0;\n> diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\n> index df77deb6..612f01a6 100644\n> --- a/src/libcamera/software_isp/debayer_cpu.cpp\n> +++ b/src/libcamera/software_isp/debayer_cpu.cpp\n> @@ -42,7 +42,7 @@ namespace libcamera {\n> * \\param[in] configuration The global configuration\n> */\n> DebayerCpu::DebayerCpu(std::unique_ptr stats, const GlobalConfiguration &configuration)\n> - : stats_(std::move(stats)), bench_(configuration)\n> + : Debayer(configuration), stats_(std::move(stats))\n> {\n> /*\n> * Reading from uncached buffers may be very slow.\n> diff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h\n> index aff32491..ff72eaba 100644\n> --- a/src/libcamera/software_isp/debayer_cpu.h\n> +++ b/src/libcamera/software_isp/debayer_cpu.h\n> @@ -17,16 +17,14 @@\n> \n> #include \n> \n> -#include \"libcamera/internal/software_isp/benchmark.h\"\n> #include \"libcamera/internal/bayer_format.h\"\n> -#include \"libcamera/internal/global_configuration.h\"\n> #include \"libcamera/internal/software_isp/swstats_cpu.h\"\n> \n> #include \"debayer.h\"\n> \n> namespace libcamera {\n> \n> -class DebayerCpu : public Debayer, public Object\n> +class DebayerCpu : public Debayer\n> {\n> public:\n> DebayerCpu(std::unique_ptr stats, const GlobalConfiguration &configuration);\n> @@ -49,13 +47,6 @@ public:\n> */\n> const SharedFD &getStatsFD() { return stats_->getStatsFD(); }\n> \n> - /**\n> - * \\brief Get the output frame size\n> - *\n> - * \\return The output frame size\n> - */\n> - unsigned int frameSize() { return outputConfig_.frameSize; }\n> -\n> private:\n> /**\n> * \\brief Called to debayer 1 line of Bayer input data to output format\n> @@ -112,19 +103,6 @@ private:\n> template\n> void debayer10P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[]);\n> \n> - struct DebayerInputConfig {\n> - Size patternSize;\n> - unsigned int bpp; /* Memory used per pixel, not precision */\n> - unsigned int stride;\n> - std::vector outputFormats;\n> - };\n> -\n> - struct DebayerOutputConfig {\n> - unsigned int bpp; /* Memory used per pixel, not precision */\n> - unsigned int stride;\n> - unsigned int frameSize;\n> - };\n> -\n> int getInputConfig(PixelFormat inputFormat, DebayerInputConfig &config);\n> int getOutputConfig(PixelFormat outputFormat, DebayerOutputConfig &config);\n> int setupStandardBayerOrder(BayerFormat::Order order);\n> @@ -140,20 +118,11 @@ private:\n> /* Max. supported Bayer pattern height is 4, debayering this requires 5 lines */\n> static constexpr unsigned int kMaxLineBuffers = 5;\n> \n> - DebayerParams::LookupTable red_;\n> - DebayerParams::LookupTable green_;\n> - DebayerParams::LookupTable blue_;\n> - DebayerParams::CcmLookupTable redCcm_;\n> - DebayerParams::CcmLookupTable greenCcm_;\n> - DebayerParams::CcmLookupTable blueCcm_;\n> - DebayerParams::LookupTable gammaLut_;\n> debayerFn debayer0_;\n> debayerFn debayer1_;\n> debayerFn debayer2_;\n> debayerFn debayer3_;\n> Rectangle window_;\n> - DebayerInputConfig inputConfig_;\n> - DebayerOutputConfig outputConfig_;\n> std::unique_ptr stats_;\n> std::vector lineBuffers_[kMaxLineBuffers];\n> unsigned int lineBufferLength_;\n> @@ -161,8 +130,6 @@ private:\n> unsigned int lineBufferIndex_;\n> unsigned int xShift_; /* Offset of 0/1 applied to window_.x */\n> bool enableInputMemcpy_;\n> - bool swapRedBlueGains_;\n> - Benchmark bench_;\n> };\n> \n> } /* namespace libcamera */\n> -- \n> 2.51.0\n>","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 44972BE080\n\tfor ;\n\tWed, 15 Oct 2025 21:08:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 867266062C;\n\tWed, 15 Oct 2025 23:08:47 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9A17160615\n\tfor ;\n\tWed, 15 Oct 2025 23:08:46 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 23C3BE7C;\n\tWed, 15 Oct 2025 23:07:07 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"bzyoKVi7\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1760562427;\n\tbh=5WoiNXHwCjHYlWb+lfLLTu/olf7uTDzzA8sWWmrAs6M=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=bzyoKVi7zE9IGSlbhCD9h6d+1FIJqBe6UUnhYY5/O/y3irI7vlzgWSxfqX3U+xBnR\n\tF7sAWThW8SjkxgtgPWjYk7yIYd0rqDdrii59XzjFDjc8/G07s8KTjkysOW7nAtlCbx\n\tmYwTJ1VFYbC97AcpG8K5xnz0HXO3SGtbGne1AeoY=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20251015012251.17508-10-bryan.odonoghue@linaro.org>","References":"<20251015012251.17508-1-bryan.odonoghue@linaro.org>\n\t<20251015012251.17508-10-bryan.odonoghue@linaro.org>","Subject":"Re: [PATCH v3 09/39] libcamera: software_isp: Move useful items from\n\tDebayerCpu to Debayer base class","From":"Kieran Bingham ","Cc":"hdegoede@redhat.com, mzamazal@redhat.com, bryan.odonoghue@linaro.org,\n\tbod.linux@nxsw.ie","To":"Bryan O'Donoghue ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Wed, 15 Oct 2025 22:08:42 +0100","Message-ID":"<176056252287.162040.7194503956362020834@ping.linuxembedded.co.uk>","User-Agent":"alot/0.9.1","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\" "}},{"id":36294,"web_url":"https://patchwork.libcamera.org/comment/36294/","msgid":"<85plangthm.fsf@mzamazal-thinkpadp1gen7.tpbc.csb>","date":"2025-10-16T08:07:17","subject":"Re: [PATCH v3 09/39] libcamera: software_isp: Move useful items\n\tfrom DebayerCpu to Debayer base class","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"content":"Hi Bryan,\n\nBryan O'Donoghue writes:\n\n> The DebayerCpu class has a number of variables, embedded structures and\n> methods which are useful to DebayerGpu implementation.\n>\n> Move relevant variables and methods to base class.\n>\n> Since we want to call setParams() from the GPUISP and reuse the code in\n> the existing CPUISP as a first step, we need to move all of the\n> dependent variables in DebayerCPU to the Debayer base class including\n> LookupTable and redCcm_.\n>\n> The DebayerEGL class will ultimately be able to consume both the CCM and\n> non-CCM data.\n>\n> Signed-off-by: Bryan O'Donoghue \n> ---\n> src/libcamera/software_isp/debayer.h | 45 +++++++++++++++++++++-\n> src/libcamera/software_isp/debayer_cpu.cpp | 2 +-\n> src/libcamera/software_isp/debayer_cpu.h | 35 +----------------\n> 3 files changed, 46 insertions(+), 36 deletions(-)\n>\n> diff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h\n> index ba033d44..1b195d29 100644\n> --- a/src/libcamera/software_isp/debayer.h\n> +++ b/src/libcamera/software_isp/debayer.h\n> @@ -14,11 +14,14 @@\n> #include \n> \n> #include \n> +#include \n> #include \n> \n> #include \n> #include \n> \n> +#include \"libcamera/internal/global_configuration.h\"\n> +#include \"libcamera/internal/software_isp/benchmark.h\"\n> #include \"libcamera/internal/software_isp/debayer_params.h\"\n> \n> namespace libcamera {\n> @@ -27,9 +30,10 @@ class FrameBuffer;\n> \n> LOG_DECLARE_CATEGORY(Debayer)\n> \n> -class Debayer\n> +class Debayer : public Object\n\nIt's still not clear why Object is inherited here.\n\n> {\n> public:\n> +\tDebayer (const GlobalConfiguration &configuration) : bench_(configuration) {};\n> \tvirtual ~Debayer() = 0;\n> \n> \tvirtual int configure(const StreamConfiguration &inputCfg,\n> @@ -45,8 +49,47 @@ public:\n> \n> \tvirtual SizeRange sizes(PixelFormat inputFormat, const Size &inputSize) = 0;\n> \n> +\tvirtual const SharedFD &getStatsFD() = 0;\n> +\n> +\tunsigned int frameSize() { return outputConfig_.frameSize; }\n> +\n> \tSignal inputBufferReady;\n> \tSignal outputBufferReady;\n> +\t\n> +\t/**\n> +\t * struct DebayerInputConfig \n> +\t *\n> +\t * Structure to describe the incoming Bayer parameters.\n> +\t */\n> +\tstruct DebayerInputConfig {\n> +\t\tSize patternSize;\n> +\t\tunsigned int bpp; /* Memory used per pixel, not precision */\n> +\t\tunsigned int stride;\n> +\t\tstd::vector outputFormats;\n> +\t};\n> +\n> +\t/**\n> +\t * struct DebayerOutputConfig \n\nPlease do 's/ *$//' in this file.\n\n> +\t *\n> +\t * Structure to describe the output pattern requested to the Debayer logic.\n> +\t */\n> +\tstruct DebayerOutputConfig {\n> +\t\tunsigned int bpp; /* Memory used per pixel, not precision */\n> +\t\tunsigned int stride;\n> +\t\tunsigned int frameSize;\n> +\t};\n> +\n> +\tDebayerInputConfig inputConfig_;\n> +\tDebayerOutputConfig outputConfig_;\n> +\tDebayerParams::LookupTable red_;\n> +\tDebayerParams::LookupTable green_;\n> +\tDebayerParams::LookupTable blue_;\n> +\tDebayerParams::CcmLookupTable redCcm_;\n> +\tDebayerParams::CcmLookupTable greenCcm_;\n> +\tDebayerParams::CcmLookupTable blueCcm_;\n> +\tDebayerParams::LookupTable gammaLut_;\n> +\tbool swapRedBlueGains_;\n> +\tBenchmark bench_;\n> \n> private:\n> \tvirtual Size patternSize(PixelFormat inputFormat) = 0;\n> diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\n> index df77deb6..612f01a6 100644\n> --- a/src/libcamera/software_isp/debayer_cpu.cpp\n> +++ b/src/libcamera/software_isp/debayer_cpu.cpp\n> @@ -42,7 +42,7 @@ namespace libcamera {\n> * \\param[in] configuration The global configuration\n> */\n> DebayerCpu::DebayerCpu(std::unique_ptr stats, const GlobalConfiguration &configuration)\n> -\t: stats_(std::move(stats)), bench_(configuration)\n> +\t: Debayer(configuration), stats_(std::move(stats))\n> {\n> \t/*\n> \t * Reading from uncached buffers may be very slow.\n> diff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h\n> index aff32491..ff72eaba 100644\n> --- a/src/libcamera/software_isp/debayer_cpu.h\n> +++ b/src/libcamera/software_isp/debayer_cpu.h\n> @@ -17,16 +17,14 @@\n> \n> #include \n> \n> -#include \"libcamera/internal/software_isp/benchmark.h\"\n> #include \"libcamera/internal/bayer_format.h\"\n> -#include \"libcamera/internal/global_configuration.h\"\n> #include \"libcamera/internal/software_isp/swstats_cpu.h\"\n> \n> #include \"debayer.h\"\n> \n> namespace libcamera {\n> \n> -class DebayerCpu : public Debayer, public Object\n> +class DebayerCpu : public Debayer\n> {\n> public:\n> \tDebayerCpu(std::unique_ptr stats, const GlobalConfiguration &configuration);\n> @@ -49,13 +47,6 @@ public:\n> \t */\n> \tconst SharedFD &getStatsFD() { return stats_->getStatsFD(); }\n> \n> -\t/**\n> -\t * \\brief Get the output frame size\n> -\t *\n> -\t * \\return The output frame size\n> -\t */\n> -\tunsigned int frameSize() { return outputConfig_.frameSize; }\n> -\n> private:\n> \t/**\n> \t * \\brief Called to debayer 1 line of Bayer input data to output format\n> @@ -112,19 +103,6 @@ private:\n> \ttemplate\n> \tvoid debayer10P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[]);\n> \n> -\tstruct DebayerInputConfig {\n> -\t\tSize patternSize;\n> -\t\tunsigned int bpp; /* Memory used per pixel, not precision */\n> -\t\tunsigned int stride;\n> -\t\tstd::vector outputFormats;\n> -\t};\n> -\n> -\tstruct DebayerOutputConfig {\n> -\t\tunsigned int bpp; /* Memory used per pixel, not precision */\n> -\t\tunsigned int stride;\n> -\t\tunsigned int frameSize;\n> -\t};\n> -\n> \tint getInputConfig(PixelFormat inputFormat, DebayerInputConfig &config);\n> \tint getOutputConfig(PixelFormat outputFormat, DebayerOutputConfig &config);\n> \tint setupStandardBayerOrder(BayerFormat::Order order);\n> @@ -140,20 +118,11 @@ private:\n> \t/* Max. supported Bayer pattern height is 4, debayering this requires 5 lines */\n> \tstatic constexpr unsigned int kMaxLineBuffers = 5;\n> \n> -\tDebayerParams::LookupTable red_;\n> -\tDebayerParams::LookupTable green_;\n> -\tDebayerParams::LookupTable blue_;\n> -\tDebayerParams::CcmLookupTable redCcm_;\n> -\tDebayerParams::CcmLookupTable greenCcm_;\n> -\tDebayerParams::CcmLookupTable blueCcm_;\n> -\tDebayerParams::LookupTable gammaLut_;\n> \tdebayerFn debayer0_;\n> \tdebayerFn debayer1_;\n> \tdebayerFn debayer2_;\n> \tdebayerFn debayer3_;\n> \tRectangle window_;\n> -\tDebayerInputConfig inputConfig_;\n> -\tDebayerOutputConfig outputConfig_;\n> \tstd::unique_ptr stats_;\n> \tstd::vector lineBuffers_[kMaxLineBuffers];\n> \tunsigned int lineBufferLength_;\n> @@ -161,8 +130,6 @@ private:\n> \tunsigned int lineBufferIndex_;\n> \tunsigned int xShift_; /* Offset of 0/1 applied to window_.x */\n> \tbool enableInputMemcpy_;\n> -\tbool swapRedBlueGains_;\n> -\tBenchmark bench_;\n> };\n> \n> } /* namespace libcamera */","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 8BE3AC3259\n\tfor ;\n\tThu, 16 Oct 2025 08:07:26 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 38FA56065E;\n\tThu, 16 Oct 2025 10:07:25 +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 2EDBC600CC\n\tfor ;\n\tThu, 16 Oct 2025 10:07:23 +0200 (CEST)","from mail-wm1-f69.google.com (mail-wm1-f69.google.com\n\t[209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n\tus-mta-338-R9hdSrWwMQO9DS6KIOCAjA-1; Thu, 16 Oct 2025 04:07:20 -0400","by mail-wm1-f69.google.com with SMTP id\n\t5b1f17b1804b1-46e36686ca1so3371475e9.2\n\tfor ;\n\tThu, 16 Oct 2025 01:07:20 -0700 (PDT)","from mzamazal-thinkpadp1gen7.tpbc.csb\n\t(ip-77-48-47-2.net.vodafone.cz. [77.48.47.2])\n\tby smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-47114429679sm10626805e9.8.2025.10.16.01.07.17\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 16 Oct 2025 01:07:18 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"YpsDXBbD\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1760602041;\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\tin-reply-to:in-reply-to:references:references;\n\tbh=zDcnHL1WE/n75ruSSbs/j1xOBwoU/1/8/rQrEZHcebU=;\n\tb=YpsDXBbDaFrwp7iSuDaun+/O2ZsAo5YD9oTFDiSAHz2t7O75bovARRqlISFJUS6Wr341pv\n\tYFJ2+2d6hj+4VEFOZqOvRZiuyVax3hZAnLtstOHaiz+prL6FaUSsuvw+56akYlJkpqfT/s\n\tffMzTtttlWu3qPTM2+MpWlC5SnMXwFE=","X-MC-Unique":"R9hdSrWwMQO9DS6KIOCAjA-1","X-Mimecast-MFC-AGG-ID":"R9hdSrWwMQO9DS6KIOCAjA_1760602039","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1760602039; x=1761206839;\n\th=mime-version:user-agent:message-id:date:references:in-reply-to\n\t:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=zDcnHL1WE/n75ruSSbs/j1xOBwoU/1/8/rQrEZHcebU=;\n\tb=iWbChZu78CAFA2HRSPc3LUngQRYTF65dSs4m4oYrjIeThv+0ku/QlvmOir88fDlesz\n\tEJTu8ViKcVKw5PrKxgz2pzNKp8RQF0dB7NQosFV1xyDBisuQb51QWdftPPl/IYJh+VKW\n\tiYMmUh+P+yaFyK3TL4pHp08zCZeUPhV8/cYguK3LPakNKtGw3zlOlnvtH02XT5ozVP+w\n\taYVLy9WAd6nN9NmGQ5bU1s3fcmhj4mUXBhawO9tly50ROJj+p/q1grdqAFiFhVRWlnm5\n\t0bza3d35vAPE1bPlV6UkSPTmE0HPvYBTW4OXj1pC75w+e5zgFQgE7QZHzfgJ/KtuSH7R\n\tcgGQ==","X-Gm-Message-State":"AOJu0Yx2cyju22+kSUVyU1tzlKN6puqVwy4q7lE37GXZfLu1MIR/qjWz\n\tJfvU3aDnUTSYmI0JNfXLTJUmA/87iQNf9q9QFv8Bkv5YRg7Gwqmx/PyeCovCunQJGktiCedv7aO\n\tUmuWd0bxRDyrC7nluDEGFwvO8AZ1dPTPfICrT8L2vM//4wbwRs+4zmY9meOM+2rFIdKP1ZfScxt\n\tY=","X-Gm-Gg":"ASbGncv4EWMtb0Momi1bsmNCGhRPEN1vnxoevPv7UWhBptb8t8wgW1qyMHFbjLqcRXi\n\twkIyuR4LivDaAs0SD8uEzykugQSwab2tMmY2c26wWLcruC5bq4xRi3lX4CdCrDA6yTTSpXN74e7\n\tD7dysQ4D7cCm09J20dxEX882VUvWyerJ4IexobetUfh9ar+Q47bVBQbc6VWkIqdL2O8gp7VKf6k\n\tZWkDwbVosgzhMwjBXoiOEbPbVVmdAAUxziqmVC3NTitZAX0nd7bsP5ZVd26lH2LZa1f61PZYARX\n\t6vr87PX/c/K9la9yrFRIX0G/D+VyFdkczK8UuemCWq8b0tQbVdfnXqsPwxQ2m1qAP4P7V7NjafF\n\tNoFMLNDwz18yGzgmDvamVEwsPq1WoTqhJGCBByRNKt4q2bJpkw3s/","X-Received":["by 2002:a05:600c:4510:b0:45d:f83b:96aa with SMTP id\n\t5b1f17b1804b1-46fa9a8f2e1mr228825515e9.7.1760602039108; \n\tThu, 16 Oct 2025 01:07:19 -0700 (PDT)","by 2002:a05:600c:4510:b0:45d:f83b:96aa with SMTP id\n\t5b1f17b1804b1-46fa9a8f2e1mr228825205e9.7.1760602038665; \n\tThu, 16 Oct 2025 01:07:18 -0700 (PDT)"],"X-Google-Smtp-Source":"AGHT+IEu4nLJmsUmKFCS4jlb3BryZT+fMwDnI9/chMu/gan5ofU8Zpl+boXRw2M2XpgWf1W7zaT9sQ==","From":"Milan Zamazal ","To":"Bryan O'Donoghue ","Cc":"libcamera-devel@lists.libcamera.org, hdegoede@redhat.com,\n\tbod.linux@nxsw.ie","Subject":"Re: [PATCH v3 09/39] libcamera: software_isp: Move useful items\n\tfrom DebayerCpu to Debayer base class","In-Reply-To":"<20251015012251.17508-10-bryan.odonoghue@linaro.org> (Bryan\n\tO'Donoghue's message of \"Wed, 15 Oct 2025 02:22:21 +0100\")","References":"<20251015012251.17508-1-bryan.odonoghue@linaro.org>\n\t<20251015012251.17508-10-bryan.odonoghue@linaro.org>","Date":"Thu, 16 Oct 2025 10:07:17 +0200","Message-ID":"<85plangthm.fsf@mzamazal-thinkpadp1gen7.tpbc.csb>","User-Agent":"Gnus/5.13 (Gnus v5.13)","MIME-Version":"1.0","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"gYzMhekAhrtABOWGW-y4GUR0eYbqq2vyQrcXUWWBGrY_1760602039","X-Mimecast-Originator":"redhat.com","Content-Type":"text/plain","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\" "}},{"id":36296,"web_url":"https://patchwork.libcamera.org/comment/36296/","msgid":"<85h5vzgsn0.fsf@mzamazal-thinkpadp1gen7.tpbc.csb>","date":"2025-10-16T08:25:39","subject":"Re: [PATCH v3 09/39] libcamera: software_isp: Move useful items\n\tfrom DebayerCpu to Debayer base class","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"content":"Milan Zamazal writes:\n\n> Hi Bryan,\n>\n> Bryan O'Donoghue writes:\n>\n>> The DebayerCpu class has a number of variables, embedded structures and\n>> methods which are useful to DebayerGpu implementation.\n>>\n>> Move relevant variables and methods to base class.\n>>\n>> Since we want to call setParams() from the GPUISP and reuse the code in\n>> the existing CPUISP as a first step, we need to move all of the\n>> dependent variables in DebayerCPU to the Debayer base class including\n>> LookupTable and redCcm_.\n>>\n>> The DebayerEGL class will ultimately be able to consume both the CCM and\n>> non-CCM data.\n>>\n>> Signed-off-by: Bryan O'Donoghue \n>> ---\n>> src/libcamera/software_isp/debayer.h | 45 +++++++++++++++++++++-\n>> src/libcamera/software_isp/debayer_cpu.cpp | 2 +-\n>> src/libcamera/software_isp/debayer_cpu.h | 35 +----------------\n>> 3 files changed, 46 insertions(+), 36 deletions(-)\n>>\n>> diff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h\n>> index ba033d44..1b195d29 100644\n>> --- a/src/libcamera/software_isp/debayer.h\n>> +++ b/src/libcamera/software_isp/debayer.h\n>> @@ -14,11 +14,14 @@\n>> #include \n>> \n>> #include \n>> +#include \n>> #include \n>> \n>> #include \n>> #include \n>> \n>> +#include \"libcamera/internal/global_configuration.h\"\n>> +#include \"libcamera/internal/software_isp/benchmark.h\"\n>> #include \"libcamera/internal/software_isp/debayer_params.h\"\n>> \n>> namespace libcamera {\n>> @@ -27,9 +30,10 @@ class FrameBuffer;\n>> \n>> LOG_DECLARE_CATEGORY(Debayer)\n>> \n>> -class Debayer\n>> +class Debayer : public Object\n>\n> It's still not clear why Object is inherited here.\n>\n>> {\n>> public:\n>> +\tDebayer (const GlobalConfiguration &configuration) : bench_(configuration) {};\n>> \tvirtual ~Debayer() = 0;\n>> \n>> \tvirtual int configure(const StreamConfiguration &inputCfg,\n>> @@ -45,8 +49,47 @@ public:\n>> \n>> \tvirtual SizeRange sizes(PixelFormat inputFormat, const Size &inputSize) = 0;\n>> \n>> +\tvirtual const SharedFD &getStatsFD() = 0;\n>> +\n>> +\tunsigned int frameSize() { return outputConfig_.frameSize; }\n>> +\n>> \tSignal inputBufferReady;\n>> \tSignal outputBufferReady;\n>> +\t\n>> +\t/**\n>> +\t * struct DebayerInputConfig \n>> +\t *\n>> +\t * Structure to describe the incoming Bayer parameters.\n>> +\t */\n>> +\tstruct DebayerInputConfig {\n>> +\t\tSize patternSize;\n>> +\t\tunsigned int bpp; /* Memory used per pixel, not precision */\n>> +\t\tunsigned int stride;\n>> +\t\tstd::vector outputFormats;\n>> +\t};\n>> +\n>> +\t/**\n>> +\t * struct DebayerOutputConfig \n>\n> Please do 's/ *$//' in this file.\n\nAnd it should be \\struct here and above.\n\nAlso, please use either capital or lower case for \"bayer\" and \"debayer\"\nconsistently in docstrings in all the patches.\n\n>> +\t *\n>> +\t * Structure to describe the output pattern requested to the Debayer logic.\n>> +\t */\n>> +\tstruct DebayerOutputConfig {\n>> +\t\tunsigned int bpp; /* Memory used per pixel, not precision */\n>> +\t\tunsigned int stride;\n>> +\t\tunsigned int frameSize;\n>> +\t};\n>> +\n>> +\tDebayerInputConfig inputConfig_;\n>> +\tDebayerOutputConfig outputConfig_;\n>> +\tDebayerParams::LookupTable red_;\n>> +\tDebayerParams::LookupTable green_;\n>> +\tDebayerParams::LookupTable blue_;\n>> +\tDebayerParams::CcmLookupTable redCcm_;\n>> +\tDebayerParams::CcmLookupTable greenCcm_;\n>> +\tDebayerParams::CcmLookupTable blueCcm_;\n>> +\tDebayerParams::LookupTable gammaLut_;\n>> +\tbool swapRedBlueGains_;\n>> +\tBenchmark bench_;\n>> \n>> private:\n>> \tvirtual Size patternSize(PixelFormat inputFormat) = 0;\n>> diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\n>> index df77deb6..612f01a6 100644\n>> --- a/src/libcamera/software_isp/debayer_cpu.cpp\n>> +++ b/src/libcamera/software_isp/debayer_cpu.cpp\n>> @@ -42,7 +42,7 @@ namespace libcamera {\n>> * \\param[in] configuration The global configuration\n>> */\n>> DebayerCpu::DebayerCpu(std::unique_ptr stats, const GlobalConfiguration &configuration)\n>> -\t: stats_(std::move(stats)), bench_(configuration)\n>> +\t: Debayer(configuration), stats_(std::move(stats))\n>> {\n>> \t/*\n>> \t * Reading from uncached buffers may be very slow.\n>> diff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h\n>> index aff32491..ff72eaba 100644\n>> --- a/src/libcamera/software_isp/debayer_cpu.h\n>> +++ b/src/libcamera/software_isp/debayer_cpu.h\n>> @@ -17,16 +17,14 @@\n>> \n>> #include \n>> \n>> -#include \"libcamera/internal/software_isp/benchmark.h\"\n>> #include \"libcamera/internal/bayer_format.h\"\n>> -#include \"libcamera/internal/global_configuration.h\"\n>> #include \"libcamera/internal/software_isp/swstats_cpu.h\"\n>> \n>> #include \"debayer.h\"\n>> \n>> namespace libcamera {\n>> \n>> -class DebayerCpu : public Debayer, public Object\n>> +class DebayerCpu : public Debayer\n>> {\n>> public:\n>> \tDebayerCpu(std::unique_ptr stats, const GlobalConfiguration &configuration);\n>> @@ -49,13 +47,6 @@ public:\n>> \t */\n>> \tconst SharedFD &getStatsFD() { return stats_->getStatsFD(); }\n>> \n>> -\t/**\n>> -\t * \\brief Get the output frame size\n>> -\t *\n>> -\t * \\return The output frame size\n>> -\t */\n>> -\tunsigned int frameSize() { return outputConfig_.frameSize; }\n>> -\n>> private:\n>> \t/**\n>> \t * \\brief Called to debayer 1 line of Bayer input data to output format\n>> @@ -112,19 +103,6 @@ private:\n>> \ttemplate\n>> \tvoid debayer10P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[]);\n>> \n>> -\tstruct DebayerInputConfig {\n>> -\t\tSize patternSize;\n>> -\t\tunsigned int bpp; /* Memory used per pixel, not precision */\n>> -\t\tunsigned int stride;\n>> -\t\tstd::vector outputFormats;\n>> -\t};\n>> -\n>> -\tstruct DebayerOutputConfig {\n>> -\t\tunsigned int bpp; /* Memory used per pixel, not precision */\n>> -\t\tunsigned int stride;\n>> -\t\tunsigned int frameSize;\n>> -\t};\n>> -\n>> \tint getInputConfig(PixelFormat inputFormat, DebayerInputConfig &config);\n>> \tint getOutputConfig(PixelFormat outputFormat, DebayerOutputConfig &config);\n>> \tint setupStandardBayerOrder(BayerFormat::Order order);\n>> @@ -140,20 +118,11 @@ private:\n>> \t/* Max. supported Bayer pattern height is 4, debayering this requires 5 lines */\n>> \tstatic constexpr unsigned int kMaxLineBuffers = 5;\n>> \n>> -\tDebayerParams::LookupTable red_;\n>> -\tDebayerParams::LookupTable green_;\n>> -\tDebayerParams::LookupTable blue_;\n>> -\tDebayerParams::CcmLookupTable redCcm_;\n>> -\tDebayerParams::CcmLookupTable greenCcm_;\n>> -\tDebayerParams::CcmLookupTable blueCcm_;\n>> -\tDebayerParams::LookupTable gammaLut_;\n>> \tdebayerFn debayer0_;\n>> \tdebayerFn debayer1_;\n>> \tdebayerFn debayer2_;\n>> \tdebayerFn debayer3_;\n>> \tRectangle window_;\n>> -\tDebayerInputConfig inputConfig_;\n>> -\tDebayerOutputConfig outputConfig_;\n>> \tstd::unique_ptr stats_;\n>> \tstd::vector lineBuffers_[kMaxLineBuffers];\n>> \tunsigned int lineBufferLength_;\n>> @@ -161,8 +130,6 @@ private:\n>> \tunsigned int lineBufferIndex_;\n>> \tunsigned int xShift_; /* Offset of 0/1 applied to window_.x */\n>> \tbool enableInputMemcpy_;\n>> -\tbool swapRedBlueGains_;\n>> -\tBenchmark bench_;\n>> };\n>> \n>> } /* namespace libcamera */","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 81BD7C3259\n\tfor ;\n\tThu, 16 Oct 2025 08:25:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BEEBD60668;\n\tThu, 16 Oct 2025 10:25:46 +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 017B7600CC\n\tfor ;\n\tThu, 16 Oct 2025 10:25:44 +0200 (CEST)","from mail-wm1-f70.google.com (mail-wm1-f70.google.com\n\t[209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n\tus-mta-195-YrrwRE0INKWeUne5Tyxddg-1; Thu, 16 Oct 2025 04:25:42 -0400","by mail-wm1-f70.google.com with SMTP id\n\t5b1f17b1804b1-471005f28d2so1627895e9.0\n\tfor ;\n\tThu, 16 Oct 2025 01:25:42 -0700 (PDT)","from mzamazal-thinkpadp1gen7.tpbc.csb\n\t(ip-77-48-47-2.net.vodafone.cz. [77.48.47.2])\n\tby smtp.gmail.com with ESMTPSA id\n\tffacd0b85a97d-426ce57d3desm33343303f8f.7.2025.10.16.01.25.39\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 16 Oct 2025 01:25:40 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"S0mhQ4LB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1760603143;\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\tin-reply-to:in-reply-to:references:references;\n\tbh=JrcQtK+GobOKNDMwaGllUvp59tdvlBtQJ7AvIdduf8A=;\n\tb=S0mhQ4LBeKE4O8Ae+IzBZmGbb7W+vLJZaJfU5T1bh+ZKjWQ9MLcCZ4NaRoCsG3t/p/VNuR\n\t/HAwlUkvzXJZqiBhh/BL43RSL8f0WcYE6qvLjPipF0uomDagGihtBLgqa9734LSWu0LKHr\n\tU5oUgKMSBG7oQ4Wh9BZmxiODQOt/9V4=","X-MC-Unique":"YrrwRE0INKWeUne5Tyxddg-1","X-Mimecast-MFC-AGG-ID":"YrrwRE0INKWeUne5Tyxddg_1760603141","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1760603141; x=1761207941;\n\th=mime-version:user-agent:message-id:date:references:in-reply-to\n\t:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=JrcQtK+GobOKNDMwaGllUvp59tdvlBtQJ7AvIdduf8A=;\n\tb=E/6MuzWt6Wx2nX3qkfJmOixpR7F8Yufl+QF8CahmMCHx3CQWsVy7zJGC9gQA47uchh\n\tYgaT9t/GCCYdTRw2Y/F7ThGaMSJSwb7PBmJ/VPnSOcRLkOSSgROsrvUgX7VXXzXS3YwO\n\tMoJydy6HuPE3CN9JoIYsVgem/ln/Ot0IoMsc56WQ0wKPjSXuXgBVyfTamWVxYOXBrgJ1\n\tmgX8z6flzA2v8rNVYFgC01AKfWeG6pM9cuPqzwqhJmfBIUiexsR/LZKNePpDXN/kfc/H\n\to/qaM1Ohsz7ecO3VqTy3g3sjOysGJFSACr9arcdd9qAQd0SilFNzbbf28iWZKLYrn0ll\n\tE4YQ==","X-Gm-Message-State":"AOJu0YzIQPrSoje6790/Nm6J2LdxB6qBqvXxuqWsRDnCeBdsrTAufc2E\n\toexqogpYWW/N+ccNK2SVybjiPOTgyYwQepQdXBXoWSEcGkASiGOLom/n58dBCIXhHEO12nMj1lI\n\tLt3Gn1UkQ3WvbofwKpWRFogAdVzQxwz7ottWhWQ6bsDt0+vQuv7GmEkm+oIpmRXbRRiCQPf9plm\n\tM=","X-Gm-Gg":"ASbGnctSW8wV8hvSna6uM/iJhiE0AY9t2QWWRYbhXaVfN2BEOzQCtNJPcaw9u0vFeUm\n\tdYrW3a3j1IvWvaGEtl/ud5gw3DzGANopcOH1dc0ZuufhYjZysSkLypWDp2lPqFxwYMHLeaYkE12\n\tQUo3vB0E26+cQ7YzZs7/xX4G1AqLttBMJo0eNSiEjlag18I6I0KIxvPtE6p9QSFw8IBWFMnIZvK\n\tpf2cDFo+QMzbKuO0Yvm4R0mFdQ5aJyH790HqEe/olQtW2d8tKI4IN6SnwEQj3YnUj6zdClO9PCP\n\taHZv8eI2gZtf7Y79pAzBKh2aBcQbLDIbk1OTz+3B7e5NpftjKp2jt75fBxn5+UtoJ5c8iBqAp3P\n\t3QoXfz1lyqoSAF11u99Fkn27nztkr5UjqVX5FdcJDhq9QYtVXxnWp","X-Received":["by 2002:a05:600c:5285:b0:46e:4f25:aace with SMTP id\n\t5b1f17b1804b1-46fa9a8c43emr242018255e9.6.1760603141056; \n\tThu, 16 Oct 2025 01:25:41 -0700 (PDT)","by 2002:a05:600c:5285:b0:46e:4f25:aace with SMTP id\n\t5b1f17b1804b1-46fa9a8c43emr242018005e9.6.1760603140596; \n\tThu, 16 Oct 2025 01:25:40 -0700 (PDT)"],"X-Google-Smtp-Source":"AGHT+IGYRslW/kpiz0D+OBb116q1hBWkNKo7lxJ6Ftk2WgGAA/bxpFvMnqVn3C/TvzfRwFCL3wCwLQ==","From":"Milan Zamazal ","To":"Bryan O'Donoghue ","Cc":"libcamera-devel@lists.libcamera.org, hdegoede@redhat.com,\n\tbod.linux@nxsw.ie","Subject":"Re: [PATCH v3 09/39] libcamera: software_isp: Move useful items\n\tfrom DebayerCpu to Debayer base class","In-Reply-To":"<85plangthm.fsf@mzamazal-thinkpadp1gen7.tpbc.csb> (Milan\n\tZamazal's message of \"Thu, 16 Oct 2025 10:07:17 +0200\")","References":"<20251015012251.17508-1-bryan.odonoghue@linaro.org>\n\t<20251015012251.17508-10-bryan.odonoghue@linaro.org>\n\t<85plangthm.fsf@mzamazal-thinkpadp1gen7.tpbc.csb>","Date":"Thu, 16 Oct 2025 10:25:39 +0200","Message-ID":"<85h5vzgsn0.fsf@mzamazal-thinkpadp1gen7.tpbc.csb>","User-Agent":"Gnus/5.13 (Gnus v5.13)","MIME-Version":"1.0","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"Jdq-PVh7XdYYpBXPxUVJqrxLURk0ZfeQQoLfSEXYaY0_1760603141","X-Mimecast-Originator":"redhat.com","Content-Type":"text/plain","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\" "}}]