NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: pipeline_handler: Prepare Request

Browse source 
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>
This commit is contained in:
Jacopo Mondi 2021-10-27 18:34:46 +02:00
parent 3fb3c0d791
commit 7aef77130a
1 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/libcamera/pipeline_handler.cpp
View file

@ -7,6 +7,7 @@
#include "libcamera/internal/pipeline_handler.h" #include "libcamera/internal/pipeline_handler.h"
#include <chrono>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#include <libcamera/base/log.h> #include <libcamera/base/log.h>
@ -18,6 +19,7 @@
#include "libcamera/internal/camera.h" #include "libcamera/internal/camera.h"
#include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/device_enumerator.h"
#include "libcamera/internal/framebuffer.h"
#include "libcamera/internal/media_device.h" #include "libcamera/internal/media_device.h"
#include "libcamera/internal/request.h" #include "libcamera/internal/request.h"
#include "libcamera/internal/tracepoints.h" #include "libcamera/internal/tracepoints.h"
@ -36,6 +38,8 @@
* the REGISTER_PIPELINE_HANDLER() macro. * the REGISTER_PIPELINE_HANDLER() macro.
*/ */
using namespace std::chrono_literals;
namespace libcamera { namespace libcamera {
LOG_DEFINE_CATEGORY(Pipeline) LOG_DEFINE_CATEGORY(Pipeline)
@ -323,10 +327,16 @@ bool PipelineHandler::hasPendingRequests(const Camera *camera) const
* \param[in] request The request to queue * \param[in] request The request to queue
* *
* This function queues a capture request to the pipeline handler for * This function queues a capture request to the pipeline handler for
* processing. The request is first added to the internal list of queued * processing. The request is first added to the internal list of waiting
* requests, and then passed to the pipeline handler with a call to * requests which have to be prepared to make sure they are ready for being
* queueRequestDevice(). If the pipeline handler fails in queuing the request * queued to the pipeline handler.
* to the hardware the request is cancelled. *
* 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 * Keeping track of queued requests ensures automatic completion of all requests
* when the pipeline handler is stopped with stop(). Request completion shall be * 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); LIBCAMERA_TRACEPOINT(request_queue, request);
waitingRequests_.push(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_++; request->_d()->sequence_ = data->requestSequence_++;
if (request->_d()->cancelled_) {
completeRequest(request);
return;
}
int ret = queueRequestDevice(camera, request); int ret = queueRequestDevice(camera, request);
if (ret) { if (ret) {
request->_d()->cancel(); 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 * 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() void PipelineHandler::doQueueRequests()
{ {
while (!waitingRequests_.empty()) { while (!waitingRequests_.empty()) {
Request *request = waitingRequests_.front(); Request *request = waitingRequests_.front();
waitingRequests_.pop(); if (!request->_d()->prepared_)
break;
doQueueRequest(request); doQueueRequest(request);
waitingRequests_.pop();
} }
} }