summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2019-11-21 20:12:38 +0100
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-01-12 16:10:37 +0100
commit5967363c0b99a59f3526c51917572b807324e389 (patch)
tree134a8e070813bca1dfbf72e10d4443e951757e8d /test
parentdea689e1f260b904697a9c2f3d05b7b5068d85e1 (diff)
libcamera: buffer: Move captured metadata to FrameMetadata
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>
Diffstat (limited to 'test')
-rw-r--r--test/camera/buffer_import.cpp2
-rw-r--r--test/camera/capture.cpp2
-rw-r--r--test/v4l2_videodevice/buffer_sharing.cpp8
3 files changed, 8 insertions, 4 deletions
diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp
index e5c010d8..3ba6ce96 100644
--- a/test/camera/buffer_import.cpp
+++ b/test/camera/buffer_import.cpp
@@ -275,7 +275,7 @@ public:
protected:
void bufferComplete(Request *request, Buffer *buffer)
{
- if (buffer->status() != Buffer::BufferSuccess)
+ if (buffer->metadata().status != FrameMetadata::FrameSuccess)
return;
unsigned int index = buffer->index();
diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp
index ca1ebe41..0d9ffc47 100644
--- a/test/camera/capture.cpp
+++ b/test/camera/capture.cpp
@@ -28,7 +28,7 @@ protected:
void bufferComplete(Request *request, Buffer *buffer)
{
- if (buffer->status() != Buffer::BufferSuccess)
+ if (buffer->metadata().status != FrameMetadata::FrameSuccess)
return;
completeBuffersCount_++;
diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp
index 3a56862c..fe48b2e9 100644
--- a/test/v4l2_videodevice/buffer_sharing.cpp
+++ b/test/v4l2_videodevice/buffer_sharing.cpp
@@ -92,9 +92,11 @@ protected:
void captureBufferReady(Buffer *buffer)
{
+ const FrameMetadata &metadata = buffer->metadata();
+
std::cout << "Received capture buffer" << std::endl;
- if (buffer->status() != Buffer::BufferSuccess)
+ if (metadata.status != FrameMetadata::FrameSuccess)
return;
output_->queueBuffer(buffer);
@@ -103,9 +105,11 @@ protected:
void outputBufferReady(Buffer *buffer)
{
+ const FrameMetadata &metadata = buffer->metadata();
+
std::cout << "Received output buffer" << std::endl;
- if (buffer->status() != Buffer::BufferSuccess)
+ if (metadata.status != FrameMetadata::FrameSuccess)
return;
capture_->queueBuffer(buffer);