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

libcamera: pipeline_handler: Make queueRequest() void function

Browse source 
PipelineHandler::queueRequest() is asynchronously invoked in
Camera::queueRequest(). Therefore the return value of
PipelineHandler::queueRequest() is useless. This changes the
function to a void function.

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Hirokazu Honda 2021-03-29 09:27:13 +09:00 • committed by Laurent Pinchart
parent ef2213fdb6
commit cbb580d5af
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/libcamera/internal/pipeline_handler.h
View file

@ -81,7 +81,7 @@ public:
virtual int start(Camera *camera, const ControlList *controls) = 0; virtual int start(Camera *camera, const ControlList *controls) = 0;
virtual void stop(Camera *camera) = 0; virtual void stop(Camera *camera) = 0;
int queueRequest(Request *request); void queueRequest(Request *request);
bool completeBuffer(Request *request, FrameBuffer *buffer); bool completeBuffer(Request *request, FrameBuffer *buffer);
void completeRequest(Request *request); void completeRequest(Request *request);

4
src/libcamera/camera.cpp
View file

@ -1011,8 +1011,10 @@ int Camera::queueRequest(Request *request)
} }
} }
return d->pipe_->invokeMethod(&PipelineHandler::queueRequest, d->pipe_->invokeMethod(&PipelineHandler::queueRequest,
ConnectionTypeQueued, request); ConnectionTypeQueued, request);
return 0;
} }
/** /**

6
src/libcamera/pipeline_handler.cpp
View file

@ -371,10 +371,8 @@ const ControlList &PipelineHandler::properties(const Camera *camera) const
* signalled by the pipeline handler using the completeRequest() method. * signalled by the pipeline handler using the completeRequest() method.
* *
* \context This function is called from the CameraManager thread. * \context This function is called from the CameraManager thread.
*
* \return 0 on success or a negative error code otherwise
*/ */
int PipelineHandler::queueRequest(Request *request) void PipelineHandler::queueRequest(Request *request)
{ {
LIBCAMERA_TRACEPOINT(request_queue, request); LIBCAMERA_TRACEPOINT(request_queue, request);
@ -387,8 +385,6 @@ int PipelineHandler::queueRequest(Request *request)
int ret = queueRequestDevice(camera, request); int ret = queueRequestDevice(camera, request);
if (ret) if (ret)
data->queuedRequests_.remove(request); data->queuedRequests_.remove(request);
return ret;
} }
/** /**