Patch Detail
Show a patch.
GET /api/1.1/patches/17619/?format=api
{ "id": 17619, "url": "https://patchwork.libcamera.org/api/1.1/patches/17619/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17619/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20221018080908.2841339-3-paul.elder@ideasonboard.com>", "date": "2022-10-18T08:09:07", "name": "[libcamera-devel,v2,2/3] cam: file_sink: Add support for DNG output", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1f01228cc56c5c28be9514a08f3ee6323119a46b", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17619/mbox/", "series": [ { "id": 3561, "url": "https://patchwork.libcamera.org/api/1.1/series/3561/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3561", "date": "2022-10-18T08:09:05", "name": "cam: Add DNG support", "version": 2, "mbox": "https://patchwork.libcamera.org/series/3561/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17619/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17619/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 81AC0C327C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 18 Oct 2022 08:09:22 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CC44C62E12;\n\tTue, 18 Oct 2022 10:09:21 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6194762E0A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 18 Oct 2022 10:09:20 +0200 (CEST)", "from pyrite.rasen.tech (h175-177-042-159.catv02.itscom.jp\n\t[175.177.42.159])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 24BD3A68;\n\tTue, 18 Oct 2022 10:09:18 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1666080561;\n\tbh=DBlqG7/FiHwNXatZq3+2Qd5CoqGENM/pQy/fIj+9zYw=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=jDyTGry7yZHQfxYRCRNZ6edvEWN24T/UTFiGzLAU1gPaGyNM1ogeR83YWtzMMLtTN\n\tNf6fjIALwEsAr2p5aa0H6gMg+F6ZcnUndJPXjffZkMUGXSw2+HbgdUUpVp99RlqqC+\n\tnayFSHYRZXMvONHrl9mtpHaoKrzFMRmS2EwMcCg9GYMICLXj3h38co0ZQMfTAFRk5j\n\t+rm49THF2++ciPiokaAFyNP9vc92BxpPp4T+iebgqeb6GXQBhClN1QCWyii+/Qy47+\n\tUjGsqHqLfl8po80iKwlNwL8p3Kt+OvncU+Luw8ZgJQ12kPuPMTffmgn4iN/Tq5LMqE\n\tDAAVIc83JF2Tg==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1666080560;\n\tbh=DBlqG7/FiHwNXatZq3+2Qd5CoqGENM/pQy/fIj+9zYw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=hDwFlRDeuBkZvRYKsM6BziDdZzgUuj5c1Q87bAbYDXbJSFTMd2jBFDs+thWR6hCjo\n\tlD4UO59Z9Nzc+tEIVWFQ7XY2p+HSCC+EYkvNx8/vcKIbAOIj1jCQtXvwDUK4GAPH+x\n\tMRMpDXB1Z4wh2iixuF9FGdWLF5fJpnoRWy6tO2SY=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"hDwFlRDe\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 18 Oct 2022 17:09:07 +0900", "Message-Id": "<20221018080908.2841339-3-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20221018080908.2841339-1-paul.elder@ideasonboard.com>", "References": "<20221018080908.2841339-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 2/3] cam: file_sink: Add support for\n\tDNG output", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Paul Elder via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Paul Elder <paul.elder@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add support for outputting buffers in DNG format. It reuses the DNG\nwriter that we had previously in qcam.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\n---\nChanges in v2:\n- update help test to mention the dng output feature\n- pass camera as first argument to FileSink constructor\n---\n src/cam/camera_session.cpp | 4 ++--\n src/cam/file_sink.cpp | 32 ++++++++++++++++++++++++++------\n src/cam/file_sink.h | 7 +++++--\n src/cam/main.cpp | 2 ++\n src/cam/meson.build | 8 ++++++++\n 5 files changed, 43 insertions(+), 10 deletions(-)", "diff": "diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 238186a3..6b409c98 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -207,10 +207,10 @@ int CameraSession::start()\n \n \tif (options_.isSet(OptFile)) {\n \t\tif (!options_[OptFile].toString().empty())\n-\t\t\tsink_ = std::make_unique<FileSink>(streamNames_,\n+\t\t\tsink_ = std::make_unique<FileSink>(camera_.get(), streamNames_,\n \t\t\t\t\t\t\t options_[OptFile]);\n \t\telse\n-\t\t\tsink_ = std::make_unique<FileSink>(streamNames_);\n+\t\t\tsink_ = std::make_unique<FileSink>(camera_.get(), streamNames_);\n \t}\n \n \tif (sink_) {\ndiff --git a/src/cam/file_sink.cpp b/src/cam/file_sink.cpp\nindex 45213d4a..8bba4e7f 100644\n--- a/src/cam/file_sink.cpp\n+++ b/src/cam/file_sink.cpp\n@@ -15,14 +15,16 @@\n \n #include <libcamera/camera.h>\n \n+#include \"dng_writer.h\"\n #include \"file_sink.h\"\n #include \"image.h\"\n \n using namespace libcamera;\n \n-FileSink::FileSink(const std::map<const libcamera::Stream *, std::string> &streamNames,\n+FileSink::FileSink(const libcamera::Camera *camera,\n+\t\t const std::map<const libcamera::Stream *, std::string> &streamNames,\n \t\t const std::string &pattern)\n-\t: streamNames_(streamNames), pattern_(pattern)\n+\t: camera_(camera), streamNames_(streamNames), pattern_(pattern)\n {\n }\n \n@@ -51,12 +53,13 @@ void FileSink::mapBuffer(FrameBuffer *buffer)\n bool FileSink::processRequest(Request *request)\n {\n \tfor (auto [stream, buffer] : request->buffers())\n-\t\twriteBuffer(stream, buffer);\n+\t\twriteBuffer(stream, buffer, request->metadata());\n \n \treturn true;\n }\n \n-void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer)\n+void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer,\n+\t\t\t [[maybe_unused]] const ControlList &metadata)\n {\n \tstd::string filename;\n \tsize_t pos;\n@@ -65,6 +68,10 @@ void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer)\n \tif (!pattern_.empty())\n \t\tfilename = pattern_;\n \n+#ifdef HAVE_TIFF\n+\tbool dng = filename.find(\".dng\", filename.size() - 4) != std::string::npos;\n+#endif /* HAVE_TIFF */\n+\n \tif (filename.empty() || filename.back() == '/')\n \t\tfilename += \"frame-#.bin\";\n \n@@ -76,6 +83,21 @@ void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer)\n \t\tfilename.replace(pos, 1, ss.str());\n \t}\n \n+\tImage *image = mappedBuffers_[buffer].get();\n+\n+#ifdef HAVE_TIFF\n+\tif (dng) {\n+\t\tret = DNGWriter::write(filename.c_str(), camera_,\n+\t\t\t\t stream->configuration(), metadata,\n+\t\t\t\t buffer, image->data(0).data());\n+\t\tif (ret < 0)\n+\t\t\tstd::cerr << \"failed to write DNG \" << filename\n+\t\t\t\t << std::endl;\n+\n+\t\treturn;\n+\t}\n+#endif /* HAVE_TIFF */\n+\n \tfd = open(filename.c_str(), O_CREAT | O_WRONLY |\n \t\t (pos == std::string::npos ? O_APPEND : O_TRUNC),\n \t\t S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);\n@@ -86,8 +108,6 @@ void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer)\n \t\treturn;\n \t}\n \n-\tImage *image = mappedBuffers_[buffer].get();\n-\n \tfor (unsigned int i = 0; i < buffer->planes().size(); ++i) {\n \t\tconst FrameMetadata::Plane &meta = buffer->metadata().planes()[i];\n \ndiff --git a/src/cam/file_sink.h b/src/cam/file_sink.h\nindex 067736f5..9ce8b619 100644\n--- a/src/cam/file_sink.h\n+++ b/src/cam/file_sink.h\n@@ -20,7 +20,8 @@ class Image;\n class FileSink : public FrameSink\n {\n public:\n-\tFileSink(const std::map<const libcamera::Stream *, std::string> &streamNames,\n+\tFileSink(const libcamera::Camera *camera,\n+\t\t const std::map<const libcamera::Stream *, std::string> &streamNames,\n \t\t const std::string &pattern = \"\");\n \t~FileSink();\n \n@@ -32,8 +33,10 @@ public:\n \n private:\n \tvoid writeBuffer(const libcamera::Stream *stream,\n-\t\t\t libcamera::FrameBuffer *buffer);\n+\t\t\t libcamera::FrameBuffer *buffer,\n+\t\t\t const libcamera::ControlList &metadata);\n \n+\tconst libcamera::Camera *camera_;\n \tstd::map<const libcamera::Stream *, std::string> streamNames_;\n \tstd::string pattern_;\n \tstd::map<libcamera::FrameBuffer *, std::unique_ptr<Image>> mappedBuffers_;\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 53c2ffde..c4e18a13 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -144,6 +144,8 @@ int CamApp::parseOptions(int argc, char *argv[])\n \t\t\t \"to write files, using the default file name. Otherwise it sets the\\n\"\n \t\t\t \"full file path and name. The first '#' character in the file name\\n\"\n \t\t\t \"is expanded to the camera index, stream name and frame sequence number.\\n\"\n+\t\t\t \"If the file name ends with '.dng', then the frame will be written to\\n\"\n+\t\t\t \"the output file(s) in DNG format.\\n\"\n \t\t\t \"The default file name is 'frame-#.bin'.\",\n \t\t\t \"file\", ArgumentOptional, \"filename\", false,\n \t\t\t OptCamera);\ndiff --git a/src/cam/meson.build b/src/cam/meson.build\nindex 9c766221..06dbea06 100644\n--- a/src/cam/meson.build\n+++ b/src/cam/meson.build\n@@ -52,6 +52,13 @@ if libsdl2.found()\n endif\n endif\n \n+if libtiff.found()\n+ cam_cpp_args += ['-DHAVE_TIFF']\n+ cam_sources += files([\n+ 'dng_writer.cpp',\n+ ])\n+endif\n+\n cam = executable('cam', cam_sources,\n dependencies : [\n libatomic,\n@@ -60,6 +67,7 @@ cam = executable('cam', cam_sources,\n libevent,\n libjpeg,\n libsdl2,\n+ libtiff,\n libyaml,\n ],\n cpp_args : cam_cpp_args,\n", "prefixes": [ "libcamera-devel", "v2", "2/3" ] }