[libcamera-devel,v3] utils: ipu3-pack: Provide a 10-bit bayer packing utility
diff mbox series

Message ID 20220713121534.115492-1-umang.jain@ideasonboard.com
State Accepted
Commit 9eb8211160de2e0a879cc5e0b38f50137df989ce
Headers show
Series
  • [libcamera-devel,v3] utils: ipu3-pack: Provide a 10-bit bayer packing utility
Related show

Commit Message

Umang Jain July 13, 2022, 12:15 p.m. UTC
Provide a 10-bit bayer packing utility for the unpacked data produced
by ipu3-unpack.

	Usage: ipu3-unpack input-file output-file

The output-file can be "-" to pack the data to stdout.

The output file generated by ipu3-pack can be directly fed to IMGU
for streaming.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes in v3:
- Drop fflush() as stdout is per process not global
- Use sizeof () directly for bytes to read
- consistency of goto
---
 utils/ipu3/ipu3-pack.c | 101 +++++++++++++++++++++++++++++++++++++++++
 utils/ipu3/meson.build |   1 +
 2 files changed, 102 insertions(+)
 create mode 100644 utils/ipu3/ipu3-pack.c

Comments

Kieran Bingham July 15, 2022, 11:41 a.m. UTC | #1
Quoting Umang Jain via libcamera-devel (2022-07-13 13:15:34)
> Provide a 10-bit bayer packing utility for the unpacked data produced
> by ipu3-unpack.
> 
>         Usage: ipu3-unpack input-file output-file
> 
> The output-file can be "-" to pack the data to stdout.
> 
> The output file generated by ipu3-pack can be directly fed to IMGU
> for streaming.
> 
> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Seems useful to keep hold of to me.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
> Changes in v3:
> - Drop fflush() as stdout is per process not global
> - Use sizeof () directly for bytes to read
> - consistency of goto
> ---
>  utils/ipu3/ipu3-pack.c | 101 +++++++++++++++++++++++++++++++++++++++++
>  utils/ipu3/meson.build |   1 +
>  2 files changed, 102 insertions(+)
>  create mode 100644 utils/ipu3/ipu3-pack.c
> 
> diff --git a/utils/ipu3/ipu3-pack.c b/utils/ipu3/ipu3-pack.c
> new file mode 100644
> index 00000000..decbfc6c
> --- /dev/null
> +++ b/utils/ipu3/ipu3-pack.c
> @@ -0,0 +1,101 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * ipu3-pack - Convert unpacked RAW10 Bayer data to the IPU3 packed Bayer formats
> + *
> + * Copyright 2022 Umang Jain <umang.jain@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("Convert unpacked RAW10 Bayer data to the IPU3 packed Bayer formats\n");
> +       printf("If the output-file '-', output data will be written to standard output\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;
> +       }
> +
> +       if (strcmp(argv[2], "-") == 0) {
> +               out_fd = STDOUT_FILENO;
> +       } else {
> +               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));
> +                       close(in_fd);
> +                       return 1;
> +               }
> +       }
> +
> +       while (1) {
> +               uint16_t in_data[25];
> +               uint8_t out_data[32];
> +               unsigned int i;
> +
> +               ret = read(in_fd, in_data, sizeof(in_data));
> +               if (ret < 0) {
> +                       fprintf(stderr, "Failed to read input data: %s\n",
> +                               strerror(errno));
> +                       goto done;
> +               }
> +
> +               if ((unsigned)ret < sizeof(in_data)) {
> +                       if (ret != 0)
> +                               fprintf(stderr, "%u bytes of stray data at end of input\n",
> +                                       ret);
> +                       goto done;
> +               }
> +
> +               for (i = 0; i < 30; ++i) {
> +                       unsigned int index = (i * 8) / 10;
> +                       unsigned int msb_shift = (i * 8) % 10;
> +                       unsigned int lsb_shift = 10 - msb_shift;
> +
> +                       out_data[i] = ((in_data[index] >> msb_shift) & 0xff)
> +                                   | ((in_data[index+1] << lsb_shift) & 0xff);
> +               }
> +
> +               out_data[30] = (in_data[24] >> 0) & 0xff;
> +               out_data[31] = (in_data[24] >> 8) & 0x03;
> +
> +               ret = write(out_fd, out_data, sizeof(out_data));
> +               if (ret < 0) {
> +                       fprintf(stderr, "Failed to write output data: %s\n",
> +                               strerror(errno));
> +                       goto done;
> +               }
> +       }
> +
> +done:
> +       close(in_fd);
> +       if (out_fd != STDOUT_FILENO)
> +               close(out_fd);
> +
> +       return ret ? 1 : 0;
> +}
> diff --git a/utils/ipu3/meson.build b/utils/ipu3/meson.build
> index 88049f58..c92cc658 100644
> --- a/utils/ipu3/meson.build
> +++ b/utils/ipu3/meson.build
> @@ -1,3 +1,4 @@
>  # SPDX-License-Identifier: CC0-1.0
>  
> +ipu3_pack = executable('ipu3-pack', 'ipu3-pack.c')
>  ipu3_unpack = executable('ipu3-unpack', 'ipu3-unpack.c')
> -- 
> 2.31.1
>

