[v2,2/3] apps: common: dng_writer: Add thumbnail scanline function for Raw
diff mbox series

Message ID 20240628100227.2910842-3-stefan.klug@ideasonboard.com
State Accepted
Headers show
Series
  • * dng_writer: Add support for RAW10 and RAW 12
Related show

Commit Message

Stefan Klug June 28, 2024, 10:01 a.m. UTC 
Add a thumbnail function for raw formats that are 16bit aligned.
This is needed for the upcoming RAW10 and RAW12 implemntation.

Use the new function for RAW16 as the thumbScanlineRaw_CSI2P produces
incorrect results for that format (it averages over adjacent bytes,
which works for the CSI formats).

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/apps/common/dng_writer.cpp | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

Patch
diff mbox series 

diff --git a/src/apps/common/dng_writer.cpp b/src/apps/common/dng_writer.cpp
index 3b17dadc427f..474aa72beb92 100644
--- a/src/apps/common/dng_writer.cpp
+++ b/src/apps/common/dng_writer.cpp
@@ -144,6 +144,30 @@  void packScanlineRaw16(void *output, const void *input, unsigned int width)
 	std::copy(in, in + width, out);
 }
 
+/* Thumbnail function for raw data with each pixel aligned to 16bit. */
+void thumbScanlineRaw(const FormatInfo &info, void *output,
+			  const void *input, unsigned int width,
+			  unsigned int stride)
+{
+	const uint16_t *in = static_cast<const uint16_t *>(input);
+	const uint16_t *in2 = static_cast<const uint16_t *>(input) + stride / 2;
+	uint8_t *out = static_cast<uint8_t *>(output);
+
+	/* Shift down to 8. */
+	unsigned int shift = info.bitsPerSample - 8;
+
+	/* Simple averaging that produces greyscale RGB values. */
+	for (unsigned int x = 0; x < width; x++) {
+		uint16_t value = (in[0] + in[1] + in2[0] + in2[1]) >> 2;
+		value = value >> shift;
+		*out++ = value;
+		*out++ = value;
+		*out++ = value;
+		in += 16;
+		in2 += 16;
+	}
+}
+
 void packScanlineRaw10_CSI2P(void *output, const void *input, unsigned int width)
 {
 	const uint8_t *in = static_cast<const uint8_t *>(input);
@@ -321,25 +345,25 @@  const std::map<PixelFormat, FormatInfo> formatInfo = {
 		.bitsPerSample = 16,
 		.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },
 		.packScanline = packScanlineRaw16,
-		.thumbScanline = thumbScanlineRaw_CSI2P,
+		.thumbScanline = thumbScanlineRaw,
 	} },
 	{ formats::SGBRG16, {
 		.bitsPerSample = 16,
 		.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },
 		.packScanline = packScanlineRaw16,
-		.thumbScanline = thumbScanlineRaw_CSI2P,
+		.thumbScanline = thumbScanlineRaw,
 	} },
 	{ formats::SGRBG16, {
 		.bitsPerSample = 16,
 		.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },
 		.packScanline = packScanlineRaw16,
-		.thumbScanline = thumbScanlineRaw_CSI2P,
+		.thumbScanline = thumbScanlineRaw,
 	} },
 	{ formats::SRGGB16, {
 		.bitsPerSample = 16,
 		.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },
 		.packScanline = packScanlineRaw16,
-		.thumbScanline = thumbScanlineRaw_CSI2P,
+		.thumbScanline = thumbScanlineRaw,
 	} },
 	{ formats::SBGGR10_CSI2P, {
 		.bitsPerSample = 10,