[{"id":32983,"web_url":"https://patchwork.libcamera.org/comment/32983/","msgid":"<173644198234.2992722.24601405396579174@ping.linuxembedded.co.uk>","date":"2025-01-09T16:59:42","subject":"Re: [PATCH v3 5/9] libcamera: software_isp: Use a macro to assign\n\tdebayering methods","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Milan Zamazal (2024-12-10 15:34:35)\n> Assignments of the debayering methods to be used is a repetitive pattern\n> that can be (arguably) better expressed by using a macro. This removes\n> some duplication and also makes easier to introduce more complex\n> assignment patterns. This will be useful once color correction matrix\n> support is added.\n> \n\nBeing concise here will definitely help readability IMO of the lines. It\ndoes mean what it's setting and how is a bit more hidden, but the\n/intent/ is much more clear and I think that's beneficial.\n\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Milan Zamazal \n> ---\n> src/libcamera/software_isp/debayer_cpu.cpp | 25 ++++++++++------------\n> 1 file changed, 11 insertions(+), 14 deletions(-)\n> \n> diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\n> index 0eabced2..01cfb36b 100644\n> --- a/src/libcamera/software_isp/debayer_cpu.cpp\n> +++ b/src/libcamera/software_isp/debayer_cpu.cpp\n> @@ -368,6 +368,10 @@ int DebayerCpu::setupStandardBayerOrder(BayerFormat::Order order)\n> return 0;\n> }\n> \n> +#define SET_DEBAYER_METHODS(method0, method1) \\\n> + debayer0_ = addAlphaByte ? &DebayerCpu::method0 : &DebayerCpu::method0; \\\n> + debayer1_ = addAlphaByte ? &DebayerCpu::method1 : &DebayerCpu::method1;\n> +\n> int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, PixelFormat outputFormat)\n> {\n> BayerFormat bayerFormat =\n> @@ -423,16 +427,13 @@ int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, PixelFormat outputF\n> isStandardBayerOrder(bayerFormat.order)) {\n> switch (bayerFormat.bitDepth) {\n> case 8:\n> - debayer0_ = addAlphaByte ? &DebayerCpu::debayer8_BGBG_BGR888 : &DebayerCpu::debayer8_BGBG_BGR888;\n> - debayer1_ = addAlphaByte ? &DebayerCpu::debayer8_GRGR_BGR888 : &DebayerCpu::debayer8_GRGR_BGR888;\n> + SET_DEBAYER_METHODS(debayer8_BGBG_BGR888, debayer8_GRGR_BGR888)\n> break;\n> case 10:\n> - debayer0_ = addAlphaByte ? &DebayerCpu::debayer10_BGBG_BGR888 : &DebayerCpu::debayer10_BGBG_BGR888;\n> - debayer1_ = addAlphaByte ? &DebayerCpu::debayer10_GRGR_BGR888 : &DebayerCpu::debayer10_GRGR_BGR888;\n> + SET_DEBAYER_METHODS(debayer10_BGBG_BGR888, debayer10_GRGR_BGR888)\n> break;\n> case 12:\n> - debayer0_ = addAlphaByte ? &DebayerCpu::debayer12_BGBG_BGR888 : &DebayerCpu::debayer12_BGBG_BGR888;\n> - debayer1_ = addAlphaByte ? &DebayerCpu::debayer12_GRGR_BGR888 : &DebayerCpu::debayer12_GRGR_BGR888;\n> + SET_DEBAYER_METHODS(debayer12_BGBG_BGR888, debayer12_GRGR_BGR888)\n> break;\n> }\n> setupStandardBayerOrder(bayerFormat.order);\n> @@ -443,20 +444,16 @@ int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, PixelFormat outputF\n> bayerFormat.packing == BayerFormat::Packing::CSI2) {\n> switch (bayerFormat.order) {\n> case BayerFormat::BGGR:\n> - debayer0_ = addAlphaByte ? &DebayerCpu::debayer10P_BGBG_BGR888 : &DebayerCpu::debayer10P_BGBG_BGR888;\n> - debayer1_ = addAlphaByte ? &DebayerCpu::debayer10P_GRGR_BGR888 : &DebayerCpu::debayer10P_GRGR_BGR888;\n> + SET_DEBAYER_METHODS(debayer10P_BGBG_BGR888, debayer10P_GRGR_BGR888)\n> return 0;\n> case BayerFormat::GBRG:\n> - debayer0_ = addAlphaByte ? &DebayerCpu::debayer10P_GBGB_BGR888 : &DebayerCpu::debayer10P_GBGB_BGR888;\n> - debayer1_ = addAlphaByte ? &DebayerCpu::debayer10P_RGRG_BGR888 : &DebayerCpu::debayer10P_RGRG_BGR888;\n> + SET_DEBAYER_METHODS(debayer10P_GBGB_BGR888, debayer10P_RGRG_BGR888)\n> return 0;\n> case BayerFormat::GRBG:\n> - debayer0_ = addAlphaByte ? &DebayerCpu::debayer10P_GRGR_BGR888 : &DebayerCpu::debayer10P_GRGR_BGR888;\n> - debayer1_ = addAlphaByte ? &DebayerCpu::debayer10P_BGBG_BGR888 : &DebayerCpu::debayer10P_BGBG_BGR888;\n> + SET_DEBAYER_METHODS(debayer10P_GRGR_BGR888, debayer10P_BGBG_BGR888)\n> return 0;\n> case BayerFormat::RGGB:\n> - debayer0_ = addAlphaByte ? &DebayerCpu::debayer10P_RGRG_BGR888 : &DebayerCpu::debayer10P_RGRG_BGR888;\n> - debayer1_ = addAlphaByte ? &DebayerCpu::debayer10P_GBGB_BGR888 : &DebayerCpu::debayer10P_GBGB_BGR888;\n> + SET_DEBAYER_METHODS(debayer10P_RGRG_BGR888, debayer10P_GBGB_BGR888)\n> return 0;\n> default:\n> break;\n> -- \n> 2.44.2\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 D1C8DC32EF\n\tfor ;\n\tThu, 9 Jan 2025 16:59:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 062BB684E0;\n\tThu, 9 Jan 2025 17:59:47 +0100 (CET)","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 2D7E961880\n\tfor ;\n\tThu, 9 Jan 2025 17:59:45 +0100 (CET)","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 58B6E110F;\n\tThu, 9 Jan 2025 17:58:51 +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=\"wFftLiEB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1736441931;\n\tbh=ID4OeHGz7y6UegnmFuEcnaj/2aCv5UtZuBbKta3fVvk=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=wFftLiEBBL/lBLJr2d/l6Vu+01/v8ym/zTvzspfwoS5jXhLyvrh/qh3bcVbtFnFZC\n\tfrj9Lh+/GYiny28a9CEZynDzPxp76Vx5m9b6ODiuk4tpcaX0bZ9V2r3xkFk7zqbkOQ\n\t+ED2b/ZJt0un1JKQfF3C9b2MIFkDbnARL8TPtros=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20241210153440.1007470-6-mzamazal@redhat.com>","References":"<20241210153440.1007470-1-mzamazal@redhat.com>\n\t<20241210153440.1007470-6-mzamazal@redhat.com>","Subject":"Re: [PATCH v3 5/9] libcamera: software_isp: Use a macro to assign\n\tdebayering methods","From":"Kieran Bingham ","Cc":"Milan Zamazal ,\n\tRobert Mader ,\n\tHans de Goede , \n\tLaurent Pinchart ","To":"Milan Zamazal , libcamera-devel@lists.libcamera.org","Date":"Thu, 09 Jan 2025 16:59:42 +0000","Message-ID":"<173644198234.2992722.24601405396579174@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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\" "}}]