{"id":3672,"url":"https://patchwork.libcamera.org/api/patches/3672/?format=json","web_url":"https://patchwork.libcamera.org/patch/3672/","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":"<20200502225704.2911-2-laurent.pinchart@ideasonboard.com>","date":"2020-05-02T22:57:00","name":"[libcamera-devel,1/5] qcam: Pass request metadata to DNG writer","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"328f885cbadc55fec19d7a501d6aa8019d45e518","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3672/mbox/","series":[{"id":874,"url":"https://patchwork.libcamera.org/api/series/874/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=874","date":"2020-05-02T22:56:59","name":"qcam: Improve DNG writer","version":1,"mbox":"https://patchwork.libcamera.org/series/874/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3672/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3672/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 278BA61618\n\tfor ;\n\tSun, 3 May 2020 00:57:11 +0200 (CEST)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B0A1072C\n\tfor ;\n\tSun, 3 May 2020 00:57:10 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"I9wiytJo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1588460230;\n\tbh=LFpeFFcYuEH8q6W395WuQPrsDgSAIsN2yempIkqWXeU=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=I9wiytJoFI1dDayO3CaIABnXNxaPGHFqquEnvvT11f/tuYEcaCYOJ1EM2a1V0mSUw\n\t6H/1mtALgG+2s5MSanknXc7RZAex514qwtPAlu2FKDl9a6QGaTH8sUq+z/+3QaajFY\n\t+gzIdt8SxR28aINIyaeVTJt0WJ34cIWinoRaqrks=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 3 May 2020 01:57:00 +0300","Message-Id":"<20200502225704.2911-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.25.3","In-Reply-To":"<20200502225704.2911-1-laurent.pinchart@ideasonboard.com>","References":"<20200502225704.2911-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 1/5] qcam: Pass request metadata to DNG\n\twriter","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":"Sat, 02 May 2020 22:57:11 -0000"},"content":"The DNG writer will use the metadata to populate DNG tags.\n\nSigned-off-by: Laurent Pinchart \n---\n src/qcam/dng_writer.cpp | 1 +\n src/qcam/dng_writer.h | 2 ++\n src/qcam/main_window.cpp | 18 +++++++++---------\n src/qcam/main_window.h | 22 ++++++++++++++++++++--\n 4 files changed, 32 insertions(+), 11 deletions(-)","diff":"diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\nindex 7d51965dc2ea..b1984c6647dd 100644\n--- a/src/qcam/dng_writer.cpp\n+++ b/src/qcam/dng_writer.cpp\n@@ -101,6 +101,7 @@ static const std::map formatInfo = {\n \n int DNGWriter::write(const char *filename, const Camera *camera,\n \t\t const StreamConfiguration &config,\n+\t\t const ControlList &metadata,\n \t\t const FrameBuffer *buffer, const void *data)\n {\n \tconst auto it = formatInfo.find(config.pixelFormat);\ndiff --git a/src/qcam/dng_writer.h b/src/qcam/dng_writer.h\nindex 88b218753a1a..d74d73d06a14 100644\n--- a/src/qcam/dng_writer.h\n+++ b/src/qcam/dng_writer.h\n@@ -12,6 +12,7 @@\n \n #include \n #include \n+#include \n #include \n \n using namespace libcamera;\n@@ -21,6 +22,7 @@ class DNGWriter\n public:\n \tstatic int write(const char *filename, const Camera *camera,\n \t\t\t const StreamConfiguration &config,\n+\t\t\t const ControlList &metadata,\n \t\t\t const FrameBuffer *buffer, const void *data);\n };\n \ndiff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex 8720c6c61f40..7de089571234 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -549,7 +549,7 @@ void MainWindow::captureRaw()\n \tcaptureRaw_ = true;\n }\n \n-void MainWindow::processRaw(FrameBuffer *buffer)\n+void MainWindow::processRaw(FrameBuffer *buffer, const ControlList &metadata)\n {\n #ifdef HAVE_DNG\n \tQString defaultPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);\n@@ -559,7 +559,7 @@ void MainWindow::processRaw(FrameBuffer *buffer)\n \tif (!filename.isEmpty()) {\n \t\tconst MappedBuffer &mapped = mappedBuffers_[buffer];\n \t\tDNGWriter::write(filename.toStdString().c_str(), camera_.get(),\n-\t\t\t\t rawStream_->configuration(), buffer,\n+\t\t\t\t rawStream_->configuration(), metadata, buffer,\n \t\t\t\t mapped.memory);\n \t}\n #endif\n@@ -586,7 +586,7 @@ void MainWindow::requestComplete(Request *request)\n \t */\n \t{\n \t\tQMutexLocker locker(&mutex_);\n-\t\tdoneQueue_.enqueue(request->buffers());\n+\t\tdoneQueue_.enqueue({ request->buffers(), request->metadata() });\n \t}\n \n \tQCoreApplication::postEvent(this, new CaptureEvent);\n@@ -599,22 +599,22 @@ void MainWindow::processCapture()\n \t * if stopCapture() has been called while a CaptureEvent was posted but\n \t * not processed yet. Return immediately in that case.\n \t */\n-\tstd::map buffers;\n+\tCaptureRequest request;\n \n \t{\n \t\tQMutexLocker locker(&mutex_);\n \t\tif (doneQueue_.isEmpty())\n \t\t\treturn;\n \n-\t\tbuffers = doneQueue_.dequeue();\n+\t\trequest = doneQueue_.dequeue();\n \t}\n \n \t/* Process buffers. */\n-\tif (buffers.count(vfStream_))\n-\t\tprocessViewfinder(buffers[vfStream_]);\n+\tif (request.buffers_.count(vfStream_))\n+\t\tprocessViewfinder(request.buffers_[vfStream_]);\n \n-\tif (buffers.count(rawStream_))\n-\t\tprocessRaw(buffers[rawStream_]);\n+\tif (request.buffers_.count(rawStream_))\n+\t\tprocessRaw(request.buffers_[rawStream_], request.metadata_);\n }\n \n void MainWindow::processViewfinder(FrameBuffer *buffer)\ndiff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\nindex 295ecc537e9d..59fa2d985655 100644\n--- a/src/qcam/main_window.h\n+++ b/src/qcam/main_window.h\n@@ -20,6 +20,7 @@\n #include \n #include \n #include \n+#include \n #include \n #include \n \n@@ -37,6 +38,23 @@ enum {\n \tOptStream = 's',\n };\n \n+class CaptureRequest\n+{\n+public:\n+\tCaptureRequest()\n+\t{\n+\t}\n+\n+\tCaptureRequest(const std::map &buffers,\n+\t\t const ControlList &metadata)\n+\t\t: buffers_(buffers), metadata_(metadata)\n+\t{\n+\t}\n+\n+\tstd::map buffers_;\n+\tControlList metadata_;\n+};\n+\n class MainWindow : public QMainWindow\n {\n \tQ_OBJECT\n@@ -56,7 +74,7 @@ private Q_SLOTS:\n \n \tvoid saveImageAs();\n \tvoid captureRaw();\n-\tvoid processRaw(FrameBuffer *buffer);\n+\tvoid processRaw(FrameBuffer *buffer, const ControlList &metadata);\n \n \tvoid queueRequest(FrameBuffer *buffer);\n \n@@ -103,7 +121,7 @@ private:\n \tStream *vfStream_;\n \tStream *rawStream_;\n \tstd::map> freeBuffers_;\n-\tQQueue> doneQueue_;\n+\tQQueue doneQueue_;\n \tQMutex mutex_; /* Protects freeBuffers_ and doneQueue_ */\n \n \tuint64_t lastBufferTime_;\n","prefixes":["libcamera-devel","1/5"]}