Patch Detail
Show a patch.
GET /api/patches/19406/?format=api
{ "id": 19406, "url": "https://patchwork.libcamera.org/api/patches/19406/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19406/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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-17-hdegoede@redhat.com>", "date": "2024-01-13T14:22:16", "name": "[libcamera-devel,v2,16/18] libcamera: swstats_cpu: Add support for 8 and 10 bpp unpacked bayer input", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "d86d09f0e6fa5b12113493ec49d382485ad4335c", "submitter": { "id": 102, "url": "https://patchwork.libcamera.org/api/people/102/?format=api", "name": "Hans de Goede", "email": "hdegoede@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19406/mbox/", "series": [ { "id": 4142, "url": "https://patchwork.libcamera.org/api/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/19406/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19406/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 E994EBEFBE\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 13 Jan 2024 14:23:12 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8E07662949;\n\tSat, 13 Jan 2024 15:23:12 +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 15816628BA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 13 Jan 2024 15:23:11 +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-671-t3V_O6aiNAeHRJBkdj3UqQ-1;\n\tSat, 13 Jan 2024 09:23:05 -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 01AE429AA389;\n\tSat, 13 Jan 2024 14:23:05 +0000 (UTC)", "from localhost.localdomain (unknown [10.39.192.58])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 2DB8A3C25;\n\tSat, 13 Jan 2024 14:23:03 +0000 (UTC)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1705155792;\n\tbh=hsBYVdTBrAZWsxlE2UOT1Y8nzt9N04UWvFwDF/G04sU=;\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=QE77ijKTTPmgAnLKlrDHnzMCZUNHAVmGBwGlGgF8MFDPaMMETZHo2HwrttBO2OQaQ\n\tVLoDve78ZvwT6pmMBYGx+/2VGCpjaNBekgL/RWRfZW/eVH/6xmbp7UhsA6mbM7ee8R\n\tzXkJ03uBvl8pwVCnKOaSwfeHB/QYqGfuAfswNxf3KdSWntRU5ZbR50zt4FPGh7WBVT\n\tQqpaOvgwmLiHijyvrFmGWxbZiGAbZU7n2NX0yfvWqSKwzym7FQKE5Y5Yhy/yWiLCPK\n\tTfoyXr14pyUYgmg9Z7xEKaTccXNl6Hv3/4BSuCaFDhb8H9WPF/OLrdH/nfeAEWAkn6\n\ty9PeT+S/06FDA==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1705155790;\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=diAP1U/Qgri4qaPRP+DrtDR3hQ8y1Pz2h6tNa7MEXtQ=;\n\tb=DMNkBKtcAsXVEaqvgd2IwRAMQtOQljnBtE9KoLhyqhr75OS9+kSO/Ytx9bmsqEb5xwvvQo\n\tkqGLEVrLsgVLp7AAL/Nedh78jSi5oi/kvvZ1nGYKteV/0NUJbWAOkJ99Uy/F5TfGDqU798\n\tAekdSkEmpaplyQWN2DY2hXk+uQi6Zfc=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=redhat.com\n\theader.i=@redhat.com header.b=\"DMNkBKtc\"; \n\tdkim-atps=neutral", "X-MC-Unique": "t3V_O6aiNAeHRJBkdj3UqQ-1", "To": "libcamera-devel@lists.libcamera.org,\n\tAndrey Konovalov <andrey.konovalov.ynk@gmail.com>", "Date": "Sat, 13 Jan 2024 15:22:16 +0100", "Message-ID": "<20240113142218.28063-17-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 16/18] libcamera: swstats_cpu: Add\n\tsupport for 8 and 10 bpp unpacked bayer input", "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 support for 8 and 10 bpp unpacked bayer input for all 4 standard\nbayer orders.\n\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 .../internal/software_isp/swstats_cpu.h | 7 ++\n src/libcamera/software_isp/swstats_cpu.cpp | 97 +++++++++++++++++++\n 2 files changed, 104 insertions(+)", "diff": "diff --git a/include/libcamera/internal/software_isp/swstats_cpu.h b/include/libcamera/internal/software_isp/swstats_cpu.h\nindex 8bb86e98..3410753c 100644\n--- a/include/libcamera/internal/software_isp/swstats_cpu.h\n+++ b/include/libcamera/internal/software_isp/swstats_cpu.h\n@@ -11,6 +11,7 @@\n \n #pragma once\n \n+#include \"libcamera/internal/bayer_format.h\"\n #include \"libcamera/internal/shared_mem_object.h\"\n #include \"libcamera/internal/software_isp/swisp_stats.h\"\n #include \"libcamera/internal/software_isp/swstats.h\"\n@@ -31,6 +32,12 @@ public:\n \tconst SharedFD &getStatsFD() { return sharedStats_.fd(); }\n \tint configure(const StreamConfiguration &inputCfg);\n private:\n+\tint setupStandardBayerOrder(BayerFormat::Order order);\n+\t/* Bayer 8 bpp unpacked */\n+\tvoid statsBGGR8Line0(const uint8_t *src[]);\n+\t/* Bayer 10 bpp unpacked */\n+\tvoid statsBGGR10Line0(const uint8_t *src[]);\n+\t/* Bayer 10 bpp packed */\n \tvoid statsBGGR10PLine0(const uint8_t *src[]);\n \tvoid statsGBRG10PLine0(const uint8_t *src[]);\n \tvoid resetStats(void);\ndiff --git a/src/libcamera/software_isp/swstats_cpu.cpp b/src/libcamera/software_isp/swstats_cpu.cpp\nindex 59453d07..6bd78860 100644\n--- a/src/libcamera/software_isp/swstats_cpu.cpp\n+++ b/src/libcamera/software_isp/swstats_cpu.cpp\n@@ -59,6 +59,57 @@ static const unsigned int BLUE_Y_MUL = 29; /* 0.11 * 256 */\n \tstats_.sumG_ += sumG; \\\n \tstats_.sumB_ += sumB;\n \n+void SwStatsCpu::statsBGGR8Line0(const uint8_t *src[])\n+{\n+\tconst uint8_t *src0 = src[1] + window_.x;\n+\tconst uint8_t *src1 = src[2] + window_.x;\n+\n+\tSWISP_LINARO_START_LINE_STATS(uint8_t)\n+\n+\tif (swap_lines_)\n+\t\tstd::swap(src0, src1);\n+\n+\t/* x += 4 sample every other 2x2 block */\n+\tfor (int x = 0; x < (int)window_.width; x += 4) {\n+\t\tb = src0[x];\n+\t\tg = src0[x + 1];\n+\t\tg2 = src1[x];\n+\t\tr = src1[x + 1];\n+\n+\t\tg = (g + g2) / 2;\n+\n+\t\tSWISP_LINARO_ACCUMULATE_LINE_STATS(1)\n+\t}\n+\n+\tSWISP_LINARO_FINISH_LINE_STATS()\n+}\n+\n+void SwStatsCpu::statsBGGR10Line0(const uint8_t *src[])\n+{\n+\tconst uint16_t *src0 = (const uint16_t *)src[1] + window_.x;\n+\tconst uint16_t *src1 = (const uint16_t *)src[2] + window_.x;\n+\n+\tSWISP_LINARO_START_LINE_STATS(uint16_t)\n+\n+\tif (swap_lines_)\n+\t\tstd::swap(src0, src1);\n+\n+\t/* x += 4 sample every other 2x2 block */\n+\tfor (int x = 0; x < (int)window_.width; x += 4) {\n+\t\tb = src0[x];\n+\t\tg = src0[x + 1];\n+\t\tg2 = src1[x];\n+\t\tr = src1[x + 1];\n+\n+\t\tg = (g + g2) / 2;\n+\n+\t\t/* divide Y by 4 for 10 -> 8 bpp value */\n+\t\tSWISP_LINARO_ACCUMULATE_LINE_STATS(4)\n+\t}\n+\n+\tSWISP_LINARO_FINISH_LINE_STATS()\n+}\n+\n static inline __attribute__((always_inline)) void\n statsBayer10P(const int width, const uint8_t *src0, const uint8_t *src1, bool bggr, SwIspStats &stats_)\n {\n@@ -124,6 +175,39 @@ void SwStatsCpu::finishStats(void)\n \tstatsReady.emit(0);\n }\n \n+/*\n+ * Check if order is a standard Bayer order and setup x_shift_ and swap_lines_\n+ * so that a single BGGR stats function can be used for all 4 standard orders.\n+ */\n+int SwStatsCpu::setupStandardBayerOrder(BayerFormat::Order order)\n+{\n+\tswitch (order) {\n+\tcase BayerFormat::BGGR:\n+\t\tx_shift_ = 0;\n+\t\tswap_lines_ = false;\n+\t\tbreak;\n+\tcase BayerFormat::GBRG:\n+\t\tx_shift_ = 1; /* BGGR -> GBRG */\n+\t\tswap_lines_ = false;\n+\t\tbreak;\n+\tcase BayerFormat::GRBG:\n+\t\tx_shift_ = 0;\n+\t\tswap_lines_ = true; /* BGGR -> GRBG */\n+\t\tbreak;\n+\tcase BayerFormat::RGGB:\n+\t\tx_shift_ = 1; /* BGGR -> GBRG */\n+\t\tswap_lines_ = true; /* GBRG -> RGGB */\n+\t\tbreak;\n+\tdefault:\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tpatternSize_.height = 2;\n+\tpatternSize_.width = 2;\n+\ty_skip_mask_ = 0x02; /* Skip every 3th and 4th line */\n+\treturn 0;\n+}\n+\n int SwStatsCpu::configure(const StreamConfiguration &inputCfg)\n {\n \tBayerFormat bayerFormat =\n@@ -132,6 +216,19 @@ int SwStatsCpu::configure(const StreamConfiguration &inputCfg)\n \tstartFrame_ = (SwStats::statsVoidFn)&SwStatsCpu::resetStats;\n \tfinishFrame_ = (SwStats::statsVoidFn)&SwStatsCpu::finishStats;\n \n+\tif (bayerFormat.packing == BayerFormat::Packing::None &&\n+\t setupStandardBayerOrder(bayerFormat.order) == 0) {\n+\t\tbpp_ = (bayerFormat.bitDepth + 7) & ~7;\n+\t\tswitch (bayerFormat.bitDepth) {\n+\t\tcase 8:\n+\t\t\tstats0_ = (SwStats::statsProcessFn)&SwStatsCpu::statsBGGR8Line0;\n+\t\t\treturn 0;\n+\t\tcase 10:\n+\t\t\tstats0_ = (SwStats::statsProcessFn)&SwStatsCpu::statsBGGR10Line0;\n+\t\t\treturn 0;\n+\t\t}\n+\t}\n+\n \tif (bayerFormat.bitDepth == 10 &&\n \t bayerFormat.packing == BayerFormat::Packing::CSI2) {\n \t\tbpp_ = 10;\n", "prefixes": [ "libcamera-devel", "v2", "16/18" ] }