{"id":22280,"url":"https://patchwork.libcamera.org/api/1.1/patches/22280/?format=json","web_url":"https://patchwork.libcamera.org/patch/22280/","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":"<20241210153440.1007470-5-mzamazal@redhat.com>","date":"2024-12-10T15:34:34","name":"[v3,4/9] libcamera: software_isp: Use common code to store debayered pixels","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"1ed6d75c15a4692fc5964ea153bc62d262b5bda5","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/22280/mbox/","series":[{"id":4871,"url":"https://patchwork.libcamera.org/api/1.1/series/4871/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4871","date":"2024-12-10T15:34:30","name":"Software ISP support for CCM","version":3,"mbox":"https://patchwork.libcamera.org/series/4871/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22280/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22280/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 9E429C3257\n\tfor ;\n\tTue, 10 Dec 2024 15:35:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 55CCB67E9B;\n\tTue, 10 Dec 2024 16:35:11 +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 10FF667E9C\n\tfor ;\n\tTue, 10 Dec 2024 16:35:07 +0100 (CET)","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-691-SIT1zzx0Nay99T7bZHTK9A-1;\n\tTue, 10 Dec 2024 10:35:04 -0500","from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.17])\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 018691955F2D; Tue, 10 Dec 2024 15:35:02 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.224.8])\n\tby mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 99EF91956053; Tue, 10 Dec 2024 15:34:59 +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=\"DdImekcw\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1733844907;\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=pSXTQRL6h5dM6XFKzSlttBjHrCCWKdMTA2ZgI4RdJNY=;\n\tb=DdImekcwQuecYjtJZvqkW0W7oRkwyU50tx2jzQfuQDLDpq5b5dpvxKe5+/XKwbH/bH0fla\n\te8yi83Jqj01bgK6YVClMEKusWENjOeZlt3/ubMr0Ras7B7RZDwX9ru57W0lJJZdQdoAmsH\n\trZOi9pBoQkREhOWZuXGUnwQ7XfwYqhs=","X-MC-Unique":"SIT1zzx0Nay99T7bZHTK9A-1","X-Mimecast-MFC-AGG-ID":"SIT1zzx0Nay99T7bZHTK9A","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tRobert Mader ,\n\tHans de Goede ,\n\tLaurent Pinchart ,\n\tKieran Bingham ","Subject":"[PATCH v3 4/9] libcamera: software_isp: Use common code to store\n\tdebayered pixels","Date":"Tue, 10 Dec 2024 16:34:34 +0100","Message-ID":"<20241210153440.1007470-5-mzamazal@redhat.com>","In-Reply-To":"<20241210153440.1007470-1-mzamazal@redhat.com>","References":"<20241210153440.1007470-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.17","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"2QmBdBkWBCrC85z3unVu11Is3mlWffNel5NE7901ztg_1733844902","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 31ab96ab..0eabced2 100644\n--- a/src/libcamera/software_isp/debayer_cpu.cpp\n+++ b/src/libcamera/software_isp/debayer_cpu.cpp\n@@ -62,57 +62,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_[b]; \\\n+\t*dst++ = green_[g]; \\\n+\t*dst++ = red_[r]; \\\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":["v3","4/9"]}