Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-13 23:39:44 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

apps: common: dng_writer: Rename packing functions

Browse source 
The old names lead to confusions. Rename to better express the intent.

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Stefan Klug 2024-06-28 12:01:43 +02:00 • committed by Laurent Pinchart
parent 5155150bbf
commit a47ab2711d
1 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/apps/common/dng_writer.cpp
View file

@ -128,7 +128,7 @@ struct Matrix3d {
namespace { namespace {
void packScanlineSBGGR8(void *output, const void *input, unsigned int width) void packScanlineRaw8(void *output, const void *input, unsigned int width)
{ {
const uint8_t *in = static_cast<const uint8_t *>(input); const uint8_t *in = static_cast<const uint8_t *>(input);
uint8_t *out = static_cast<uint8_t *>(output); uint8_t *out = static_cast<uint8_t *>(output);
@ -136,7 +136,7 @@ void packScanlineSBGGR8(void *output, const void *input, unsigned int width)
std::copy(in, in + width, out); std::copy(in, in + width, out);
} }
void packScanlineSBGGR16(void *output, const void *input, unsigned int width) void packScanlineRaw16(void *output, const void *input, unsigned int width)
{ {
const uint16_t *in = static_cast<const uint16_t *>(input); const uint16_t *in = static_cast<const uint16_t *>(input);
uint16_t *out = static_cast<uint16_t *>(output); uint16_t *out = static_cast<uint16_t *>(output);
@ -144,7 +144,7 @@ void packScanlineSBGGR16(void *output, const void *input, unsigned int width)
std::copy(in, in + width, out); std::copy(in, in + width, out);
} }
void packScanlineSBGGR10P(void *output, const void *input, unsigned int width) void packScanlineRaw10_CSI2P(void *output, const void *input, unsigned int width)
{ {
const uint8_t *in = static_cast<const uint8_t *>(input); const uint8_t *in = static_cast<const uint8_t *>(input);
uint8_t *out = static_cast<uint8_t *>(output); uint8_t *out = static_cast<uint8_t *>(output);
@ -160,7 +160,7 @@ void packScanlineSBGGR10P(void *output, const void *input, unsigned int width)
} }
} }
void packScanlineSBGGR12P(void *output, const void *input, unsigned int width) void packScanlineRaw12_CSI2P(void *output, const void *input, unsigned int width)
{ {
const uint8_t *in = static_cast<const uint8_t *>(input); const uint8_t *in = static_cast<const uint8_t *>(input);
uint8_t *out = static_cast<uint8_t *>(output); uint8_t *out = static_cast<uint8_t *>(output);
@ -174,7 +174,7 @@ void packScanlineSBGGR12P(void *output, const void *input, unsigned int width)
} }
} }
void thumbScanlineSBGGRxxP(const FormatInfo &info, void *output, void thumbScanlineRaw_CSI2P(const FormatInfo &info, void *output,
const void *input, unsigned int width, const void *input, unsigned int width,
unsigned int stride) unsigned int stride)
{ {
@ -296,98 +296,98 @@ const std::map<PixelFormat, FormatInfo> formatInfo = {
{ formats::SBGGR8, { { formats::SBGGR8, {
.bitsPerSample = 8, .bitsPerSample = 8,
.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed }, .pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },
.packScanline = packScanlineSBGGR8, .packScanline = packScanlineRaw8,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SGBRG8, { { formats::SGBRG8, {
.bitsPerSample = 8, .bitsPerSample = 8,
.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen }, .pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },
.packScanline = packScanlineSBGGR8, .packScanline = packScanlineRaw8,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SGRBG8, { { formats::SGRBG8, {
.bitsPerSample = 8, .bitsPerSample = 8,
.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen }, .pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },
.packScanline = packScanlineSBGGR8, .packScanline = packScanlineRaw8,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SRGGB8, { { formats::SRGGB8, {
.bitsPerSample = 8, .bitsPerSample = 8,
.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue }, .pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },
.packScanline = packScanlineSBGGR8, .packScanline = packScanlineRaw8,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SBGGR16, { { formats::SBGGR16, {
.bitsPerSample = 16, .bitsPerSample = 16,
.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed }, .pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },
.packScanline = packScanlineSBGGR16, .packScanline = packScanlineRaw16,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SGBRG16, { { formats::SGBRG16, {
.bitsPerSample = 16, .bitsPerSample = 16,
.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen }, .pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },
.packScanline = packScanlineSBGGR16, .packScanline = packScanlineRaw16,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SGRBG16, { { formats::SGRBG16, {
.bitsPerSample = 16, .bitsPerSample = 16,
.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen }, .pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },
.packScanline = packScanlineSBGGR16, .packScanline = packScanlineRaw16,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SRGGB16, { { formats::SRGGB16, {
.bitsPerSample = 16, .bitsPerSample = 16,
.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue }, .pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },
.packScanline = packScanlineSBGGR16, .packScanline = packScanlineRaw16,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SBGGR10_CSI2P, { { formats::SBGGR10_CSI2P, {
.bitsPerSample = 10, .bitsPerSample = 10,
.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed }, .pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },
.packScanline = packScanlineSBGGR10P, .packScanline = packScanlineRaw10_CSI2P,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SGBRG10_CSI2P, { { formats::SGBRG10_CSI2P, {
.bitsPerSample = 10, .bitsPerSample = 10,
.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen }, .pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },
.packScanline = packScanlineSBGGR10P, .packScanline = packScanlineRaw10_CSI2P,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SGRBG10_CSI2P, { { formats::SGRBG10_CSI2P, {
.bitsPerSample = 10, .bitsPerSample = 10,
.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen }, .pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },
.packScanline = packScanlineSBGGR10P, .packScanline = packScanlineRaw10_CSI2P,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SRGGB10_CSI2P, { { formats::SRGGB10_CSI2P, {
.bitsPerSample = 10, .bitsPerSample = 10,
.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue }, .pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },
.packScanline = packScanlineSBGGR10P, .packScanline = packScanlineRaw10_CSI2P,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SBGGR12_CSI2P, { { formats::SBGGR12_CSI2P, {
.bitsPerSample = 12, .bitsPerSample = 12,
.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed }, .pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },
.packScanline = packScanlineSBGGR12P, .packScanline = packScanlineRaw12_CSI2P,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SGBRG12_CSI2P, { { formats::SGBRG12_CSI2P, {
.bitsPerSample = 12, .bitsPerSample = 12,
.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen }, .pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },
.packScanline = packScanlineSBGGR12P, .packScanline = packScanlineRaw12_CSI2P,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SGRBG12_CSI2P, { { formats::SGRBG12_CSI2P, {
.bitsPerSample = 12, .bitsPerSample = 12,
.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen }, .pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },
.packScanline = packScanlineSBGGR12P, .packScanline = packScanlineRaw12_CSI2P,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SRGGB12_CSI2P, { { formats::SRGGB12_CSI2P, {
.bitsPerSample = 12, .bitsPerSample = 12,
.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue }, .pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },
.packScanline = packScanlineSBGGR12P, .packScanline = packScanlineRaw12_CSI2P,
.thumbScanline = thumbScanlineSBGGRxxP, .thumbScanline = thumbScanlineRaw_CSI2P,
} }, } },
{ formats::SBGGR10_IPU3, { { formats::SBGGR10_IPU3, {
.bitsPerSample = 16, .bitsPerSample = 16,