{"id":3653,"url":"https://patchwork.libcamera.org/api/patches/3653/?format=json","web_url":"https://patchwork.libcamera.org/patch/3653/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200501152745.437777-3-niklas.soderlund@ragnatech.se>","date":"2020-05-01T15:27:44","name":"[libcamera-devel,v2,2/3] qcam: Add DNGWriter","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"00211b14485911b376cd9e676c811846c3655f9d","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3653/mbox/","series":[{"id":867,"url":"https://patchwork.libcamera.org/api/series/867/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=867","date":"2020-05-01T15:27:42","name":"qcam: Add RAW capture support","version":2,"mbox":"https://patchwork.libcamera.org/series/867/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3653/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3653/checks/","tags":{},"headers":{"Return-Path":"","Received":["from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 95697614EF\n\tfor ;\n\tFri, 1 May 2020 17:28:06 +0200 (CEST)","from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de\n\t[79.202.35.146]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 5a093066-8bc0-11ea-aeed-005056917f90;\n\tFri, 01 May 2020 17:28:05 +0200 (CEST)"],"X-Halon-ID":"5a093066-8bc0-11ea-aeed-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 1 May 2020 17:27:44 +0200","Message-Id":"<20200501152745.437777-3-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.26.2","In-Reply-To":"<20200501152745.437777-1-niklas.soderlund@ragnatech.se>","References":"<20200501152745.437777-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 2/3] qcam: Add DNGWriter","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 01 May 2020 15:28:07 -0000"},"content":"Add an initial DNG file writer. The writer can only deal with a small\nset of pixelformats. The generated file consumable by standard tools.\nThe writer needs to be extended to write more metadata to the generated\nfile.\n\nThis change also makes libtiff-4 mandatory for qcam. In the future it\ncould be made an optional dependency and only enable DNG support if it's\navailable.\n\nSigned-off-by: Niklas Söderlund \n---\n src/qcam/dng_writer.cpp | 152 ++++++++++++++++++++++++++++++++++++++++\n src/qcam/dng_writer.h | 32 +++++++++\n src/qcam/meson.build | 9 ++-\n 3 files changed, 190 insertions(+), 3 deletions(-)\n create mode 100644 src/qcam/dng_writer.cpp\n create mode 100644 src/qcam/dng_writer.h","diff":"diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\nnew file mode 100644\nindex 0000000000000000..b58a6b9938992ed0\n--- /dev/null\n+++ b/src/qcam/dng_writer.cpp\n@@ -0,0 +1,152 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Raspberry Pi (Trading) Ltd.\n+ *\n+ * dng_writer.cpp - DNG writer\n+ */\n+\n+#include \"dng_writer.h\"\n+\n+#include \n+#include \n+#include \n+#include \n+\n+#include \n+\n+using namespace libcamera;\n+\n+struct FormatInfo {\n+\tuint8_t bitsPerSample;\n+\tuint8_t pattern[4]; /* R = 0, G = 1, B = 2 */\n+\tvoid (*packScanline)(void *, void *, unsigned int);\n+};\n+\n+void packScanlineSBGGR10P(void *output, void *input, unsigned int width)\n+{\n+\tuint8_t *in = static_cast(input);\n+\tuint8_t *out = static_cast(output);\n+\n+\t/* \\todo: Can this be made more efficient? */\n+\tfor (unsigned int i = 0; i < width; i += 4) {\n+\t\t*out++ = in[0];\n+\t\t*out++ = (in[4] & 0x03) << 6 | in[1] >> 2;\n+\t\t*out++ = (in[1] & 0x03) << 6 | (in[4] & 0x0c) << 2 | in[2] >> 4;\n+\t\t*out++ = (in[2] & 0x0f) << 4 | (in[4] & 0x30) >> 2 | in[3] >> 6;\n+\t\t*out++ = (in[3] & 0x3f) << 2 | (in[4] & 0xc0) >> 6;\n+\t\tin += 5;\n+\t}\n+}\n+\n+static const std::map formatInfo = {\n+\t{ PixelFormat(DRM_FORMAT_SBGGR10, MIPI_FORMAT_MOD_CSI2_PACKED), { 10, { 2, 1, 1, 0 }, packScanlineSBGGR10P } },\n+\t{ PixelFormat(DRM_FORMAT_SGBRG10, MIPI_FORMAT_MOD_CSI2_PACKED), { 10, { 1, 2, 0, 1 }, packScanlineSBGGR10P } },\n+\t{ PixelFormat(DRM_FORMAT_SGRBG10, MIPI_FORMAT_MOD_CSI2_PACKED), { 10, { 1, 0, 2, 1 }, packScanlineSBGGR10P } },\n+\t{ PixelFormat(DRM_FORMAT_SRGGB10, MIPI_FORMAT_MOD_CSI2_PACKED), { 10, { 0, 1, 1, 2 }, packScanlineSBGGR10P } },\n+};\n+\n+const FormatInfo *getFormatInfo(const PixelFormat &format)\n+{\n+\tconst auto it = formatInfo.find(format);\n+\tif (it == formatInfo.cend())\n+\t\treturn nullptr;\n+\n+\treturn &it->second;\n+\n+\treturn nullptr;\n+}\n+\n+DNGWriter::DNGWriter(const std::string &pattern)\n+\t: pattern_(pattern)\n+{\n+}\n+\n+int DNGWriter::write(const Camera *camera, const Stream *stream,\n+\t\t FrameBuffer *buffer, void *data)\n+{\n+\tconst StreamConfiguration &config = stream->configuration();\n+\n+\tconst FormatInfo *info = getFormatInfo(config.pixelFormat);\n+\tif (!info) {\n+\t\tstd::cerr << \"Unsupported pixel format\" << std::endl;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tuint8_t *scanline = new uint8_t[config.size.width * info->bitsPerSample];\n+\tif (!scanline) {\n+\t\tstd::cerr << \"Can't allocate memory for scanline\" << std::endl;\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tstd::string filename = genFilename(buffer->metadata());\n+\n+\tTIFF *tif = TIFFOpen(filename.c_str(), \"w\");\n+\tif (!tif) {\n+\t\tstd::cerr << \"Failed to open tiff file\" << std::endl;\n+\t\tdelete[] scanline;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tconst uint8_t version[] = \"\\01\\02\\00\\00\";\n+\tconst uint16_t cfa_repeatpatterndim[] = { 2, 2 };\n+\tTIFFSetField(tif, TIFFTAG_DNGVERSION, version);\n+\tTIFFSetField(tif, TIFFTAG_DNGBACKWARDVERSION, version);\n+\tTIFFSetField(tif, TIFFTAG_SUBFILETYPE, 0);\n+\tTIFFSetField(tif, TIFFTAG_IMAGEWIDTH, config.size.width);\n+\tTIFFSetField(tif, TIFFTAG_IMAGELENGTH, config.size.height);\n+\tTIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, info->bitsPerSample);\n+\tTIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);\n+\tTIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_CFA);\n+\tTIFFSetField(tif, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);\n+\tTIFFSetField(tif, TIFFTAG_MAKE, \"libcamera\");\n+\tTIFFSetField(tif, TIFFTAG_MODEL, camera->name().c_str());\n+\tTIFFSetField(tif, TIFFTAG_UNIQUECAMERAMODEL, camera->name().c_str());\n+\tTIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);\n+\tTIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1);\n+\tTIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);\n+\tTIFFSetField(tif, TIFFTAG_SOFTWARE, \"qcam\");\n+\tTIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);\n+\tTIFFSetField(tif, TIFFTAG_CFAREPEATPATTERNDIM, cfa_repeatpatterndim);\n+\tTIFFSetField(tif, TIFFTAG_CFAPATTERN, info->pattern);\n+\tTIFFSetField(tif, TIFFTAG_CFAPLANECOLOR, 3, \"\\00\\01\\02\");\n+\tTIFFSetField(tif, TIFFTAG_CFALAYOUT, 1);\n+\n+\t/* \\todo: Add more EXIF fields to output. */\n+\n+\t/* Write RAW content */\n+\tfor (unsigned int row = 0; row < config.size.height; row++) {\n+\t\tuint8_t *start =\n+\t\t\tstatic_cast(data) + config.stride * row;\n+\n+\t\tinfo->packScanline(scanline, start, config.size.width);\n+\n+\t\tif (TIFFWriteScanline(tif, scanline, row, 0) != 1) {\n+\t\t\tstd::cerr << \"Failed to write scanline\" << std::endl;\n+\t\t\tTIFFClose(tif);\n+\t\t\tdelete[] scanline;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n+\tTIFFWriteDirectory(tif);\n+\n+\tTIFFClose(tif);\n+\n+\tdelete[] scanline;\n+\n+\treturn 0;\n+}\n+\n+std::string DNGWriter::genFilename(const FrameMetadata &metadata)\n+{\n+\tstd::string filename = pattern_;\n+\n+\tsize_t pos = filename.find_first_of('#');\n+\tif (pos != std::string::npos) {\n+\t\tstd::stringstream ss;\n+\t\tss << std::setw(6) << std::setfill('0') << metadata.sequence;\n+\t\tfilename.replace(pos, 1, ss.str());\n+\t}\n+\n+\treturn filename;\n+}\ndiff --git a/src/qcam/dng_writer.h b/src/qcam/dng_writer.h\nnew file mode 100644\nindex 0000000000000000..c7ccbffd5db69dbe\n--- /dev/null\n+++ b/src/qcam/dng_writer.h\n@@ -0,0 +1,32 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Raspberry Pi (Trading) Ltd.\n+ *\n+ * dng_writer.h - DNG writer\n+ */\n+#ifndef __LIBCAMERA_DNG_WRITER_H__\n+#define __LIBCAMERA_DNG_WRITER_H__\n+\n+#include \n+\n+#include \n+#include \n+#include \n+\n+using namespace libcamera;\n+\n+class DNGWriter\n+{\n+public:\n+\tDNGWriter(const std::string &pattern = \"frame-#.dng\");\n+\n+\tint write(const Camera *camera, const Stream *stream,\n+\t\t FrameBuffer *buffer, void *data);\n+\n+private:\n+\tstd::string genFilename(const FrameMetadata &metadata);\n+\n+\tstd::string pattern_;\n+};\n+\n+#endif /* __LIBCAMERA_DNG_WRITER_H__ */\ndiff --git a/src/qcam/meson.build b/src/qcam/meson.build\nindex 895264be4a3388f4..8b9a35904facbce0 100644\n--- a/src/qcam/meson.build\n+++ b/src/qcam/meson.build\n@@ -1,9 +1,10 @@\n qcam_sources = files([\n+ '../cam/options.cpp',\n+ '../cam/stream_options.cpp',\n+ 'dng_writer.cpp',\n 'format_converter.cpp',\n 'main.cpp',\n 'main_window.cpp',\n- '../cam/options.cpp',\n- '../cam/stream_options.cpp',\n 'viewfinder.cpp',\n ])\n \n@@ -23,6 +24,8 @@ qt5_dep = dependency('qt5',\n required : false)\n \n if qt5_dep.found()\n+ tiff_dep = dependency('libtiff-4', required : true)\n+\n qt5_cpp_args = [ '-DQT_NO_KEYWORDS' ]\n \n # gcc 9 introduced a deprecated-copy warning that is triggered by Qt until\n@@ -40,6 +43,6 @@ if qt5_dep.found()\n \n qcam = executable('qcam', qcam_sources, resources,\n install : true,\n- dependencies : [libcamera_dep, qt5_dep],\n+ dependencies : [libcamera_dep, qt5_dep, tiff_dep],\n cpp_args : qt5_cpp_args)\n endif\n","prefixes":["libcamera-devel","v2","2/3"]}