summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2021-10-27 18:34:46 +0200
committerJacopo Mondi <jacopo@jmondi.org>2021-12-11 17:53:40 +0100
commit7aef77130a7c7bb79823eec1f5509f95d96960b0 (patch)
treefa70a300e62f123a1c95eb759b25fe3185d5b1ef
parent3fb3c0d7912987ad514b2b7dec56060358d89ded (diff)
libcamera: pipeline_handler: Prepare Request
Before queueing a request to the device, any synchronization fence from the Request framebuffers has to be waited on. Connect the Request::Private::prepared signal to the function that queues requests to the hardware and call Request::Private::prepare(). When the waiting request queue is inspected, verify if it has completed its preparation phase and queue it to the device. Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/libcamera/pipeline_handler.cpp37
1 files changed, 29 insertions, 8 deletions
diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
index 92b5e3ab..0bc0e341 100644
--- a/src/libcamera/pipeline_handler.cpp
+++ b/src/libcamera/pipeline_handler.cpp
@@ -7,6 +7,7 @@
#include "libcamera/internal/pipeline_handler.h"
+#include <chrono>
#include <sys/sysmacros.h>
#include <libcamera/base/log.h>
@@ -18,6 +19,7 @@
#include "libcamera/internal/camera.h"
#include "libcamera/internal/device_enumerator.h"
+#include "libcamera/internal/framebuffer.h"
#include "libcamera/internal/media_device.h"
#include "libcamera/internal/request.h"
#include "libcamera/internal/tracepoints.h"
@@ -36,6 +38,8 @@
* the REGISTER_PIPELINE_HANDLER() macro.
*/
+using namespace std::chrono_literals;
+
namespace libcamera {
LOG_DEFINE_CATEGORY(Pipeline)
@@ -323,10 +327,16 @@ bool PipelineHandler::hasPendingRequests(const Camera *camera) const
* \param[in] request The request to queue
*
* This function queues a capture request to the pipeline handler for
- * processing. The request is first added to the internal list of queued
- * requests, and then passed to the pipeline handler with a call to
- * queueRequestDevice(). If the pipeline handler fails in queuing the request
- * to the hardware the request is cancelled.
+ * processing. The request is first added to the internal list of waiting
+ * requests which have to be prepared to make sure they are ready for being
+ * queued to the pipeline handler.
+ *
+ * The queue of waiting requests is iterated and all prepared requests are
+ * passed to the pipeline handler in the same order they have been queued by
+ * calling this function.
+ *
+ * If a Request fails during the preparation phase or if the pipeline handler
+ * fails in queuing the request to the hardware the request is cancelled.
*
* Keeping track of queued requests ensures automatic completion of all requests
* when the pipeline handler is stopped with stop(). Request completion shall be
@@ -339,7 +349,11 @@ void PipelineHandler::queueRequest(Request *request)
LIBCAMERA_TRACEPOINT(request_queue, request);
waitingRequests_.push(request);
- doQueueRequests();
+
+ request->_d()->prepared.connect(this, [this]() {
+ doQueueRequests();
+ });
+ request->_d()->prepare(300ms);
}
/**
@@ -355,6 +369,11 @@ void PipelineHandler::doQueueRequest(Request *request)
request->_d()->sequence_ = data->requestSequence_++;
+ if (request->_d()->cancelled_) {
+ completeRequest(request);
+ return;
+ }
+
int ret = queueRequestDevice(camera, request);
if (ret) {
request->_d()->cancel();
@@ -363,18 +382,20 @@ void PipelineHandler::doQueueRequest(Request *request)
}
/**
- * \brief Queue requests to the device
+ * \brief Queue prepared requests to the device
*
* Iterate the list of waiting requests and queue them to the device one
- * by one.
+ * by one if they have been prepared.
*/
void PipelineHandler::doQueueRequests()
{
while (!waitingRequests_.empty()) {
Request *request = waitingRequests_.front();
- waitingRequests_.pop();
+ if (!request->_d()->prepared_)
+ break;
doQueueRequest(request);
+ waitingRequests_.pop();
}
}