Patch
diff mbox series

diff --git a/utils/ipu3/ipu3-pack.c b/utils/ipu3/ipu3-pack.c
new file mode 100644
index 00000000..decbfc6c
--- /dev/null
+++ b/utils/ipu3/ipu3-pack.c
@@ -0,0 +1,101 @@ 
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * ipu3-pack - Convert unpacked RAW10 Bayer data to the IPU3 packed Bayer formats
+ *
+ * Copyright 2022 Umang Jain <umang.jain@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("Convert unpacked RAW10 Bayer data to the IPU3 packed Bayer formats\n");
+	printf("If the output-file '-', output data will be written to standard output\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;
+	}
+
+	if (strcmp(argv[2], "-") == 0) {
+		out_fd = STDOUT_FILENO;
+	} else {
+		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));
+			close(in_fd);
+			return 1;
+		}
+	}
+
+	while (1) {
+		uint16_t in_data[25];
+		uint8_t out_data[32];
+		unsigned int i;
+
+		ret = read(in_fd, in_data, sizeof(in_data));
+		if (ret < 0) {
+			fprintf(stderr, "Failed to read input data: %s\n",
+				strerror(errno));
+			goto done;
+		}
+
+		if ((unsigned)ret < sizeof(in_data)) {
+			if (ret != 0)
+				fprintf(stderr, "%u bytes of stray data at end of input\n",
+					ret);
+			goto done;
+		}
+
+		for (i = 0; i < 30; ++i) {
+			unsigned int index = (i * 8) / 10;
+			unsigned int msb_shift = (i * 8) % 10;
+			unsigned int lsb_shift = 10 - msb_shift;
+
+			out_data[i] = ((in_data[index] >> msb_shift) & 0xff)
+				    | ((in_data[index+1] << lsb_shift) & 0xff);
+		}
+
+		out_data[30] = (in_data[24] >> 0) & 0xff;
+		out_data[31] = (in_data[24] >> 8) & 0x03;
+
+		ret = write(out_fd, out_data, sizeof(out_data));
+		if (ret < 0) {
+			fprintf(stderr, "Failed to write output data: %s\n",
+				strerror(errno));
+			goto done;
+		}
+	}
+
+done:
+	close(in_fd);
+	if (out_fd != STDOUT_FILENO)
+		close(out_fd);
+
+	return ret ? 1 : 0;
+}
diff --git a/utils/ipu3/meson.build b/utils/ipu3/meson.build
index 88049f58..c92cc658 100644
--- a/utils/ipu3/meson.build
+++ b/utils/ipu3/meson.build
@@ -1,3 +1,4 @@ 
 # SPDX-License-Identifier: CC0-1.0
 
+ipu3_pack = executable('ipu3-pack', 'ipu3-pack.c')
 ipu3_unpack = executable('ipu3-unpack', 'ipu3-unpack.c')