summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-06-28 23:59:30 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-07-01 10:53:06 +0300
commite3310749f5abb8003c85f7bdf01ce14b9e4b1fab (patch)
tree7cb87fd4f540defb4c969360404b2f00e590a022
parent7735d65ce81db570570dc21bb6056da8abd2ae22 (diff)
apps: common: dng_writer: Fix RAW10 and RAW12 packing on BE machines
The 16-bit padded raw 10 and raw 12 formats are stored in memory in little endian order, regardless of the machine's endianness. Read pixel data as uint8_t values and hardcode bit shifting to little endian to fix scanline packing. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com> Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com>
-rw-r--r--src/apps/common/dng_writer.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/apps/common/dng_writer.cpp b/src/apps/common/dng_writer.cpp
index 50db5eb3..355433b0 100644
--- a/src/apps/common/dng_writer.cpp
+++ b/src/apps/common/dng_writer.cpp
@@ -139,29 +139,29 @@ void packScanlineRaw8(void *output, const void *input, unsigned int width)
void packScanlineRaw10(void *output, const void *input, unsigned int width)
{
- const uint16_t *in = static_cast<const uint16_t *>(input);
+ const uint8_t *in = static_cast<const uint8_t *>(input);
uint8_t *out = static_cast<uint8_t *>(output);
for (unsigned int i = 0; i < width; i += 4) {
- *out++ = (in[0] & 0x3fc) >> 2;
- *out++ = (in[0] & 0x003) << 6 | (in[1] & 0x3f0) >> 4;
- *out++ = (in[1] & 0x00f) << 4 | (in[2] & 0x3c0) >> 6;
- *out++ = (in[2] & 0x03f) << 2 | (in[3] & 0x300) >> 8;
- *out++ = (in[3] & 0x0ff);
- in += 4;
+ *out++ = in[1] << 6 | in[0] >> 2;
+ *out++ = in[0] << 6 | (in[3] & 0x03) << 4 | in[2] >> 4;
+ *out++ = in[2] << 4 | (in[5] & 0x03) << 2 | in[4] >> 6;
+ *out++ = in[4] << 2 | (in[7] & 0x03) << 0;
+ *out++ = in[6];
+ in += 8;
}
}
void packScanlineRaw12(void *output, const void *input, unsigned int width)
{
- const uint16_t *in = static_cast<const uint16_t *>(input);
+ const uint8_t *in = static_cast<const uint8_t *>(input);
uint8_t *out = static_cast<uint8_t *>(output);
for (unsigned int i = 0; i < width; i += 2) {
- *out++ = (in[0] & 0xff0) >> 4;
- *out++ = (in[0] & 0x00f) << 4 | (in[1] & 0xf00) >> 8;
- *out++ = (in[1] & 0x0ff);
- in += 2;
+ *out++ = in[1] << 4 | in[0] >> 4;
+ *out++ = in[0] << 4 | (in[3] & 0x0f);
+ *out++ = in[2];
+ in += 4;
}
}