[{"id":4725,"web_url":"https://patchwork.libcamera.org/comment/4725/","msgid":"<20200503005007.GA3012491@oden.dyn.berto.se>","date":"2020-05-03T00:50:07","subject":"Re: [libcamera-devel] [PATCH 1/5] qcam: Pass request metadata to\n\tDNG writer","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your work.\n\nOn 2020-05-03 01:57:00 +0300, Laurent Pinchart wrote:\n> The DNG writer will use the metadata to populate DNG tags.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\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(-)\n> \n> diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp\n> index 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);\n> diff --git a/src/qcam/dng_writer.h b/src/qcam/dng_writer.h\n> index 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> \n> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> index 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)\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index 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> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-lf1-x141.google.com (mail-lf1-x141.google.com\n\t[IPv6:2a00:1450:4864:20::141])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 04043603F1\n\tfor ;\n\tSun, 3 May 2020 02:50:10 +0200 (CEST)","by mail-lf1-x141.google.com with SMTP id z22so6546358lfd.0\n\tfor ;\n\tSat, 02 May 2020 17:50:09 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tm5sm4832597ljb.7.2020.05.02.17.50.07\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 02 May 2020 17:50:08 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com header.b=\"nZ2MhFAc\"; \n\tdkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=jvJNVnXezcxDlbkQNecZXop1Pq9qy0ZYafQBKFMCgFU=;\n\tb=nZ2MhFAc3kiKqkMtud+crhHZ5L3YFofVL1Uwlq2KMHNOQBW9upKZ0+gg/JgMIfZLDU\n\tPCz99MC6znEnsn5V1US97m2CK5eVHXQV4rUdX19kQllQTUdmRkJxqZnAUsiRAyoKav6F\n\tcQ3fP6jIEhEKKfZ8EtkFClUpJStbUQdeuOrJ0iLuQ2DZEWSH/y2fii0rtJ5dav69pI9G\n\tXfIXbqV35XZcqH5RMOWMmNoTW6VxOFNDMxdtRDe1+/Ba2tq1UDRvqVUES058KA9ExpIi\n\t9LuZ4nFnvye2YUku0F/g+utsl9wvIeMQyTg0U65iN1+21+SHe9bJTWMV1HlPIDTdAwok\n\ttjRw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=jvJNVnXezcxDlbkQNecZXop1Pq9qy0ZYafQBKFMCgFU=;\n\tb=KErDDx87oUqdvo18vZwTu4aRQRGIkM545cLpVrlEMxstWiasYXAPo2I9J+IbLPFOZf\n\tnlI02RTsZQULscmQkcBQG4Or7g/Oveo57r8SSav3jrBmt8zE/hpMAwNOuTJ9vzrxMjns\n\t0vqvrIeaMCQN8l3EAqVGF+OineP1IEOFLQhpgo3G9zsqx7ie33ZJFFQd310W1Haj4MlP\n\tyoUZpXliWkgUinzsvJFh3L9sg6E993ZhEpdCDiQVPpfIfDvnoWZVxJtqJSQEDlri44+F\n\tFHbOmQ/h0MotciTFcuDCP14jm0RGgCy5L049bKQM/dsLNdwnfsWvgwCIMbecD78jubch\n\t6lSQ==","X-Gm-Message-State":"AGi0PuZNs5tCm8J0/uuEfyDuS89CTKrocy35vBZ2lYG8BrX8gEwvJeKX\n\t8THsiS4/UuQlKxIruu3H9imGpzwC4K4=","X-Google-Smtp-Source":"APiQypLk+3LuIXJ4LxNCL624juuIFmiAXtr5+FLFt1BgX3dfyjIVZ5O5P5dekYY0xuYuYQBUbNMQ3A==","X-Received":"by 2002:a19:c3c5:: with SMTP id\n\tt188mr7228325lff.199.1588467009141; \n\tSat, 02 May 2020 17:50:09 -0700 (PDT)","Date":"Sun, 3 May 2020 02:50:07 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200503005007.GA3012491@oden.dyn.berto.se>","References":"<20200502225704.2911-1-laurent.pinchart@ideasonboard.com>\n\t<20200502225704.2911-2-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200502225704.2911-2-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 1/5] qcam: Pass request metadata to\n\tDNG writer","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":"Sun, 03 May 2020 00:50:10 -0000"}}]