{"id":19401,"url":"https://patchwork.libcamera.org/api/patches/19401/?format=json","web_url":"https://patchwork.libcamera.org/patch/19401/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20240113142218.28063-11-hdegoede@redhat.com>","date":"2024-01-13T14:22:10","name":"[libcamera-devel,v2,10/18] libcamera: software_isp: Add DebayerCpu class","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"f1eff983ebd0d51ae0f578df0ecbb57b597a4ec5","submitter":{"id":102,"url":"https://patchwork.libcamera.org/api/people/102/?format=json","name":"Hans de Goede","email":"hdegoede@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19401/mbox/","series":[{"id":4142,"url":"https://patchwork.libcamera.org/api/series/4142/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4142","date":"2024-01-13T14:22:00","name":"[libcamera-devel,v2,01/18] libcamera: pipeline: simple: fix size adjustment in validate()","version":2,"mbox":"https://patchwork.libcamera.org/series/4142/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19401/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19401/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 23C23C32BD\n\tfor ;\n\tSat, 13 Jan 2024 14:23:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BAEBA61D57;\n\tSat, 13 Jan 2024 15:23:01 +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 57FE26293E\n\tfor ;\n\tSat, 13 Jan 2024 15:22:59 +0100 (CET)","from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-625--SmlkuPXMKOlMrYSYoprtw-1;\n\tSat, 13 Jan 2024 09:22:52 -0500","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1])\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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 730263C11C8E;\n\tSat, 13 Jan 2024 14:22:51 +0000 (UTC)","from localhost.localdomain (unknown [10.39.192.58])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 41CD43C25;\n\tSat, 13 Jan 2024 14:22:49 +0000 (UTC)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1705155781;\n\tbh=CY3GiS2AK81nKO39eEE1/6hcpdEkV9KEbpl8i+ITXbQ=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=N9HwK8wKb2z9jAFwsHEbkyVHHOdFRTojuD/zrWU8qZ8qepqt+/raiclc92t3uCeRU\n\tarzKRBIe4jYbP9RZYbu+fuFCkEHo6DXKvihaniQUautDsd8af+v4WPq+Fs/XgEkN69\n\tUsbO5IxM7c7gOSlWZMWsSuT6iC35KBdINrGkEsKGaEmgCxwv2EKhVL1xEC2xW72ANk\n\tPphv3r/wKEjuduoZqFp/JBYQVvlAHShGiWcG7uVvDAnlF1u36K/VXEVhDFN1CAAuQO\n\tQFMg1MtwoM8i1ooYR1YVyGBv1ID0KpSjr9BzKojsxLuoESBC4rjaV1nXValOxF9c0o\n\tTrWwuCv4c44cA==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1705155778;\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=smKNwA+SuPq4ZnFIwXRUUmh9rEFsw4rqtF6BjuXZD6M=;\n\tb=hj5KYIbtT5HZJ//eRty7aEJ2HJlcSHwj9sXC/2VTAp8r9/dnzmqP3tF5zfPYAX6/VdRZrD\n\tx7K+7nmoUIBdNw7X1GCJ2OCHqIPfDX67TUYZHywfNDDhc1fsDH3o5k80+iyIA+X8hoFd4F\n\t4hrYAgwzYmf54QJwRyoT0ju2S65gH6w="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=redhat.com\n\theader.i=@redhat.com header.b=\"hj5KYIbt\"; \n\tdkim-atps=neutral","X-MC-Unique":"-SmlkuPXMKOlMrYSYoprtw-1","To":"libcamera-devel@lists.libcamera.org,\n\tAndrey Konovalov ","Date":"Sat, 13 Jan 2024 15:22:10 +0100","Message-ID":"<20240113142218.28063-11-hdegoede@redhat.com>","In-Reply-To":"<20240113142218.28063-1-hdegoede@redhat.com>","References":"<20240113142218.28063-1-hdegoede@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.11.54.1","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain; charset=\"US-ASCII\"; x-default=true","Subject":"[libcamera-devel] [PATCH v2 10/18] libcamera: software_isp: Add\n\tDebayerCpu class","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","From":"Hans de Goede via libcamera-devel ","Reply-To":"Hans de Goede ","Cc":"Maxime Ripard , g.martti@gmail.com,\n\tt.langendam@gmail.com, srinivas.kandagatla@linaro.org,\n\tPavel Machek ,\n\tBryan O'Donoghue , admin@dennisbonke.com","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add CPU based debayering implementation. This initial implementation\nonly supports debayering packed 10 bits per pixel bayer data in\nthe 4 standard bayer orders.\n\nDoxygen documentation by Dennis Bonke.\n\nCo-authored-by: Dennis Bonke \nSigned-off-by: Dennis Bonke \nCo-authored-by: Andrey Konovalov \nSigned-off-by: Andrey Konovalov \nCo-authored-by: Pavel Machek \nSigned-off-by: Pavel Machek \nSigned-off-by: Hans de Goede \nTested-by: Bryan O'Donoghue # sc8280xp Lenovo x13s\nTested-by: Pavel Machek \n---\n .../internal/software_isp/debayer_cpu.h | 131 +++++\n .../internal/software_isp/meson.build | 1 +\n src/libcamera/software_isp/debayer_cpu.cpp | 528 ++++++++++++++++++\n src/libcamera/software_isp/meson.build | 1 +\n 4 files changed, 661 insertions(+)\n create mode 100644 include/libcamera/internal/software_isp/debayer_cpu.h\n create mode 100644 src/libcamera/software_isp/debayer_cpu.cpp","diff":"diff --git a/include/libcamera/internal/software_isp/debayer_cpu.h b/include/libcamera/internal/software_isp/debayer_cpu.h\nnew file mode 100644\nindex 00000000..78573f44\n--- /dev/null\n+++ b/include/libcamera/internal/software_isp/debayer_cpu.h\n@@ -0,0 +1,131 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2023, Linaro Ltd\n+ * Copyright (C) 2023, Red Hat Inc.\n+ *\n+ * Authors:\n+ * Hans de Goede \n+ *\n+ * debayer_cpu.h - CPU based debayering header\n+ */\n+\n+#pragma once\n+\n+#include \n+#include \n+#include \n+\n+#include \n+\n+#include \"libcamera/internal/software_isp/swstats_cpu.h\"\n+#include \"libcamera/internal/software_isp/debayer.h\"\n+\n+namespace libcamera {\n+\n+/**\n+ * \\class DebayerCpu\n+ * \\brief Class for debayering on the CPU\n+ *\n+ * Implementation for CPU based debayering\n+ */\n+class DebayerCpu : public Debayer, public Object\n+{\n+public:\n+\t/*\n+\t * FIXME this should be a plain (implementation independent) SwStats\n+\t * this can be fixed once getStats() is dropped.\n+\t */\n+\t/**\n+\t * \\brief Constructs a DebayerCpu object.\n+\t * \\param[in] stats Pointer to the stats object to use.\n+\t */\n+\tDebayerCpu(std::unique_ptr stats);\n+\t~DebayerCpu();\n+\n+\t/*\n+\t * Setup the Debayer object according to the passed in parameters.\n+\t * Return 0 on success, a negative errno value on failure\n+\t * (unsupported parameters).\n+\t */\n+\tint configure(const StreamConfiguration &inputCfg,\n+\t\t const std::vector> &outputCfgs);\n+\n+\t/*\n+\t * Get width and height at which the bayer-pattern repeats.\n+\t * Return pattern-size or an empty Size for an unsupported inputFormat.\n+\t */\n+\tSize patternSize(PixelFormat inputFormat);\n+\n+\tstd::vector formats(PixelFormat input);\n+\tstd::tuple\n+\t\tstrideAndFrameSize(const PixelFormat &outputFormat, const Size &size);\n+\n+\tvoid process(FrameBuffer *input, FrameBuffer *output, DebayerParams params);\n+\n+\t/**\n+\t * \\brief Get the file descriptor for the statistics.\n+\t *\n+\t * \\return the file descriptor pointing to the statistics.\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+private:\n+\tvoid initLinePointers(const uint8_t *linePointers[], const uint8_t *src);\n+\tvoid shiftLinePointers(const uint8_t *linePointers[], const uint8_t *src);\n+\tvoid process2(const uint8_t *src, uint8_t *dst);\n+\tvoid process4(const uint8_t *src, uint8_t *dst);\n+\t/* CSI-2 packed 10-bit raw bayer format (all the 4 orders) */\n+\tvoid debayer10P_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]);\n+\tvoid debayer10P_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]);\n+\tvoid debayer10P_GBGB_BGR888(uint8_t *dst, const uint8_t *src[]);\n+\tvoid debayer10P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[]);\n+\n+\ttypedef void (DebayerCpu::*debayerFn)(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 setDebayerFunctions(PixelFormat inputFormat, PixelFormat outputFormat);\n+\n+\tuint8_t gamma_[1024];\n+\tuint8_t red_[256];\n+\tuint8_t green_[256];\n+\tuint8_t blue_[256];\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+\tuint8_t *lineBuffers_[5];\n+\tunsigned int lineBufferIndex_;\n+\tbool enableInputMemcpy_;\n+\tfloat gamma_correction_;\n+\tint measuredFrames_;\n+\tint64_t frameProcessTime_;\n+\t/* Skip 30 frames for things to stabilize then measure 30 frames */\n+\tstatic const int framesToSkip = 30;\n+\tstatic const int framesToMeasure = 60;\n+};\n+\n+} /* namespace libcamera */\ndiff --git a/include/libcamera/internal/software_isp/meson.build b/include/libcamera/internal/software_isp/meson.build\nindex 7e40925e..b5a0d737 100644\n--- a/include/libcamera/internal/software_isp/meson.build\n+++ b/include/libcamera/internal/software_isp/meson.build\n@@ -2,6 +2,7 @@\n \n libcamera_internal_headers += files([\n 'debayer.h',\n+ 'debayer_cpu.h',\n 'debayer_params.h',\n 'swisp_stats.h',\n 'swstats.h',\ndiff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\nnew file mode 100644\nindex 00000000..e0c3c658\n--- /dev/null\n+++ b/src/libcamera/software_isp/debayer_cpu.cpp\n@@ -0,0 +1,528 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2023, Linaro Ltd\n+ * Copyright (C) 2023, Red Hat Inc.\n+ *\n+ * Authors:\n+ * Hans de Goede \n+ *\n+ * debayer_cpu.cpp - CPU based debayering class\n+ */\n+\n+#include \"libcamera/internal/software_isp/debayer_cpu.h\"\n+\n+#include \n+#include \n+#include \n+\n+#include \n+\n+#include \"libcamera/internal/bayer_format.h\"\n+#include \"libcamera/internal/framebuffer.h\"\n+#include \"libcamera/internal/mapped_framebuffer.h\"\n+\n+namespace libcamera {\n+\n+DebayerCpu::DebayerCpu(std::unique_ptr stats)\n+\t: stats_(std::move(stats)), gamma_correction_(1.0)\n+{\n+#ifdef __x86_64__\n+\tenableInputMemcpy_ = false;\n+#else\n+\tenableInputMemcpy_ = true;\n+#endif\n+\t/* Initialize gamma to 1.0 curve */\n+\tfor (int i = 0; i < 1024; i++)\n+\t\tgamma_[i] = i / 4;\n+\n+\tfor (int i = 0; i < 5; i++)\n+\t\tlineBuffers_[i] = NULL;\n+}\n+\n+DebayerCpu::~DebayerCpu()\n+{\n+\tfor (int i = 0; i < 5; i++)\n+\t\tfree(lineBuffers_[i]);\n+}\n+\n+// RGR\n+// GBG\n+// RGR\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+\tx++;\n+\n+// GBG\n+// RGR\n+// GBG\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+\tx++;\n+\n+// GRG\n+// BGB\n+// GRG\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+\tx++;\n+\n+// BGB\n+// GRG\n+// BGB\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+\tx++;\n+\n+void DebayerCpu::debayer10P_BGBG_BGR888(uint8_t *dst, const uint8_t *src[])\n+{\n+\tconst int width_in_bytes = window_.width * 5 / 4;\n+\tconst uint8_t *prev = (const uint8_t *)src[0];\n+\tconst uint8_t *curr = (const uint8_t *)src[1];\n+\tconst uint8_t *next = (const uint8_t *)src[2];\n+\n+\t/*\n+\t * For the first pixel getting a pixel from the previous column uses\n+\t * x - 2 to skip the 5th byte with least-significant bits for 4 pixels.\n+\t * Same for last pixel (uses x + 2) and looking at the next column.\n+\t * x++ in the for-loop skips the 5th byte with 4 x 2 lsb-s for 10bit packed.\n+\t */\n+\tfor (int x = 0; x < width_in_bytes; x++) {\n+\t\t/* Even pixel */\n+\t\tBGGR_BGR888(2, 1, 1)\n+\t\t/* Odd pixel BGGR -> GBRG */\n+\t\tGBRG_BGR888(1, 1, 1)\n+\t\t/* Same thing for next 2 pixels */\n+\t\tBGGR_BGR888(1, 1, 1)\n+\t\tGBRG_BGR888(1, 2, 1)\n+\t}\n+}\n+\n+void DebayerCpu::debayer10P_GRGR_BGR888(uint8_t *dst, const uint8_t *src[])\n+{\n+\tconst int width_in_bytes = window_.width * 5 / 4;\n+\tconst uint8_t *prev = (const uint8_t *)src[0];\n+\tconst uint8_t *curr = (const uint8_t *)src[1];\n+\tconst uint8_t *next = (const uint8_t *)src[2];\n+\n+\tfor (int x = 0; x < width_in_bytes; x++) {\n+\t\t/* Even pixel */\n+\t\tGRBG_BGR888(2, 1, 1)\n+\t\t/* Odd pixel GRBG -> RGGB */\n+\t\tRGGB_BGR888(1, 1, 1)\n+\t\t/* Same thing for next 2 pixels */\n+\t\tGRBG_BGR888(1, 1, 1)\n+\t\tRGGB_BGR888(1, 2, 1)\n+\t}\n+}\n+\n+void DebayerCpu::debayer10P_GBGB_BGR888(uint8_t *dst, const uint8_t *src[])\n+{\n+\tconst int width_in_bytes = window_.width * 5 / 4;\n+\tconst uint8_t *prev = (const uint8_t *)src[0];\n+\tconst uint8_t *curr = (const uint8_t *)src[1];\n+\tconst uint8_t *next = (const uint8_t *)src[2];\n+\n+\tfor (int x = 0; x < width_in_bytes; x++) {\n+\t\t/* Even pixel */\n+\t\tGBRG_BGR888(2, 1, 1)\n+\t\t/* Odd pixel GBGR -> BGGR */\n+\t\tBGGR_BGR888(1, 1, 1)\n+\t\t/* Same thing for next 2 pixels */\n+\t\tGBRG_BGR888(1, 1, 1)\n+\t\tBGGR_BGR888(1, 2, 1)\n+\t}\n+}\n+\n+void DebayerCpu::debayer10P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[])\n+{\n+\tconst int width_in_bytes = window_.width * 5 / 4;\n+\tconst uint8_t *prev = (const uint8_t *)src[0];\n+\tconst uint8_t *curr = (const uint8_t *)src[1];\n+\tconst uint8_t *next = (const uint8_t *)src[2];\n+\n+\tfor (int x = 0; x < width_in_bytes; x++) {\n+\t\t/* Even pixel */\n+\t\tRGGB_BGR888(2, 1, 1)\n+\t\t/* Odd pixel RGGB -> GRBG*/\n+\t\tGRBG_BGR888(1, 1, 1)\n+\t\t/* Same thing for next 2 pixels */\n+\t\tRGGB_BGR888(1, 1, 1)\n+\t\tGRBG_BGR888(1, 2, 1)\n+\t}\n+}\n+\n+static bool isStandardBayerOrder(BayerFormat::Order order)\n+{\n+\treturn order == BayerFormat::BGGR || order == BayerFormat::GBRG ||\n+\t order == BayerFormat::GRBG || order == BayerFormat::RGGB;\n+}\n+\n+int DebayerCpu::getInputConfig(PixelFormat inputFormat, DebayerInputConfig &config)\n+{\n+\tBayerFormat bayerFormat =\n+\t\tBayerFormat::fromPixelFormat(inputFormat);\n+\n+\tif (bayerFormat.bitDepth == 10 &&\n+\t bayerFormat.packing == BayerFormat::Packing::CSI2 &&\n+\t isStandardBayerOrder(bayerFormat.order)) {\n+\t\tconfig.bpp = 10;\n+\t\tconfig.patternSize.width = 4; /* 5 bytes per *4* pixels */\n+\t\tconfig.patternSize.height = 2;\n+\t\tconfig.outputFormats = std::vector({ formats::RGB888 });\n+\t\treturn 0;\n+\t}\n+\n+\tLOG(Debayer, Info)\n+\t\t<< \"Unsupported input format \" << inputFormat.toString();\n+\treturn -EINVAL;\n+}\n+\n+int DebayerCpu::getOutputConfig(PixelFormat outputFormat, DebayerOutputConfig &config)\n+{\n+\tif (outputFormat == formats::RGB888) {\n+\t\tconfig.bpp = 24;\n+\t\treturn 0;\n+\t}\n+\n+\tLOG(Debayer, Info)\n+\t\t<< \"Unsupported output format \" << outputFormat.toString();\n+\treturn -EINVAL;\n+}\n+\n+/* TODO: this ignores outputFormat since there is only 1 supported outputFormat for now */\n+int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, [[maybe_unused]] PixelFormat outputFormat)\n+{\n+\tBayerFormat bayerFormat =\n+\t\tBayerFormat::fromPixelFormat(inputFormat);\n+\n+\tif (bayerFormat.bitDepth == 10 &&\n+\t bayerFormat.packing == BayerFormat::Packing::CSI2) {\n+\t\tswitch (bayerFormat.order) {\n+\t\tcase BayerFormat::BGGR:\n+\t\t\tdebayer0_ = &DebayerCpu::debayer10P_BGBG_BGR888;\n+\t\t\tdebayer1_ = &DebayerCpu::debayer10P_GRGR_BGR888;\n+\t\t\treturn 0;\n+\t\tcase BayerFormat::GBRG:\n+\t\t\tdebayer0_ = &DebayerCpu::debayer10P_GBGB_BGR888;\n+\t\t\tdebayer1_ = &DebayerCpu::debayer10P_RGRG_BGR888;\n+\t\t\treturn 0;\n+\t\tcase BayerFormat::GRBG:\n+\t\t\tdebayer0_ = &DebayerCpu::debayer10P_GRGR_BGR888;\n+\t\t\tdebayer1_ = &DebayerCpu::debayer10P_BGBG_BGR888;\n+\t\t\treturn 0;\n+\t\tcase BayerFormat::RGGB:\n+\t\t\tdebayer0_ = &DebayerCpu::debayer10P_RGRG_BGR888;\n+\t\t\tdebayer1_ = &DebayerCpu::debayer10P_GBGB_BGR888;\n+\t\t\treturn 0;\n+\t\tdefault:\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tLOG(Debayer, Error) << \"Unsupported input output format combination\";\n+\treturn -EINVAL;\n+}\n+\n+int DebayerCpu::configure(const StreamConfiguration &inputCfg,\n+\t\t\t const std::vector> &outputCfgs)\n+{\n+\tif (getInputConfig(inputCfg.pixelFormat, inputConfig_) != 0)\n+\t\treturn -EINVAL;\n+\n+\tif (stats_->configure(inputCfg) != 0)\n+\t\treturn -EINVAL;\n+\n+\tconst Size &stats_pattern_size = stats_->patternSize();\n+\tif (inputConfig_.patternSize.width != stats_pattern_size.width ||\n+\t inputConfig_.patternSize.height != stats_pattern_size.height) {\n+\t\tLOG(Debayer, Error)\n+\t\t\t<< \"mismatching stats and debayer pattern sizes for \"\n+\t\t\t<< inputCfg.pixelFormat.toString();\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tinputConfig_.stride = inputCfg.stride;\n+\n+\tif (outputCfgs.size() != 1) {\n+\t\tLOG(Debayer, Error)\n+\t\t\t<< \"Unsupported number of output streams: \"\n+\t\t\t<< outputCfgs.size();\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tconst StreamConfiguration &outputCfg = outputCfgs[0];\n+\tSizeRange outSizeRange = sizes(inputCfg.pixelFormat, inputCfg.size);\n+\tstd::tie(outputConfig_.stride, outputConfig_.frameSize) =\n+\t\tstrideAndFrameSize(outputCfg.pixelFormat, outputCfg.size);\n+\n+\tif (!outSizeRange.contains(outputCfg.size) || outputConfig_.stride != outputCfg.stride) {\n+\t\tLOG(Debayer, Error)\n+\t\t\t<< \"Invalid output size/stride: \"\n+\t\t\t<< \"\\n \" << outputCfg.size << \" (\" << outSizeRange << \")\"\n+\t\t\t<< \"\\n \" << outputCfg.stride << \" (\" << outputConfig_.stride << \")\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (setDebayerFunctions(inputCfg.pixelFormat, outputCfg.pixelFormat) != 0)\n+\t\treturn -EINVAL;\n+\n+\twindow_.x = ((inputCfg.size.width - outputCfg.size.width) / 2) &\n+\t\t ~(inputConfig_.patternSize.width - 1);\n+\twindow_.y = ((inputCfg.size.height - outputCfg.size.height) / 2) &\n+\t\t ~(inputConfig_.patternSize.height - 1);\n+\twindow_.width = outputCfg.size.width;\n+\twindow_.height = outputCfg.size.height;\n+\n+\t/* Don't pass x,y since process() already adjusts src before passing it */\n+\tstats_->setWindow(Rectangle(window_.size()));\n+\n+\tfor (unsigned int i = 0;\n+\t i < (inputConfig_.patternSize.height + 1) && enableInputMemcpy_;\n+\t i++) {\n+\t\t/* pad with patternSize.Width on both left and right side */\n+\t\tsize_t lineLength = (window_.width + 2 * inputConfig_.patternSize.width) *\n+\t\t\t\t inputConfig_.bpp / 8;\n+\n+\t\tfree(lineBuffers_[i]);\n+\t\tlineBuffers_[i] = (uint8_t *)malloc(lineLength);\n+\t\tif (!lineBuffers_[i])\n+\t\t\treturn -ENOMEM;\n+\t}\n+\n+\tmeasuredFrames_ = 0;\n+\tframeProcessTime_ = 0;\n+\n+\treturn 0;\n+}\n+\n+Size DebayerCpu::patternSize(PixelFormat inputFormat)\n+{\n+\tDebayerCpu::DebayerInputConfig config;\n+\n+\tif (getInputConfig(inputFormat, config) != 0)\n+\t\treturn {};\n+\n+\treturn config.patternSize;\n+}\n+\n+std::vector DebayerCpu::formats(PixelFormat inputFormat)\n+{\n+\tDebayerCpu::DebayerInputConfig config;\n+\n+\tif (getInputConfig(inputFormat, config) != 0)\n+\t\treturn std::vector();\n+\n+\treturn config.outputFormats;\n+}\n+\n+std::tuple\n+DebayerCpu::strideAndFrameSize(const PixelFormat &outputFormat, const Size &size)\n+{\n+\tDebayerCpu::DebayerOutputConfig config;\n+\n+\tif (getOutputConfig(outputFormat, config) != 0)\n+\t\treturn std::make_tuple(0, 0);\n+\n+\t/* round up to multiple of 8 for 64 bits alignment */\n+\tunsigned int stride = (size.width * config.bpp / 8 + 7) & ~7;\n+\n+\treturn std::make_tuple(stride, stride * size.height);\n+}\n+\n+void DebayerCpu::initLinePointers(const uint8_t *linePointers[], const uint8_t *src)\n+{\n+\tconst int patternHeight = inputConfig_.patternSize.height;\n+\n+\tfor (int i = 0; i < patternHeight; i++)\n+\t\tlinePointers[i + 1] = src +\n+\t\t\t\t (-patternHeight / 2 + i) * (int)inputConfig_.stride;\n+\n+\tif (!enableInputMemcpy_)\n+\t\treturn;\n+\n+\tfor (int i = 0; i < patternHeight; i++) {\n+\t\t/* pad with patternSize.Width on both left and right side */\n+\t\tsize_t lineLength = (window_.width + 2 * inputConfig_.patternSize.width) *\n+\t\t\t\t inputConfig_.bpp / 8;\n+\t\tint padding = inputConfig_.patternSize.width * inputConfig_.bpp / 8;\n+\n+\t\tmemcpy(lineBuffers_[i], linePointers[i + 1] - padding, lineLength);\n+\t\tlinePointers[i + 1] = lineBuffers_[i] + padding;\n+\t}\n+\n+\t/* Point lineBufferIndex_ to first unused lineBuffer */\n+\tlineBufferIndex_ = patternHeight;\n+}\n+\n+void DebayerCpu::shiftLinePointers(const uint8_t *linePointers[], const uint8_t *src)\n+{\n+\tconst int patternHeight = inputConfig_.patternSize.height;\n+\n+\tfor (int i = 0; i < patternHeight; i++)\n+\t\tlinePointers[i] = linePointers[i + 1];\n+\n+\tlinePointers[patternHeight] = src +\n+\t\t\t\t (patternHeight / 2) * (int)inputConfig_.stride;\n+\n+\tif (!enableInputMemcpy_)\n+\t\treturn;\n+\n+\tsize_t lineLength = (window_.width + 2 * inputConfig_.patternSize.width) *\n+\t\t\t inputConfig_.bpp / 8;\n+\tint padding = inputConfig_.patternSize.width * inputConfig_.bpp / 8;\n+\tmemcpy(lineBuffers_[lineBufferIndex_], linePointers[patternHeight] - padding, lineLength);\n+\tlinePointers[patternHeight] = lineBuffers_[lineBufferIndex_] + padding;\n+\n+\tlineBufferIndex_ = (lineBufferIndex_ + 1) % (patternHeight + 1);\n+}\n+\n+void DebayerCpu::process2(const uint8_t *src, uint8_t *dst)\n+{\n+\tconst unsigned int y_end = window_.y + window_.height;\n+\tconst uint8_t *linePointers[3];\n+\n+\t/* Adjust src to top left corner of the window */\n+\tsrc += window_.y * inputConfig_.stride + window_.x * inputConfig_.bpp / 8;\n+\n+\tinitLinePointers(linePointers, src);\n+\n+\tfor (unsigned int y = window_.y; y < y_end; y += 2) {\n+\t\tshiftLinePointers(linePointers, src);\n+\t\tstats_->processLine0(y, linePointers);\n+\t\t(this->*debayer0_)(dst, linePointers);\n+\t\tsrc += inputConfig_.stride;\n+\t\tdst += outputConfig_.stride;\n+\n+\t\tshiftLinePointers(linePointers, src);\n+\t\t(this->*debayer1_)(dst, linePointers);\n+\t\tsrc += inputConfig_.stride;\n+\t\tdst += outputConfig_.stride;\n+\t}\n+}\n+\n+void DebayerCpu::process4(const uint8_t *src, uint8_t *dst)\n+{\n+\tconst unsigned int y_end = window_.y + window_.height;\n+\tconst uint8_t *linePointers[5];\n+\n+\t/* Adjust src to top left corner of the window */\n+\tsrc += window_.y * inputConfig_.stride + window_.x * inputConfig_.bpp / 8;\n+\n+\tinitLinePointers(linePointers, src);\n+\n+\tfor (unsigned int y = window_.y; y < y_end; y += 4) {\n+\t\tshiftLinePointers(linePointers, src);\n+\t\tstats_->processLine0(y, linePointers);\n+\t\t(this->*debayer0_)(dst, linePointers);\n+\t\tsrc += inputConfig_.stride;\n+\t\tdst += outputConfig_.stride;\n+\n+\t\tshiftLinePointers(linePointers, src);\n+\t\t(this->*debayer1_)(dst, linePointers);\n+\t\tsrc += inputConfig_.stride;\n+\t\tdst += outputConfig_.stride;\n+\n+\t\tshiftLinePointers(linePointers, src);\n+\t\tstats_->processLine2(y, linePointers);\n+\t\t(this->*debayer2_)(dst, linePointers);\n+\t\tsrc += inputConfig_.stride;\n+\t\tdst += outputConfig_.stride;\n+\n+\t\tshiftLinePointers(linePointers, src);\n+\t\t(this->*debayer3_)(dst, linePointers);\n+\t\tsrc += inputConfig_.stride;\n+\t\tdst += outputConfig_.stride;\n+\t}\n+}\n+\n+static inline int64_t timeDiff(timespec &after, timespec &before)\n+{\n+\treturn (after.tv_sec - before.tv_sec) * 1000000000LL +\n+\t (int64_t)after.tv_nsec - (int64_t)before.tv_nsec;\n+}\n+\n+void DebayerCpu::process(FrameBuffer *input, FrameBuffer *output, DebayerParams params)\n+{\n+\ttimespec frameStartTime;\n+\n+\tif (measuredFrames_ < DebayerCpu::framesToMeasure) {\n+\t\tframeStartTime = {};\n+\t\tclock_gettime(CLOCK_MONOTONIC_RAW, &frameStartTime);\n+\t}\n+\n+\t/* Apply DebayerParams */\n+\tif (params.gamma != gamma_correction_) {\n+\t\tfor (int i = 0; i < 1024; i++)\n+\t\t\tgamma_[i] = 255 * powf(i / 1023.0, params.gamma);\n+\n+\t\tgamma_correction_ = params.gamma;\n+\t}\n+\n+\tfor (int i = 0; i < 256; i++) {\n+\t\tint idx;\n+\n+\t\t/* Apply gamma after gain! */\n+\t\tidx = std::min({ i * params.gainR / 64U, 1023U });\n+\t\tred_[i] = gamma_[idx];\n+\n+\t\tidx = std::min({ i * params.gainG / 64U, 1023U });\n+\t\tgreen_[i] = gamma_[idx];\n+\n+\t\tidx = std::min({ i * params.gainB / 64U, 1023U });\n+\t\tblue_[i] = gamma_[idx];\n+\t}\n+\n+\t/* Copy metadata from the input buffer */\n+\tFrameMetadata &metadata = output->_d()->metadata();\n+\tmetadata.status = input->metadata().status;\n+\tmetadata.sequence = input->metadata().sequence;\n+\tmetadata.timestamp = input->metadata().timestamp;\n+\n+\tMappedFrameBuffer in(input, MappedFrameBuffer::MapFlag::Read);\n+\tMappedFrameBuffer out(output, MappedFrameBuffer::MapFlag::Write);\n+\tif (!in.isValid() || !out.isValid()) {\n+\t\tLOG(Debayer, Error) << \"mmap-ing buffer(s) failed\";\n+\t\tmetadata.status = FrameMetadata::FrameError;\n+\t\treturn;\n+\t}\n+\n+\tstats_->startFrame();\n+\n+\tif (inputConfig_.patternSize.height == 2)\n+\t\tprocess2(in.planes()[0].data(), out.planes()[0].data());\n+\telse\n+\t\tprocess4(in.planes()[0].data(), out.planes()[0].data());\n+\n+\tmetadata.planes()[0].bytesused = out.planes()[0].size();\n+\n+\t/* Measure before emitting signals */\n+\tif (measuredFrames_ < DebayerCpu::framesToMeasure &&\n+\t ++measuredFrames_ > DebayerCpu::framesToSkip) {\n+\t\ttimespec frameEndTime = {};\n+\t\tclock_gettime(CLOCK_MONOTONIC_RAW, &frameEndTime);\n+\t\tframeProcessTime_ += timeDiff(frameEndTime, frameStartTime);\n+\t\tif (measuredFrames_ == DebayerCpu::framesToMeasure) {\n+\t\t\tconst int measuredFrames = DebayerCpu::framesToMeasure -\n+\t\t\t\t\t\t DebayerCpu::framesToSkip;\n+\t\t\tLOG(Debayer, Info)\n+\t\t\t\t<< \"Processed \" << measuredFrames\n+\t\t\t\t<< \" frames in \" << frameProcessTime_ / 1000 << \"us, \"\n+\t\t\t\t<< frameProcessTime_ / (1000 * measuredFrames)\n+\t\t\t\t<< \" us/frame\";\n+\t\t}\n+\t}\n+\n+\tstats_->finishFrame();\n+\toutputBufferReady.emit(output);\n+\tinputBufferReady.emit(input);\n+}\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/software_isp/meson.build b/src/libcamera/software_isp/meson.build\nindex d4ae5ac7..6d7a44d7 100644\n--- a/src/libcamera/software_isp/meson.build\n+++ b/src/libcamera/software_isp/meson.build\n@@ -2,6 +2,7 @@\n \n libcamera_sources += files([\n \t'debayer.cpp',\n+\t'debayer_cpu.cpp',\n \t'swstats.cpp',\n \t'swstats_cpu.cpp',\n ])\n","prefixes":["libcamera-devel","v2","10/18"]}