From 5967363c0b99a59f3526c51917572b807324e389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>
Date: Thu, 21 Nov 2019 20:12:38 +0100
Subject: libcamera: buffer: Move captured metadata to FrameMetadata
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Move the metadata retrieved when dequeuing a V4L2 buffer into a
FrameMetadata object. This is done as a step to migrate to the
FrameBuffer interface as the functions added to Buffer around
FrameMetadata match the ones in FrameBuffer.
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
src/qcam/main_window.cpp | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
(limited to 'src/qcam')
diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp
index 8b3d9923..ca3464ba 100644
--- a/src/qcam/main_window.cpp
+++ b/src/qcam/main_window.cpp
@@ -259,14 +259,15 @@ void MainWindow::requestComplete(Request *request)
framesCaptured_++;
Buffer *buffer = buffers.begin()->second;
+ const FrameMetadata &metadata = buffer->metadata();
- double fps = buffer->timestamp() - lastBufferTime_;
+ double fps = metadata.timestamp - lastBufferTime_;
fps = lastBufferTime_ && fps ? 1000000000.0 / fps : 0.0;
- lastBufferTime_ = buffer->timestamp();
+ lastBufferTime_ = metadata.timestamp;
- std::cout << "seq: " << std::setw(6) << std::setfill('0') << buffer->sequence()
- << " bytesused: " << buffer->bytesused()
- << " timestamp: " << buffer->timestamp()
+ std::cout << "seq: " << std::setw(6) << std::setfill('0') << metadata.sequence
+ << " bytesused: " << metadata.planes[0].bytesused
+ << " timestamp: " << metadata.timestamp
<< " fps: " << std::fixed << std::setprecision(2) << fps
<< std::endl;
@@ -306,7 +307,7 @@ int MainWindow::display(Buffer *buffer)
plane.fd.fd(), 0);
unsigned char *raw = static_cast<unsigned char *>(memory);
- viewfinder_->display(raw, buffer->bytesused());
+ viewfinder_->display(raw, buffer->metadata().planes[0].bytesused);
munmap(memory, plane.length);
--
cgit v1.2.1