summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/pipeline/raspberrypi/raspberrypi.cpp38
1 files changed, 23 insertions, 15 deletions
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index 66b483f7..6fcdf557 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -1696,8 +1696,23 @@ bool RPiCameraData::findMatchingBuffers(FrameBuffer *&bayerBuffer, FrameBuffer *
}
if (!embeddedBuffer) {
+ bool flushedBuffers = false;
+
LOG(RPI, Debug) << "Could not find matching embedded buffer";
+ if (!embeddedQueue_.empty()) {
+ /*
+ * Not found a matching embedded buffer for the bayer buffer in
+ * the front of the queue. This buffer is now orphaned, so requeue
+ * it back to the device.
+ */
+ unicam_[Unicam::Image].queueBuffer(bayerQueue_.front());
+ bayerQueue_.pop();
+ bayerRequeueCount++;
+ LOG(RPI, Warning) << "Dropping unmatched input frame in stream "
+ << unicam_[Unicam::Image].name();
+ }
+
/*
* If we have requeued all available embedded data buffers in this loop,
* then we are fully out of sync, so might as well requeue all the pending
@@ -1712,21 +1727,10 @@ bool RPiCameraData::findMatchingBuffers(FrameBuffer *&bayerBuffer, FrameBuffer *
unicam_[Unicam::Image].queueBuffer(bayerQueue_.front());
bayerQueue_.pop();
}
- return false;
+ flushedBuffers = true;
}
/*
- * Not found a matching embedded buffer for the bayer buffer in
- * the front of the queue. This buffer is now orphaned, so requeue
- * it back to the device.
- */
- unicam_[Unicam::Image].queueBuffer(bayerQueue_.front());
- bayerQueue_.pop();
- bayerRequeueCount++;
- LOG(RPI, Warning) << "Dropping unmatched input frame in stream "
- << unicam_[Unicam::Image].name();
-
- /*
* Similar to the above, if we have requeued all available bayer buffers in
* the loop, then we are fully out of sync, so might as well requeue all the
* pending embedded data buffers.
@@ -1740,11 +1744,15 @@ bool RPiCameraData::findMatchingBuffers(FrameBuffer *&bayerBuffer, FrameBuffer *
unicam_[Unicam::Embedded].queueBuffer(embeddedQueue_.front());
embeddedQueue_.pop();
}
- return false;
+ flushedBuffers = true;
}
- /* If the embedded queue has become empty, we cannot do any more. */
- if (embeddedQueue_.empty())
+ /*
+ * If the embedded queue has become empty, we cannot do any more.
+ * Similarly, if we have flushed any one of our queues, we cannot do
+ * any more. Return from here without a buffer pair.
+ */
+ if (embeddedQueue_.empty() || flushedBuffers)
return false;
} else {
/*