{"id":19490,"url":"https://patchwork.libcamera.org/api/patches/19490/?format=json","web_url":"https://patchwork.libcamera.org/patch/19490/","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":"<20240214170122.60754-8-hdegoede@redhat.com>","date":"2024-02-14T17:01:11","name":"[v3,07/16] libcamera: software_isp: Add Debayer base class","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"358a623c76b445ed1a1b0548a15b7a50e01f3609","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/19490/mbox/","series":[{"id":4167,"url":"https://patchwork.libcamera.org/api/series/4167/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4167","date":"2024-02-14T17:01:04","name":"libcamera: introduce Software ISP and Software IPA","version":3,"mbox":"https://patchwork.libcamera.org/series/4167/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19490/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19490/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 3A50DC3257\n\tfor ;\n\tWed, 14 Feb 2024 17:01:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EB65D6280E;\n\tWed, 14 Feb 2024 18:01:49 +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 06FBF62819\n\tfor ;\n\tWed, 14 Feb 2024 18:01:46 +0100 (CET)","from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n\t[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n\tus-mta-595-W4sjdFEoMdS0tiP6PP_k8A-1; Wed, 14 Feb 2024 12:01:42 -0500","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6])\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 B511385A58E;\n\tWed, 14 Feb 2024 17:01:41 +0000 (UTC)","from localhost.localdomain (unknown [10.39.192.30])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 8A6062166B36;\n\tWed, 14 Feb 2024 17:01:40 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"I5dwPmDt\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1707930106;\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=M5wKa4MbKUa4G6tPgYUTOSoeeGaWk+A4NCSElR4JASo=;\n\tb=I5dwPmDtHL7JHxTLZVm+S5GAxS7ESd02rJU77SrGNI4i+crla6S6/x5lZOpp5001ojsxvK\n\tyfDYBk/LF36Rkk7NFrPjONdWG0DidXFPqmsXvm6h/cbkXmKUGW4ZCu5GqR040NYB2sH9MP\n\tD31EVk8G3r6pO2ZrFVK9cM/kjPEFgNg=","X-MC-Unique":"W4sjdFEoMdS0tiP6PP_k8A-1","From":"Hans de Goede ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v3 07/16] libcamera: software_isp: Add Debayer base class","Date":"Wed, 14 Feb 2024 18:01:11 +0100","Message-ID":"<20240214170122.60754-8-hdegoede@redhat.com>","In-Reply-To":"<20240214170122.60754-1-hdegoede@redhat.com>","References":"<20240214170122.60754-1-hdegoede@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.11.54.6","X-Mimecast-Spam-Score":"0","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","Cc":"Maxime Ripard , Pavel Machek ,\n\tBryan O'Donoghue ,\n\tDennis Bonke ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a base class for debayer implementations. This is intended to be\nsuitable for both GPU (or otherwise) accelerated debayer implementations\nas well as CPU based debayering.\n\nDoxygen documentation by Dennis Bonke.\n\nTested-by: Bryan O'Donoghue # sc8280xp Lenovo x13s\nTested-by: Pavel Machek \nReviewed-by: Pavel Machek \nCo-developed-by: Dennis Bonke \nSigned-off-by: Dennis Bonke \nCo-developed-by: Andrey Konovalov \nSigned-off-by: Andrey Konovalov \nSigned-off-by: Hans de Goede \n---\nChanges in v3:\n- Move debayer.h to src/libcamera/software_isp/\n- Move class documentation (only a brief for now) to .cpp file\n---\n .../internal/software_isp/debayer_params.h | 48 ++++++++\n .../internal/software_isp/meson.build | 1 +\n src/libcamera/software_isp/debayer.cpp | 29 +++++\n src/libcamera/software_isp/debayer.h | 104 ++++++++++++++++++\n src/libcamera/software_isp/meson.build | 1 +\n 5 files changed, 183 insertions(+)\n create mode 100644 include/libcamera/internal/software_isp/debayer_params.h\n create mode 100644 src/libcamera/software_isp/debayer.cpp\n create mode 100644 src/libcamera/software_isp/debayer.h","diff":"diff --git a/include/libcamera/internal/software_isp/debayer_params.h b/include/libcamera/internal/software_isp/debayer_params.h\nnew file mode 100644\nindex 00000000..98e7fc92\n--- /dev/null\n+++ b/include/libcamera/internal/software_isp/debayer_params.h\n@@ -0,0 +1,48 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2023, Red Hat Inc.\n+ *\n+ * Authors:\n+ * Hans de Goede \n+ *\n+ * swstats.h - software statistics base class\n+ */\n+\n+#pragma once\n+\n+namespace libcamera {\n+\n+/**\n+ * \\brief Struct to hold the debayer parameters.\n+ */\n+struct DebayerParams {\n+\t/**\n+\t * \\brief const value for 1.0 gain\n+\t */\n+\tstatic constexpr unsigned int kGain10 = 256;\n+\n+\t/**\n+\t * \\brief Red Gain\n+\t *\n+\t * 128 = 0.5, 256 = 1.0, 512 = 2.0, etc.\n+\t */\n+\tunsigned int gainR;\n+\t/**\n+\t * \\brief Green Gain\n+\t *\n+\t * 128 = 0.5, 256 = 1.0, 512 = 2.0, etc.\n+\t */\n+\tunsigned int gainG;\n+\t/**\n+\t * \\brief Blue Gain\n+\t *\n+\t * 128 = 0.5, 256 = 1.0, 512 = 2.0, etc.\n+\t */\n+\tunsigned int gainB;\n+\t/**\n+\t * \\brief Gamma correction, 1.0 is no correction\n+\t */\n+\tfloat gamma;\n+};\n+\n+} /* namespace libcamera */\ndiff --git a/include/libcamera/internal/software_isp/meson.build b/include/libcamera/internal/software_isp/meson.build\nindex 66c9c3fb..a620e16d 100644\n--- a/include/libcamera/internal/software_isp/meson.build\n+++ b/include/libcamera/internal/software_isp/meson.build\n@@ -1,5 +1,6 @@\n # SPDX-License-Identifier: CC0-1.0\n \n libcamera_internal_headers += files([\n+ 'debayer_params.h',\n 'swisp_stats.h',\n ])\ndiff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp\nnew file mode 100644\nindex 00000000..64f0b5a0\n--- /dev/null\n+++ b/src/libcamera/software_isp/debayer.cpp\n@@ -0,0 +1,29 @@\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.cpp - debayer base class\n+ */\n+\n+#include \"debayer.h\"\n+\n+namespace libcamera {\n+\n+/**\n+ * \\class Debayer\n+ * \\brief Base debayering class\n+ *\n+ * Base class that provides functions for setting up the debayering process.\n+ */\n+\n+LOG_DEFINE_CATEGORY(Debayer)\n+\n+Debayer::~Debayer()\n+{\n+}\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h\nnew file mode 100644\nindex 00000000..8880ff99\n--- /dev/null\n+++ b/src/libcamera/software_isp/debayer.h\n@@ -0,0 +1,104 @@\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.h - debayering base class\n+ */\n+\n+#pragma once\n+\n+#include \n+\n+#include \n+#include \n+\n+#include \n+#include \n+\n+#include \"libcamera/internal/software_isp/debayer_params.h\"\n+\n+namespace libcamera {\n+\n+class FrameBuffer;\n+\n+LOG_DECLARE_CATEGORY(Debayer)\n+\n+class Debayer\n+{\n+public:\n+\tvirtual ~Debayer() = 0;\n+\n+\t/**\n+\t * \\brief Configure the debayer object according to the passed in parameters.\n+\t * \\param[in] inputCfg The input configuration.\n+\t * \\param[in] outputCfgs The output configurations.\n+\t *\n+\t * \\return 0 on success, a negative errno on failure.\n+\t */\n+\tvirtual int configure(const StreamConfiguration &inputCfg,\n+\t\t\t const std::vector> &outputCfgs) = 0;\n+\n+\t/**\n+\t * \\brief Get the width and height at which the bayer pattern repeats.\n+\t * \\param[in] inputFormat The input format.\n+\t *\n+\t * Valid sizes are: 2x2, 4x2 or 4x4.\n+\t *\n+\t * \\return pattern size or an empty size for unsupported inputFormats.\n+\t */\n+\tvirtual Size patternSize(PixelFormat inputFormat) = 0;\n+\n+\t/**\n+\t * \\brief Get the supported output formats.\n+\t * \\param[in] inputFormat The input format.\n+\t *\n+\t * \\return all supported output formats or an empty vector if there are none.\n+\t */\n+\tvirtual std::vector formats(PixelFormat inputFormat) = 0;\n+\n+\t/**\n+\t * \\brief Get the stride and the frame size.\n+\t * \\param[in] outputFormat The output format.\n+\t * \\param[in] size The output size.\n+\t *\n+\t * \\return a tuple of the stride and the frame size, or a tuple with 0,0 if there is no valid output config.\n+\t */\n+\tvirtual std::tuple\n+\tstrideAndFrameSize(const PixelFormat &outputFormat, const Size &size) = 0;\n+\n+\t/**\n+\t * \\brief Process the bayer data into the requested format.\n+\t * \\param[in] input The input buffer.\n+\t * \\param[in] output The output buffer.\n+\t * \\param[in] params The parameters to be used in debayering.\n+\t *\n+\t * \\note DebayerParams is passed by value deliberately so that a copy is passed\n+\t * when this is run in another thread by invokeMethod().\n+\t */\n+\tvirtual void process(FrameBuffer *input, FrameBuffer *output, DebayerParams params) = 0;\n+\n+\t/**\n+\t * \\brief Get the supported output sizes for the given input format and size.\n+\t * \\param[in] inputFormat The input format.\n+\t * \\param[in] inputSize The input size.\n+\t *\n+\t * \\return The valid size ranges or an empty range if there are none.\n+\t */\n+\tvirtual SizeRange sizes(PixelFormat inputFormat, const Size &inputSize) = 0;\n+\n+\t/**\n+\t * \\brief Signals when the input buffer is ready.\n+\t */\n+\tSignal inputBufferReady;\n+\n+\t/**\n+\t * \\brief Signals when the output buffer is ready.\n+\t */\n+\tSignal outputBufferReady;\n+};\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/software_isp/meson.build b/src/libcamera/software_isp/meson.build\nindex e1fb8ccc..92fc90f3 100644\n--- a/src/libcamera/software_isp/meson.build\n+++ b/src/libcamera/software_isp/meson.build\n@@ -1,5 +1,6 @@\n # SPDX-License-Identifier: CC0-1.0\n \n libcamera_sources += files([\n+ 'debayer.cpp',\n 'swstats_cpu.cpp',\n ])\n","prefixes":["v3","07/16"]}