[libcamera-devel] utils: ipu3: Add IPU3 raw capture unpack utility

Message ID 20181119175306.4729-1-laurent.pinchart@ideasonboard.com
State Accepted
Commit 23ac77dc4a096b92da7668e9ddfce10b22e73506
Headers show
Series
  • [libcamera-devel] utils: ipu3: Add IPU3 raw capture unpack utility
Related show

Commit Message

Laurent Pinchart Nov. 19, 2018, 5:53 p.m. UTC
The IPU3 captures Bayer data in a 25-pixels-in-32-bytes packed format,
which no standard tool can process. Add a quick implementation of data
unpacking to turn raw binary files into 16 bits per pixel unpacked Bayer
data.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 meson.build              |  3 +-
 utils/ipu3/ipu3-unpack.c | 93 ++++++++++++++++++++++++++++++++++++++++
 utils/ipu3/meson.build   |  1 +
 utils/meson.build        |  1 +
 4 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 utils/ipu3/ipu3-unpack.c
 create mode 100644 utils/ipu3/meson.build
 create mode 100644 utils/meson.build

Comments

Jacopo Mondi Nov. 20, 2018, 12:59 a.m. UTC | #1
Hi Laurent,

On Mon, Nov 19, 2018 at 07:53:06PM +0200, Laurent Pinchart wrote:
> The IPU3 captures Bayer data in a 25-pixels-in-32-bytes packed format,
> which no standard tool can process. Add a quick implementation of data
> unpacking to turn raw binary files into 16 bits per pixel unpacked Bayer
> data.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

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

Thanks
  j

