{"id":22047,"url":"https://patchwork.libcamera.org/api/1.1/patches/22047/?format=json","web_url":"https://patchwork.libcamera.org/patch/22047/","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":"<20241120180104.1221846-5-mzamazal@redhat.com>","date":"2024-11-20T18:00:59","name":"[4/9] libcamera: software_isp: Use common code to store debayered pixels","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b6bdd6cb90430ceddc22691e9a9d4240e77a9db0","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/22047/mbox/","series":[{"id":4810,"url":"https://patchwork.libcamera.org/api/1.1/series/4810/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4810","date":"2024-11-20T18:00:55","name":"Software ISP support for CCM","version":1,"mbox":"https://patchwork.libcamera.org/series/4810/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22047/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22047/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 0FEC1C330C\n\tfor ;\n\tWed, 20 Nov 2024 18:01:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8AF8165F99;\n\tWed, 20 Nov 2024 19:01:32 +0100 (CET)","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 B97D065F81\n\tfor ;\n\tWed, 20 Nov 2024 19:01:27 +0100 (CET)","from mx-prod-mc-04.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-235-mbd4k1kcPRGJlg3VdLmtdA-1;\n\tWed, 20 Nov 2024 13:01:21 -0500","from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS\n\tid 9903419560AD for ;\n\tWed, 20 Nov 2024 18:01:19 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.224.6])\n\tby mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 59A0330000DF; Wed, 20 Nov 2024 18:01:18 +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=\"KaqMx/C8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1732125686;\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=2iYya2UK9vjfJEVlsryYflNba2AHDRhlYaLto5B1SJI=;\n\tb=KaqMx/C8ewKoNHj49NF/YUEWQ1M9Lwz2E8JZMCnYF7UMqUcJ4QV8kxXZuJWhfFMiD13TzQ\n\tZ5jjulWrWpgHWNhC7AGJ8qP3io01TEc4OxgB1Vfg+zGU7dGunSHSAMxZ470C38L2PzWSzL\n\tEzvwR+yXR8rX6jOYgRSW45FOKRy4PME=","X-MC-Unique":"mbd4k1kcPRGJlg3VdLmtdA-1","X-Mimecast-MFC-AGG-ID":"mbd4k1kcPRGJlg3VdLmtdA","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ","Subject":"[PATCH 4/9] libcamera: software_isp: Use common code to store\n\tdebayered pixels","Date":"Wed, 20 Nov 2024 19:00:59 +0100","Message-ID":"<20241120180104.1221846-5-mzamazal@redhat.com>","In-Reply-To":"<20241120180104.1221846-1-mzamazal@redhat.com>","References":"<20241120180104.1221846-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.4","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"kAHUNTk8i1ZpwLmtyAqcGNxNPXegQSNszYGZ_s5u5h4_1732125679","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":"The debayering macros use the same pattern, let's extract it to a common\nmacro. This reduces code duplication a bit now and it'll make changes\nof debayering easier when color correction matrix is introduced.\n\nSigned-off-by: Milan Zamazal \n---\n src/libcamera/software_isp/debayer_cpu.cpp | 56 +++++++++++-----------\n 1 file changed, 28 insertions(+), 28 deletions(-)","diff":"diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\nindex cf5ecdf7a..b9497d574 100644\n--- a/src/libcamera/software_isp/debayer_cpu.cpp\n+++ b/src/libcamera/software_isp/debayer_cpu.cpp\n@@ -61,57 +61,57 @@ DebayerCpu::~DebayerCpu() = default;\n \tconst pixel_t *curr = (const pixel_t *)src[1] + xShift_; \\\n \tconst pixel_t *next = (const pixel_t *)src[2] + xShift_;\n \n+#define STORE_PIXEL(b, g, r) \\\n+\t*dst++ = blue_[r]; \\\n+\t*dst++ = green_[g]; \\\n+\t*dst++ = red_[b]; \\\n+\tif constexpr (addAlphaByte) \\\n+\t\t*dst++ = 255; \\\n+\tx++;\n+\n /*\n * RGR\n * GBG\n * RGR\n */\n-#define BGGR_BGR888(p, n, div) \\\n-\t*dst++ = blue_[curr[x] / (div)]; \\\n-\t*dst++ = green_[(prev[x] + curr[x - p] + curr[x + n] + next[x]) / (4 * (div))]; \\\n-\t*dst++ = red_[(prev[x - p] + prev[x + n] + next[x - p] + next[x + n]) / (4 * (div))]; \\\n-\tif constexpr (addAlphaByte) \\\n-\t\t*dst++ = 255; \\\n-\tx++;\n+#define BGGR_BGR888(p, n, div) \\\n+\tSTORE_PIXEL( \\\n+\t\tcurr[x] / (div), \\\n+\t\t(prev[x] + curr[x - p] + curr[x + n] + next[x]) / (4 * (div)), \\\n+\t\t(prev[x - p] + prev[x + n] + next[x - p] + next[x + n]) / (4 * (div)))\n \n /*\n * GBG\n * RGR\n * GBG\n */\n-#define GRBG_BGR888(p, n, div) \\\n-\t*dst++ = blue_[(prev[x] + next[x]) / (2 * (div))]; \\\n-\t*dst++ = green_[curr[x] / (div)]; \\\n-\t*dst++ = red_[(curr[x - p] + curr[x + n]) / (2 * (div))]; \\\n-\tif constexpr (addAlphaByte) \\\n-\t\t*dst++ = 255; \\\n-\tx++;\n+#define GRBG_BGR888(p, n, div) \\\n+\tSTORE_PIXEL( \\\n+\t\t(prev[x] + next[x]) / (2 * (div)), \\\n+\t\tcurr[x] / (div), \\\n+\t\t(curr[x - p] + curr[x + n]) / (2 * (div)))\n \n /*\n * GRG\n * BGB\n * GRG\n */\n-#define GBRG_BGR888(p, n, div) \\\n-\t*dst++ = blue_[(curr[x - p] + curr[x + n]) / (2 * (div))]; \\\n-\t*dst++ = green_[curr[x] / (div)]; \\\n-\t*dst++ = red_[(prev[x] + next[x]) / (2 * (div))]; \\\n-\tif constexpr (addAlphaByte) \\\n-\t\t*dst++ = 255; \\\n-\tx++;\n+#define GBRG_BGR888(p, n, div) \\\n+\tSTORE_PIXEL( \\\n+\t\t(curr[x - p] + curr[x + n]) / (2 * (div)), \\\n+\t\tcurr[x] / (div), \\\n+\t\t(prev[x] + next[x]) / (2 * (div)))\n \n /*\n * BGB\n * GRG\n * BGB\n */\n-#define RGGB_BGR888(p, n, div) \\\n-\t*dst++ = blue_[(prev[x - p] + prev[x + n] + next[x - p] + next[x + n]) / (4 * (div))]; \\\n-\t*dst++ = green_[(prev[x] + curr[x - p] + curr[x + n] + next[x]) / (4 * (div))]; \\\n-\t*dst++ = red_[curr[x] / (div)]; \\\n-\tif constexpr (addAlphaByte) \\\n-\t\t*dst++ = 255; \\\n-\tx++;\n+#define RGGB_BGR888(p, n, div) \\\n+\tSTORE_PIXEL( \\\n+\t\t(prev[x - p] + prev[x + n] + next[x - p] + next[x + n]) / (4 * (div)), \\\n+\t\t(prev[x] + curr[x - p] + curr[x + n] + next[x]) / (4 * (div)), \\\n+\t\tcurr[x] / (div))\n \n template\n void DebayerCpu::debayer8_BGBG_BGR888(uint8_t *dst, const uint8_t *src[])\n","prefixes":["4/9"]}