Patch Detail
Show a patch.
GET /api/1.1/patches/23041/?format=api
{ "id": 23041, "url": "https://patchwork.libcamera.org/api/1.1/patches/23041/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23041/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20250326090849.15494-7-mzamazal@redhat.com>", "date": "2025-03-26T09:08:43", "name": "[v8,06/10] libcamera: software_isp: Use a macro to assign debayering methods", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "fe99b43fa0b758afb287cd721ab40a0063c7cf4f", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/1.1/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/23041/mbox/", "series": [ { "id": 5083, "url": "https://patchwork.libcamera.org/api/1.1/series/5083/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5083", "date": "2025-03-26T09:08:37", "name": "Software ISP support for CCM", "version": 8, "mbox": "https://patchwork.libcamera.org/series/5083/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23041/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23041/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 7D91EC3213\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 26 Mar 2025 09:09:22 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0D6E76896F;\n\tWed, 26 Mar 2025 10:09:22 +0100 (CET)", "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 B683768966\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 26 Mar 2025 10:09:19 +0100 (CET)", "from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-202-4o2d8XfhPDax4WxujDDuSw-1;\n\tWed, 26 Mar 2025 05:09:15 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 217421801A1A; Wed, 26 Mar 2025 09:09:14 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.34.15])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 1F9601801747; Wed, 26 Mar 2025 09:09: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=\"iWp454FV\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1742980158;\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=oEajtpDYr/hh2E+fAIEtMaDDilSaCC7BTa2d7TnavTY=;\n\tb=iWp454FVpzlnWoe2ewqpUUAU+9itCZK5oFpocsPVuqpxHb+UHd60g6/O7UyC4Nyd2q7ewS\n\tQfuOW0CyHWTiK7Hbyruvd5MI6yXX8g5DbpZfxZa9v/n9iN6vmhLjKF3oAV3WVfr0sNvjKl\n\tHQGdD0aYb5YGCrZJkuquVzuAtxeEVJc=", "X-MC-Unique": "4o2d8XfhPDax4WxujDDuSw-1", "X-Mimecast-MFC-AGG-ID": "4o2d8XfhPDax4WxujDDuSw_1742980154", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tRobert Mader <robert.mader@collabora.com>,\n\tHans de Goede <hdegoede@redhat.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>", "Subject": "[PATCH v8 06/10] libcamera: software_isp: Use a macro to assign\n\tdebayering methods", "Date": "Wed, 26 Mar 2025 10:08:43 +0100", "Message-ID": "<20250326090849.15494-7-mzamazal@redhat.com>", "In-Reply-To": "<20250326090849.15494-1-mzamazal@redhat.com>", "References": "<20250326090849.15494-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": "VGfsU7LF_ADkmAFSj7kCqZOBb6fpalYXBNr6X-y0Ykk_1742980154", "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": "Assignments of the debayering methods to be used is a repetitive pattern\nthat can be (arguably) better expressed by using a macro. This removes\nsome duplication and also makes easier to introduce more complex\nassignment patterns. This will be useful once color correction matrix\nsupport is added.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n src/libcamera/software_isp/debayer_cpu.cpp | 25 ++++++++++------------\n 1 file changed, 11 insertions(+), 14 deletions(-)", "diff": "diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\nindex 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 \treturn 0;\n }\n \n+#define SET_DEBAYER_METHODS(method0, method1) \\\n+\tdebayer0_ = addAlphaByte ? &DebayerCpu::method0<true> : &DebayerCpu::method0<false>; \\\n+\tdebayer1_ = addAlphaByte ? &DebayerCpu::method1<true> : &DebayerCpu::method1<false>;\n+\n int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, PixelFormat outputFormat)\n {\n \tBayerFormat bayerFormat =\n@@ -423,16 +427,13 @@ int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, PixelFormat outputF\n \t isStandardBayerOrder(bayerFormat.order)) {\n \t\tswitch (bayerFormat.bitDepth) {\n \t\tcase 8:\n-\t\t\tdebayer0_ = addAlphaByte ? &DebayerCpu::debayer8_BGBG_BGR888<true> : &DebayerCpu::debayer8_BGBG_BGR888<false>;\n-\t\t\tdebayer1_ = addAlphaByte ? &DebayerCpu::debayer8_GRGR_BGR888<true> : &DebayerCpu::debayer8_GRGR_BGR888<false>;\n+\t\t\tSET_DEBAYER_METHODS(debayer8_BGBG_BGR888, debayer8_GRGR_BGR888)\n \t\t\tbreak;\n \t\tcase 10:\n-\t\t\tdebayer0_ = addAlphaByte ? &DebayerCpu::debayer10_BGBG_BGR888<true> : &DebayerCpu::debayer10_BGBG_BGR888<false>;\n-\t\t\tdebayer1_ = addAlphaByte ? &DebayerCpu::debayer10_GRGR_BGR888<true> : &DebayerCpu::debayer10_GRGR_BGR888<false>;\n+\t\t\tSET_DEBAYER_METHODS(debayer10_BGBG_BGR888, debayer10_GRGR_BGR888)\n \t\t\tbreak;\n \t\tcase 12:\n-\t\t\tdebayer0_ = addAlphaByte ? &DebayerCpu::debayer12_BGBG_BGR888<true> : &DebayerCpu::debayer12_BGBG_BGR888<false>;\n-\t\t\tdebayer1_ = addAlphaByte ? &DebayerCpu::debayer12_GRGR_BGR888<true> : &DebayerCpu::debayer12_GRGR_BGR888<false>;\n+\t\t\tSET_DEBAYER_METHODS(debayer12_BGBG_BGR888, debayer12_GRGR_BGR888)\n \t\t\tbreak;\n \t\t}\n \t\tsetupStandardBayerOrder(bayerFormat.order);\n@@ -443,20 +444,16 @@ int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, PixelFormat outputF\n \t bayerFormat.packing == BayerFormat::Packing::CSI2) {\n \t\tswitch (bayerFormat.order) {\n \t\tcase BayerFormat::BGGR:\n-\t\t\tdebayer0_ = addAlphaByte ? &DebayerCpu::debayer10P_BGBG_BGR888<true> : &DebayerCpu::debayer10P_BGBG_BGR888<false>;\n-\t\t\tdebayer1_ = addAlphaByte ? &DebayerCpu::debayer10P_GRGR_BGR888<true> : &DebayerCpu::debayer10P_GRGR_BGR888<false>;\n+\t\t\tSET_DEBAYER_METHODS(debayer10P_BGBG_BGR888, debayer10P_GRGR_BGR888)\n \t\t\treturn 0;\n \t\tcase BayerFormat::GBRG:\n-\t\t\tdebayer0_ = addAlphaByte ? &DebayerCpu::debayer10P_GBGB_BGR888<true> : &DebayerCpu::debayer10P_GBGB_BGR888<false>;\n-\t\t\tdebayer1_ = addAlphaByte ? &DebayerCpu::debayer10P_RGRG_BGR888<true> : &DebayerCpu::debayer10P_RGRG_BGR888<false>;\n+\t\t\tSET_DEBAYER_METHODS(debayer10P_GBGB_BGR888, debayer10P_RGRG_BGR888)\n \t\t\treturn 0;\n \t\tcase BayerFormat::GRBG:\n-\t\t\tdebayer0_ = addAlphaByte ? &DebayerCpu::debayer10P_GRGR_BGR888<true> : &DebayerCpu::debayer10P_GRGR_BGR888<false>;\n-\t\t\tdebayer1_ = addAlphaByte ? &DebayerCpu::debayer10P_BGBG_BGR888<true> : &DebayerCpu::debayer10P_BGBG_BGR888<false>;\n+\t\t\tSET_DEBAYER_METHODS(debayer10P_GRGR_BGR888, debayer10P_BGBG_BGR888)\n \t\t\treturn 0;\n \t\tcase BayerFormat::RGGB:\n-\t\t\tdebayer0_ = addAlphaByte ? &DebayerCpu::debayer10P_RGRG_BGR888<true> : &DebayerCpu::debayer10P_RGRG_BGR888<false>;\n-\t\t\tdebayer1_ = addAlphaByte ? &DebayerCpu::debayer10P_GBGB_BGR888<true> : &DebayerCpu::debayer10P_GBGB_BGR888<false>;\n+\t\t\tSET_DEBAYER_METHODS(debayer10P_RGRG_BGR888, debayer10P_GBGB_BGR888)\n \t\t\treturn 0;\n \t\tdefault:\n \t\t\tbreak;\n", "prefixes": [ "v8", "06/10" ] }