> ---
>  meson.build              |  3 +-
>  utils/ipu3/ipu3-unpack.c | 93 ++++++++++++++++++++++++++++++++++++++++
>  utils/ipu3/meson.build   |  1 +
>  utils/meson.build        |  1 +
>  4 files changed, 97 insertions(+), 1 deletion(-)
>  create mode 100644 utils/ipu3/ipu3-unpack.c
>  create mode 100644 utils/ipu3/meson.build
>  create mode 100644 utils/meson.build
>
> diff --git a/meson.build b/meson.build
> index d1e186adb356..4b3d528c8932 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1,4 +1,4 @@
> -project('libcamera - supporting complex camera pipelines', 'cpp',
> +project('libcamera - supporting complex camera pipelines', 'c', 'cpp',
>    version : '0.1',
>    license : 'LGPL 2.1+')
>
> @@ -6,6 +6,7 @@ inc = include_directories('include')
>
>  subdir('lib')
>  subdir('test')
> +subdir('utils')
>
>  pkg_mod = import('pkgconfig')
>  pkg_mod.generate(libraries : libcamera,
> diff --git a/utils/ipu3/ipu3-unpack.c b/utils/ipu3/ipu3-unpack.c
> new file mode 100644
> index 000000000000..2dce10385add
> --- /dev/null
> +++ b/utils/ipu3/ipu3-unpack.c
> @@ -0,0 +1,93 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * ipu3-unpack - Unpack IPU3 raw Bayer format to 16-bit Bayer
> + *
> + * Copyright 2018 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> + */
> +#define _GNU_SOURCE
> +
> +#include <errno.h>
> +#include <fcntl.h>
> +#include <stdint.h>
> +#include <stdio.h>
> +#include <string.h>
> +#include <sys/stat.h>
> +#include <sys/types.h>
> +#include <unistd.h>
> +
> +static void usage(const char *argv0)
> +{
> +	printf("Usage: %s input-file output-file\n", basename(argv0));
> +	printf("Unpack the IPU3 raw Bayer format to 16-bit Bayer\n");
> +}
> +
> +int main(int argc, char *argv[])
> +{
> +	int in_fd;
> +	int out_fd;
> +	int ret;
> +
> +	if (argc != 3) {
> +		usage(argv[0]);
> +		return 1;
> +	}
> +
> +	in_fd = open(argv[1], O_RDONLY);
> +	if (in_fd == -1) {
> +		fprintf(stderr, "Failed to open input file '%s': %s\n",
> +			argv[1], strerror(errno));
> +		return 1;
> +	}
> +
> +	out_fd = open(argv[2], O_WRONLY | O_TRUNC | O_CREAT, 0644);
> +	if (out_fd == -1) {
> +		fprintf(stderr, "Failed to open output file '%s': %s\n",
> +			argv[2], strerror(errno));
> +		return 1;
> +	}
> +
> +	while (1) {
> +		uint8_t in_data[32];
> +		uint8_t out_data[50];
> +		unsigned int i;
> +
> +		ret = read(in_fd, in_data, 32);
> +		if (ret == -1) {
> +			fprintf(stderr, "Failed to read input data: %s\n",
> +				strerror(errno));
> +			goto done;
> +		}
> +
> +		if (ret < 32) {
> +			if (ret != 0)
> +				fprintf(stderr, "%u bytes of stray data at end of input\n",
> +					ret);
> +			break;
> +		}
> +
> +		for (i = 0; i < 25; ++i) {
> +			unsigned int index = (i * 10) / 8;
> +			unsigned int lsb_shift = (i * 10) % 8;
> +			unsigned int msb_shift = 8 - lsb_shift;
> +			uint16_t pixel;
> +
> +			pixel = ((in_data[index+1] << msb_shift) & 0x3ff)
> +			      | ((in_data[index+0] >> lsb_shift) & 0x3ff);
> +			out_data[i*2+0] = (pixel >> 0) & 0xff;
> +			out_data[i*2+1] = (pixel >> 8) & 0xff;
> +		}
> +
> +		ret = write(out_fd, out_data, 50);
> +		if (ret < -1) {
> +			fprintf(stderr, "Failed to read input data: %s\n",
> +				strerror(errno));
> +			goto done;
> +		}
> +	}
> +
> +done:
> +	close(in_fd);
> +	close(out_fd);
> +
> +	return ret ? 1 : 0;
> +}
> diff --git a/utils/ipu3/meson.build b/utils/ipu3/meson.build
> new file mode 100644
> index 000000000000..49c45856eea6
> --- /dev/null
> +++ b/utils/ipu3/meson.build
> @@ -0,0 +1 @@
> +ipu3_unpack = executable('ipu3-unpack', 'ipu3-unpack.c')
> diff --git a/utils/meson.build b/utils/meson.build
> new file mode 100644
> index 000000000000..f434c79c0ae3
> --- /dev/null
> +++ b/utils/meson.build
> @@ -0,0 +1 @@
> +subdir('ipu3')
> --
> Regards,
>
> Laurent Pinchart
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/meson.build b/meson.build
index d1e186adb356..4b3d528c8932 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@ 
-project('libcamera - supporting complex camera pipelines', 'cpp',
+project('libcamera - supporting complex camera pipelines', 'c', 'cpp',
   version : '0.1',
   license : 'LGPL 2.1+')
 
@@ -6,6 +6,7 @@  inc = include_directories('include')
 
 subdir('lib')
 subdir('test')
+subdir('utils')
 
 pkg_mod = import('pkgconfig')
 pkg_mod.generate(libraries : libcamera,
diff --git a/utils/ipu3/ipu3-unpack.c b/utils/ipu3/ipu3-unpack.c
new file mode 100644
index 000000000000..2dce10385add
--- /dev/null
+++ b/utils/ipu3/ipu3-unpack.c
@@ -0,0 +1,93 @@ 
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * ipu3-unpack - Unpack IPU3 raw Bayer format to 16-bit Bayer
+ *
+ * Copyright 2018 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ */
+#define _GNU_SOURCE
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+static void usage(const char *argv0)
+{
+	printf("Usage: %s input-file output-file\n", basename(argv0));
+	printf("Unpack the IPU3 raw Bayer format to 16-bit Bayer\n");
+}
+
+int main(int argc, char *argv[])
+{
+	int in_fd;
+	int out_fd;
+	int ret;
+
+	if (argc != 3) {
+		usage(argv[0]);
+		return 1;
+	}
+
+	in_fd = open(argv[1], O_RDONLY);
+	if (in_fd == -1) {
+		fprintf(stderr, "Failed to open input file '%s': %s\n",
+			argv[1], strerror(errno));
+		return 1;
+	}
+
+	out_fd = open(argv[2], O_WRONLY | O_TRUNC | O_CREAT, 0644);
+	if (out_fd == -1) {
+		fprintf(stderr, "Failed to open output file '%s': %s\n",
+			argv[2], strerror(errno));
+		return 1;
+	}
+
+	while (1) {
+		uint8_t in_data[32];
+		uint8_t out_data[50];
+		unsigned int i;
+
+		ret = read(in_fd, in_data, 32);
+		if (ret == -1) {
+			fprintf(stderr, "Failed to read input data: %s\n",
+				strerror(errno));
+			goto done;
+		}
+
+		if (ret < 32) {
+			if (ret != 0)
+				fprintf(stderr, "%u bytes of stray data at end of input\n",
+					ret);
+			break;
+		}
+
+		for (i = 0; i < 25; ++i) {
+			unsigned int index = (i * 10) / 8;
+			unsigned int lsb_shift = (i * 10) % 8;
+			unsigned int msb_shift = 8 - lsb_shift;
+			uint16_t pixel;
+
+			pixel = ((in_data[index+1] << msb_shift) & 0x3ff)
+			      | ((in_data[index+0] >> lsb_shift) & 0x3ff);
+			out_data[i*2+0] = (pixel >> 0) & 0xff;
+			out_data[i*2+1] = (pixel >> 8) & 0xff;
+		}
+
+		ret = write(out_fd, out_data, 50);
+		if (ret < -1) {
+			fprintf(stderr, "Failed to read input data: %s\n",
+				strerror(errno));
+			goto done;
+		}
+	}
+
+done:
+	close(in_fd);
+	close(out_fd);
+
+	return ret ? 1 : 0;
+}
diff --git a/utils/ipu3/meson.build b/utils/ipu3/meson.build
new file mode 100644
index 000000000000..49c45856eea6
--- /dev/null
+++ b/utils/ipu3/meson.build
@@ -0,0 +1 @@ 
+ipu3_unpack = executable('ipu3-unpack', 'ipu3-unpack.c')
diff --git a/utils/meson.build b/utils/meson.build
new file mode 100644
index 000000000000..f434c79c0ae3
--- /dev/null
+++ b/utils/meson.build
@@ -0,0 +1 @@ 
+subdir('ipu3')