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

libcamera: v4l2_videodevice: Signal buffer completion at streamoff time

Browse Source 
When stopping the stream buffers have been queued, in which case their
completion is never be notified to the user. This can lead to memory
leaks. Fix it by notifying completion of all queued buffers with the
status set to error.

As a result the base PipelineHandler implementation can be simplified,
as all requests complete as the result of stopping the stream. The
stop() method that manually completes all queued requests isn't needed
anymore.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart
2019-07-12 13:51:12 +03:00
parent a2bcf6feee
commit 4e79b2ef31
10 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/libcamera/pipeline_handler.cpp
View File

@@ -328,31 +328,7 @@ const ControlInfoMap &PipelineHandler::controls(Camera *camera)
*
* This method stops capturing and processing requests immediately. All pending
* requests are cancelled and complete immediately in an error state.
*
* Pipeline handlers shall override this method to stop the pipeline, ensure
* that all pending request completion signaled through completeRequest() have
* returned, and call the base implementation of the stop() method as the last
* step of their implementation. The base implementation cancels all requests
* queued but not yet complete.
*/
void PipelineHandler::stop(Camera *camera)
{
CameraData *data = cameraData(camera);
while (!data->queuedRequests_.empty()) {
Request *request = data->queuedRequests_.front();
data->queuedRequests_.pop_front();
while (!request->pending_.empty()) {
Buffer *buffer = *request->pending_.begin();
buffer->cancel();
completeBuffer(camera, request, buffer);
}
request->complete(Request::RequestCancelled);
camera->requestComplete(request);
}
}
/**
* \fn PipelineHandler::queueRequest()
@@ -420,15 +396,16 @@ bool PipelineHandler::completeBuffer(Camera *camera, Request *request,
*/
void PipelineHandler::completeRequest(Camera *camera, Request *request)
{
request->complete(Request::RequestComplete);
request->complete();
CameraData *data = cameraData(camera);
while (!data->queuedRequests_.empty()) {
request = data->queuedRequests_.front();
if (request->hasPendingBuffers())
if (request->status() == Request::RequestPending)
break;
ASSERT(!request->hasPendingBuffers());
data->queuedRequests_.pop_front();
camera->requestComplete(request);
}