Patch Detail
Show a patch.
GET /api/1.1/patches/19399/?format=api
{ "id": 19399, "url": "https://patchwork.libcamera.org/api/1.1/patches/19399/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19399/", "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": "<20240113142218.28063-10-hdegoede@redhat.com>", "date": "2024-01-13T14:22:09", "name": "[libcamera-devel,v2,09/18] libcamera: software_isp: Add Debayer base class", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "e5ceb9ac9eb0eed10fdf7a5d7a99d23912d9c3d2", "submitter": { "id": 102, "url": "https://patchwork.libcamera.org/api/1.1/people/102/?format=api", "name": "Hans de Goede", "email": "hdegoede@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19399/mbox/", "series": [ { "id": 4142, "url": "https://patchwork.libcamera.org/api/1.1/series/4142/?format=api", "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/19399/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19399/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 D3FB6C328C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 13 Jan 2024 14:22:54 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 77E16628D7;\n\tSat, 13 Jan 2024 15:22:54 +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 8D4E961D57\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 13 Jan 2024 15:22:52 +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-266-9a56yyP0MfuUHI76Zb16VQ-1;\n\tSat, 13 Jan 2024 09:22:49 -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 E8C9C3C11C8F;\n\tSat, 13 Jan 2024 14:22:48 +0000 (UTC)", "from localhost.localdomain (unknown [10.39.192.58])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id D1C503C25;\n\tSat, 13 Jan 2024 14:22:46 +0000 (UTC)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1705155774;\n\tbh=zxRRfYVp9eJ9KMIXtZ28QZbE2JIMf/QEy1NLeeM2zXg=;\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=jG/yVjOgaoUrNBlaitonEKYDuxWzmoAbg5u9FvcxFjEQ7r03StHg4zN5R4AbMGECu\n\tsRQbF1JBdZAtrFpMMS93lWOjKfyJu7yO9PLrcS1/tGBNA5/nJBDsFIBfj9ZlcgnxHn\n\t9zEQ3eecYEXb65SfjCEQ+61Ws0g5ImbC6UAwGnDPxaJY8zTP1k5gXBtryYL7JgODdD\n\ttNYRYzeijV0lLYyfzqjJQJcc6NC3aJyTR1j6vboGLDbLTchXZRTqg0bs/sr6cq8NRT\n\tOT/hSrq9d3A8FwbQz6WQpZPBPAIEfZJqDSJbeM7K/IBCoCWaSxCtbhNJaq5hGJnvgB\n\tfpvvOrhpL6HTw==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1705155771;\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=CB/P6UmIvPqdKb0o8YPwItNIejyIxOOK7VIVMh9mDf4=;\n\tb=CyxNE3KYtSISGP2dJVcErw+y8IcJzyi/ypDOK886pOHp5gtiJ7Kc9mwK8s9uGSIFcvTk1L\n\t+LXM8FGR+CzPjAGTE2iEt5fAbO3kZP+E3iQ+4OKC6kSBqty1GBPMbsMs7NW0WIQPmlthHg\n\tAAC9PYAV9RXUr78kZK9KTpLiKy7LZok=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=redhat.com\n\theader.i=@redhat.com header.b=\"CyxNE3KY\"; \n\tdkim-atps=neutral", "X-MC-Unique": "9a56yyP0MfuUHI76Zb16VQ-1", "To": "libcamera-devel@lists.libcamera.org,\n\tAndrey Konovalov <andrey.konovalov.ynk@gmail.com>", "Date": "Sat, 13 Jan 2024 15:22:09 +0100", "Message-ID": "<20240113142218.28063-10-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 09/18] libcamera: software_isp: Add\n\tDebayer base class", "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>", "From": "Hans de Goede via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Hans de Goede <hdegoede@redhat.com>", "Cc": "Maxime Ripard <mripard@redhat.com>, g.martti@gmail.com,\n\tt.langendam@gmail.com, srinivas.kandagatla@linaro.org,\n\tPavel Machek <pavel@ucw.cz>,\n\tBryan O'Donoghue <bryan.odonoghue@linaro.org>, admin@dennisbonke.com", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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\nCo-authored-by: Dennis Bonke <admin@dennisbonke.com>\nSigned-off-by: Dennis Bonke <admin@dennisbonke.com>\nCo-authored-by: Andrey Konovalov <andrey.konovalov@linaro.org>\nSigned-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>\nSigned-off-by: Hans de Goede <hdegoede@redhat.com>\nTested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # sc8280xp Lenovo x13s\nTested-by: Pavel Machek <pavel@ucw.cz>\n---\n .../libcamera/internal/software_isp/debayer.h | 132 ++++++++++++++++++\n .../internal/software_isp/debayer_params.h | 43 ++++++\n .../internal/software_isp/meson.build | 2 +\n src/libcamera/software_isp/debayer.cpp | 22 +++\n src/libcamera/software_isp/meson.build | 1 +\n 5 files changed, 200 insertions(+)\n create mode 100644 include/libcamera/internal/software_isp/debayer.h\n create mode 100644 include/libcamera/internal/software_isp/debayer_params.h\n create mode 100644 src/libcamera/software_isp/debayer.cpp", "diff": "diff --git a/include/libcamera/internal/software_isp/debayer.h b/include/libcamera/internal/software_isp/debayer.h\nnew file mode 100644\nindex 00000000..39e6f393\n--- /dev/null\n+++ b/include/libcamera/internal/software_isp/debayer.h\n@@ -0,0 +1,132 @@\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 <hdegoede@redhat.com> \n+ *\n+ * debayer.h - debayering base class\n+ */\n+\n+#pragma once\n+\n+#include <stdint.h>\n+\n+#include <libcamera/base/log.h>\n+#include <libcamera/base/signal.h>\n+\n+#include <libcamera/geometry.h>\n+#include <libcamera/stream.h>\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+/**\n+ * \\class Debayer\n+ * \\brief Base debayering class\n+ *\n+ * Base class that provides functions for setting up the debayering process.\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<std::reference_wrapper<StreamConfiguration>> &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 * \\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<PixelFormat> 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<unsigned int, unsigned int>\n+\t\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+\tSizeRange sizes(PixelFormat inputFormat, const Size &inputSize)\n+\t{\n+\t\tSize pattern_size = patternSize(inputFormat);\n+\n+\t\tif (pattern_size.isNull())\n+\t\t\treturn {};\n+\n+\t\t/*\n+\t\t * For debayer interpolation a border of pattern-height x pattern-width\n+\t\t * is kept around the entire image. Combined with a minimum-size of\n+\t\t * pattern-height x pattern-width this means the input-size needs to be\n+\t\t * at least (3 * pattern-height) x (3 * pattern-width).\n+\t\t */\n+\t\tif (inputSize.width < (3 * pattern_size.width) ||\n+\t\t inputSize.height < (3 * pattern_size.height)) {\n+\t\t\tLOG(Debayer, Warning)\n+\t\t\t\t<< \"Input format size too small: \" << inputSize.toString();\n+\t\t\treturn {};\n+\t\t}\n+\n+\t\treturn SizeRange(Size(pattern_size.width, pattern_size.height),\n+\t\t\t\t Size((inputSize.width - 2 * pattern_size.width) & ~(pattern_size.width - 1),\n+\t\t\t\t (inputSize.height - 2 * pattern_size.height) & ~(pattern_size.height - 1)),\n+\t\t\t\t pattern_size.width, pattern_size.height);\n+\t}\n+\n+\t/**\n+\t * \\brief Signals when the input buffer is ready.\n+\t */\n+\tSignal<FrameBuffer *> inputBufferReady;\n+\n+\t/**\n+\t * \\brief Signals when the output buffer is ready.\n+\t */\n+\tSignal<FrameBuffer *> outputBufferReady;\n+};\n+\n+} /* namespace libcamera */\ndiff --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..8f515304\n--- /dev/null\n+++ b/include/libcamera/internal/software_isp/debayer_params.h\n@@ -0,0 +1,43 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2023, Red Hat Inc.\n+ *\n+ * Authors:\n+ * Hans de Goede <hdegoede@redhat.com> \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 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 1d9e4018..7e40925e 100644\n--- a/include/libcamera/internal/software_isp/meson.build\n+++ b/include/libcamera/internal/software_isp/meson.build\n@@ -1,6 +1,8 @@\n # SPDX-License-Identifier: CC0-1.0\n \n libcamera_internal_headers += files([\n+ 'debayer.h',\n+ 'debayer_params.h',\n 'swisp_stats.h',\n 'swstats.h',\n 'swstats_cpu.h',\ndiff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp\nnew file mode 100644\nindex 00000000..442da1ac\n--- /dev/null\n+++ b/src/libcamera/software_isp/debayer.cpp\n@@ -0,0 +1,22 @@\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 <hdegoede@redhat.com> \n+ *\n+ * debayer.cpp - debayer base class\n+ */\n+\n+#include \"libcamera/internal/software_isp/debayer.h\"\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(Debayer)\n+\n+Debayer::~Debayer()\n+{\n+}\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/software_isp/meson.build b/src/libcamera/software_isp/meson.build\nindex d31c6217..d4ae5ac7 100644\n--- a/src/libcamera/software_isp/meson.build\n+++ b/src/libcamera/software_isp/meson.build\n@@ -1,6 +1,7 @@\n # SPDX-License-Identifier: CC0-1.0\n \n libcamera_sources += files([\n+\t'debayer.cpp',\n \t'swstats.cpp',\n \t'swstats_cpu.cpp',\n ])\n", "prefixes": [ "libcamera-devel", "v2", "09/18" ] }