[libcamera-devel,v2,3/3] cam: dng_writer: Add support for 8-bit raw formats
diff mbox series

Message ID 20221018080908.2841339-4-paul.elder@ideasonboard.com
State Accepted
Headers show
Series
  • cam: Add DNG support
Related show

Commit Message

Paul Elder Oct. 18, 2022, 8:09 a.m. UTC 
Add support for 8-bit raw formats in DNGWriter.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

---
Changes in v2:
- replace copy loop with std::copy
---
 src/cam/dng_writer.cpp | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

Comments

Jacopo Mondi Oct. 19, 2022, 8:39 a.m. UTC | #1 
Hi Paul

On Tue, Oct 18, 2022 at 05:09:08PM +0900, Paul Elder via libcamera-devel wrote:
> Add support for 8-bit raw formats in DNGWriter.
>
> Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

Thanks
  j

>
> ---
> Changes in v2:
> - replace copy loop with std::copy
> ---
>  src/cam/dng_writer.cpp | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
>
> diff --git a/src/cam/dng_writer.cpp b/src/cam/dng_writer.cpp
> index 6dd7d0f4..c945edce 100644
> --- a/src/cam/dng_writer.cpp
> +++ b/src/cam/dng_writer.cpp
> @@ -126,6 +126,14 @@ struct Matrix3d {
>  	float m[9];
>  };
>
> +void packScanlineSBGGR8(void *output, const void *input, unsigned int width)
> +{
> +	const uint8_t *in = static_cast<const uint8_t *>(input);
> +	uint8_t *out = static_cast<uint8_t *>(output);
> +
> +	std::copy(in, in + width, out);
> +}
> +
>  void packScanlineSBGGR10P(void *output, const void *input, unsigned int width)
>  {
>  	const uint8_t *in = static_cast<const uint8_t *>(input);
> @@ -274,6 +282,30 @@ void thumbScanlineIPU3([[maybe_unused]] const FormatInfo &info, void *output,
>  }
>
>  static const std::map<PixelFormat, FormatInfo> formatInfo = {
> +	{ formats::SBGGR8, {
> +		.bitsPerSample = 8,
> +		.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },
> +		.packScanline = packScanlineSBGGR8,
> +		.thumbScanline = thumbScanlineSBGGRxxP,
> +	} },
> +	{ formats::SGBRG8, {
> +		.bitsPerSample = 8,
> +		.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },
> +		.packScanline = packScanlineSBGGR8,
> +		.thumbScanline = thumbScanlineSBGGRxxP,
> +	} },
> +	{ formats::SGRBG8, {
> +		.bitsPerSample = 8,
> +		.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },
> +		.packScanline = packScanlineSBGGR8,
> +		.thumbScanline = thumbScanlineSBGGRxxP,
> +	} },
> +	{ formats::SRGGB8, {
> +		.bitsPerSample = 8,
> +		.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },
> +		.packScanline = packScanlineSBGGR8,
> +		.thumbScanline = thumbScanlineSBGGRxxP,
> +	} },
>  	{ formats::SBGGR10_CSI2P, {
>  		.bitsPerSample = 10,
>  		.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },
> --
> 2.30.2
>
Eric Curtin Oct. 19, 2022, 6:14 p.m. UTC | #2 
On Tue, 18 Oct 2022 at 09:09, Paul Elder via libcamera-devel
<libcamera-devel@lists.libcamera.org> wrote:
>
> Add support for 8-bit raw formats in DNGWriter.
>
> Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Eric Curtin <ecurtin@redhat.com>

>
> ---
> Changes in v2:
> - replace copy loop with std::copy
> ---
>  src/cam/dng_writer.cpp | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
>
> diff --git a/src/cam/dng_writer.cpp b/src/cam/dng_writer.cpp
> index 6dd7d0f4..c945edce 100644
> --- a/src/cam/dng_writer.cpp
> +++ b/src/cam/dng_writer.cpp
> @@ -126,6 +126,14 @@ struct Matrix3d {
>         float m[9];
>  };
>
> +void packScanlineSBGGR8(void *output, const void *input, unsigned int width)
> +{
> +       const uint8_t *in = static_cast<const uint8_t *>(input);
> +       uint8_t *out = static_cast<uint8_t *>(output);
> +
> +       std::copy(in, in + width, out);
> +}
> +
>  void packScanlineSBGGR10P(void *output, const void *input, unsigned int width)
>  {
>         const uint8_t *in = static_cast<const uint8_t *>(input);
> @@ -274,6 +282,30 @@ void thumbScanlineIPU3([[maybe_unused]] const FormatInfo &info, void *output,
>  }
>
>  static const std::map<PixelFormat, FormatInfo> formatInfo = {
> +       { formats::SBGGR8, {
> +               .bitsPerSample = 8,
> +               .pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },
> +               .packScanline = packScanlineSBGGR8,
> +               .thumbScanline = thumbScanlineSBGGRxxP,
> +       } },
> +       { formats::SGBRG8, {
> +               .bitsPerSample = 8,
> +               .pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },
> +               .packScanline = packScanlineSBGGR8,
> +               .thumbScanline = thumbScanlineSBGGRxxP,
> +       } },
> +       { formats::SGRBG8, {
> +               .bitsPerSample = 8,
> +               .pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },
> +               .packScanline = packScanlineSBGGR8,
> +               .thumbScanline = thumbScanlineSBGGRxxP,
> +       } },
> +       { formats::SRGGB8, {
> +               .bitsPerSample = 8,
> +               .pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },
> +               .packScanline = packScanlineSBGGR8,
> +               .thumbScanline = thumbScanlineSBGGRxxP,
> +       } },
>         { formats::SBGGR10_CSI2P, {
>                 .bitsPerSample = 10,
>                 .pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },
> --
> 2.30.2
>

Patch
diff mbox series 

diff --git a/src/cam/dng_writer.cpp b/src/cam/dng_writer.cpp
index 6dd7d0f4..c945edce 100644
--- a/src/cam/dng_writer.cpp
+++ b/src/cam/dng_writer.cpp
@@ -126,6 +126,14 @@  struct Matrix3d {
 	float m[9];
 };
 
+void packScanlineSBGGR8(void *output, const void *input, unsigned int width)
+{
+	const uint8_t *in = static_cast<const uint8_t *>(input);
+	uint8_t *out = static_cast<uint8_t *>(output);
+
+	std::copy(in, in + width, out);
+}
+
 void packScanlineSBGGR10P(void *output, const void *input, unsigned int width)
 {
 	const uint8_t *in = static_cast<const uint8_t *>(input);
@@ -274,6 +282,30 @@  void thumbScanlineIPU3([[maybe_unused]] const FormatInfo &info, void *output,
 }
 
 static const std::map<PixelFormat, FormatInfo> formatInfo = {
+	{ formats::SBGGR8, {
+		.bitsPerSample = 8,
+		.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },
+		.packScanline = packScanlineSBGGR8,
+		.thumbScanline = thumbScanlineSBGGRxxP,
+	} },
+	{ formats::SGBRG8, {
+		.bitsPerSample = 8,
+		.pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen },
+		.packScanline = packScanlineSBGGR8,
+		.thumbScanline = thumbScanlineSBGGRxxP,
+	} },
+	{ formats::SGRBG8, {
+		.bitsPerSample = 8,
+		.pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen },
+		.packScanline = packScanlineSBGGR8,
+		.thumbScanline = thumbScanlineSBGGRxxP,
+	} },
+	{ formats::SRGGB8, {
+		.bitsPerSample = 8,
+		.pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue },
+		.packScanline = packScanlineSBGGR8,
+		.thumbScanline = thumbScanlineSBGGRxxP,
+	} },
 	{ formats::SBGGR10_CSI2P, {
 		.bitsPerSample = 10,
 		.pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },