PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: camera: Validate Request before queueing it

Browse Source 
Extend the Request::prepare() operation to validate the request before
preparing it. Return an error if the request is invalid, which for now
is limited to ensuring that the request contains at least one buffer.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Jacopo Mondi
2019-04-09 20:41:40 +02:00
parent 571d16b539
commit e671485989
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libcamera/camera.cpp
View File

@@ -713,9 +713,14 @@ Request *Camera::createRequest()
* \brief Queue a request to the camera
* \param[in] request The request to queue to the camera
*
* This method queues a \a request allocated with createRequest() to the camera
* for capture. Once the request has been queued, the camera will notify its
* completion through the \ref requestCompleted signal.
* This method queues a \a request to the camera for capture.
*
* After allocating the request with createRequest(), the application shall
* fill it with at least one capture buffer before queuing it. Requests that
* contain no buffers are invalid and are rejected without being queued.
*
* Once the request has been queued, the camera will notify its completion
* through the \ref requestCompleted signal.
*
* Ownership of the request is transferred to the camera. It will be deleted
* automatically after it completes.

12
src/libcamera/request.cpp
View File

@@ -115,10 +115,20 @@ Buffer *Request::findBuffer(Stream *stream) const
*/
/**
* \brief Prepare the resources for the completion handler
* \brief Validate the request and prepare it for the completion handler
*
* Requests that contain no buffers are invalid and are rejected.
*
* \return 0 on success or a negative error code otherwise
* \retval -EINVAL The request is invalid
*/
int Request::prepare()
{
if (bufferMap_.empty()) {
LOG(Request, Error) << "Invalid request due to missing buffers";
return -EINVAL;
}
for (auto const &pair : bufferMap_) {
Buffer *buffer = pair.second;
pending_.insert(buffer);