{"id":20456,"url":"https://patchwork.libcamera.org/api/patches/20456/?format=json","web_url":"https://patchwork.libcamera.org/patch/20456/","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":"<20240628100227.2910842-2-stefan.klug@ideasonboard.com>","date":"2024-06-28T10:01:43","name":"[v2,1/3] apps: common: dng_writer: Rename packing functions","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"37ac463b55a13b8beca1e40739da83bb7e9e82f6","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20456/mbox/","series":[{"id":4429,"url":"https://patchwork.libcamera.org/api/series/4429/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4429","date":"2024-06-28T10:01:42","name":"* dng_writer: Add support for RAW10 and RAW 12","version":2,"mbox":"https://patchwork.libcamera.org/series/4429/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20456/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20456/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 1FA6FBDB1D\n\tfor ;\n\tFri, 28 Jun 2024 10:02:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C0BF362C9F;\n\tFri, 28 Jun 2024 12:02:53 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6019962C95\n\tfor ;\n\tFri, 28 Jun 2024 12:02:50 +0200 (CEST)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:82ab:924:d918:cd24])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7DBE1735;\n\tFri, 28 Jun 2024 12:02:25 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"GEEJjLPS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719568945;\n\tbh=7KRMNmpXVKcnL1l+J90swNlMUZWK/TxHxvdlI/f6Hf4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=GEEJjLPS6jUJLAs3nI75dECqHECGbk2e+WrS+A+m9SvhyfiuL0LBjI4+nrlCzwZom\n\tYDp5H178+ALrtsvPciNMOX49QBev0xPl16RvZjwlt5HAc6Hz8aFSujfcSE2HvxZpNd\n\trTmCCJgJHaXGk7q/5+hl+u7c0sUmdhCPl74i6J2s=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ,\n\tKieran Bingham ,\n\tLaurent Pinchart ","Subject":"[PATCH v2 1/3] apps: common: dng_writer: Rename packing functions","Date":"Fri, 28 Jun 2024 12:01:43 +0200","Message-ID":"<20240628100227.2910842-2-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20240628100227.2910842-1-stefan.klug@ideasonboard.com>","References":"<20240628100227.2910842-1-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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 old names lead to confusions. Rename to better express the intent.\n\nSigned-off-by: Stefan Klug \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n---\n src/apps/common/dng_writer.cpp | 74 +++++++++++++++++-----------------\n 1 file changed, 37 insertions(+), 37 deletions(-)","diff":"diff --git a/src/apps/common/dng_writer.cpp b/src/apps/common/dng_writer.cpp\nindex d37b0d627cd1..3b17dadc427f 100644\n--- a/src/apps/common/dng_writer.cpp\n+++ b/src/apps/common/dng_writer.cpp\n@@ -128,7 +128,7 @@ struct Matrix3d {\n \n namespace {\n \n-void packScanlineSBGGR8(void *output, const void *input, unsigned int width)\n+void packScanlineRaw8(void *output, const void *input, unsigned int width)\n {\n \tconst uint8_t *in = static_cast(input);\n \tuint8_t *out = static_cast(output);\n@@ -136,7 +136,7 @@ void packScanlineSBGGR8(void *output, const void *input, unsigned int width)\n \tstd::copy(in, in + width, out);\n }\n \n-void packScanlineSBGGR16(void *output, const void *input, unsigned int width)\n+void packScanlineRaw16(void *output, const void *input, unsigned int width)\n {\n \tconst uint16_t *in = static_cast(input);\n \tuint16_t *out = static_cast(output);\n@@ -144,7 +144,7 @@ void packScanlineSBGGR16(void *output, const void *input, unsigned int width)\n \tstd::copy(in, in + width, out);\n }\n \n-void packScanlineSBGGR10P(void *output, const void *input, unsigned int width)\n+void packScanlineRaw10_CSI2P(void *output, const void *input, unsigned int width)\n {\n \tconst uint8_t *in = static_cast(input);\n \tuint8_t *out = static_cast(output);\n@@ -160,7 +160,7 @@ void packScanlineSBGGR10P(void *output, const void *input, unsigned int width)\n \t}\n }\n \n-void packScanlineSBGGR12P(void *output, const void *input, unsigned int width)\n+void packScanlineRaw12_CSI2P(void *output, const void *input, unsigned int width)\n {\n \tconst uint8_t *in = static_cast(input);\n \tuint8_t *out = static_cast(output);\n@@ -174,7 +174,7 @@ void packScanlineSBGGR12P(void *output, const void *input, unsigned int width)\n \t}\n }\n \n-void thumbScanlineSBGGRxxP(const FormatInfo &info, void *output,\n+void thumbScanlineRaw_CSI2P(const FormatInfo &info, void *output,\n \t\t\t const void *input, unsigned int width,\n \t\t\t unsigned int stride)\n {\n@@ -296,98 +296,98 @@ const std::map formatInfo = {\n \t{ formats::SBGGR8, {\n \t\t.bitsPerSample = 8,\n \t\t.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },\n-\t\t.packScanline = packScanlineSBGGR8,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw8,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SGBRG8, {\n \t\t.bitsPerSample = 8,\n \t\t.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },\n-\t\t.packScanline = packScanlineSBGGR8,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw8,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SGRBG8, {\n \t\t.bitsPerSample = 8,\n \t\t.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },\n-\t\t.packScanline = packScanlineSBGGR8,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw8,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SRGGB8, {\n \t\t.bitsPerSample = 8,\n \t\t.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },\n-\t\t.packScanline = packScanlineSBGGR8,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw8,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SBGGR16, {\n \t\t.bitsPerSample = 16,\n \t\t.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },\n-\t\t.packScanline = packScanlineSBGGR16,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw16,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SGBRG16, {\n \t\t.bitsPerSample = 16,\n \t\t.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },\n-\t\t.packScanline = packScanlineSBGGR16,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw16,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SGRBG16, {\n \t\t.bitsPerSample = 16,\n \t\t.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },\n-\t\t.packScanline = packScanlineSBGGR16,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw16,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SRGGB16, {\n \t\t.bitsPerSample = 16,\n \t\t.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },\n-\t\t.packScanline = packScanlineSBGGR16,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw16,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SBGGR10_CSI2P, {\n \t\t.bitsPerSample = 10,\n \t\t.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },\n-\t\t.packScanline = packScanlineSBGGR10P,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw10_CSI2P,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SGBRG10_CSI2P, {\n \t\t.bitsPerSample = 10,\n \t\t.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },\n-\t\t.packScanline = packScanlineSBGGR10P,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw10_CSI2P,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SGRBG10_CSI2P, {\n \t\t.bitsPerSample = 10,\n \t\t.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },\n-\t\t.packScanline = packScanlineSBGGR10P,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw10_CSI2P,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SRGGB10_CSI2P, {\n \t\t.bitsPerSample = 10,\n \t\t.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },\n-\t\t.packScanline = packScanlineSBGGR10P,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw10_CSI2P,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SBGGR12_CSI2P, {\n \t\t.bitsPerSample = 12,\n \t\t.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },\n-\t\t.packScanline = packScanlineSBGGR12P,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw12_CSI2P,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SGBRG12_CSI2P, {\n \t\t.bitsPerSample = 12,\n \t\t.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },\n-\t\t.packScanline = packScanlineSBGGR12P,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw12_CSI2P,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SGRBG12_CSI2P, {\n \t\t.bitsPerSample = 12,\n \t\t.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },\n-\t\t.packScanline = packScanlineSBGGR12P,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw12_CSI2P,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SRGGB12_CSI2P, {\n \t\t.bitsPerSample = 12,\n \t\t.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },\n-\t\t.packScanline = packScanlineSBGGR12P,\n-\t\t.thumbScanline = thumbScanlineSBGGRxxP,\n+\t\t.packScanline = packScanlineRaw12_CSI2P,\n+\t\t.thumbScanline = thumbScanlineRaw_CSI2P,\n \t} },\n \t{ formats::SBGGR10_IPU3, {\n \t\t.bitsPerSample = 16,\n","prefixes":["v2","1/3"]}