diff options
| author | Hirokazu Honda <hiroh@chromium.org> | 2021-03-29 09:27:13 +0900 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-04-03 04:05:57 +0300 |
| commit | cbb580d5afbe4bc5d4a0012fa977d89e8edb547d (patch) | |
| tree | e31f2dbe295dcccba9e2276632113c43aac1294c | |
| parent | ef2213fdb673bbc9b7ae9e62db83d6edaf824d5e (diff) | |
libcamera: pipeline_handler: Make queueRequest() void function
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>
| -rw-r--r-- | include/libcamera/internal/pipeline_handler.h | 2 | ||||
| -rw-r--r-- | src/libcamera/camera.cpp | 6 | ||||
| -rw-r--r-- | src/libcamera/pipeline_handler.cpp | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h index 9bdda8f3..c6454db6 100644 --- a/include/libcamera/internal/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -81,7 +81,7 @@ public: virtual int start(Camera *camera, const ControlList *controls) = 0; virtual void stop(Camera *camera) = 0; - int queueRequest(Request *request); + void queueRequest(Request *request); bool completeBuffer(Request *request, FrameBuffer *buffer); void completeRequest(Request *request); diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 45bbc354..763f3b99 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -1011,8 +1011,10 @@ int Camera::queueRequest(Request *request) } } - return d->pipe_->invokeMethod(&PipelineHandler::queueRequest, - ConnectionTypeQueued, request); + d->pipe_->invokeMethod(&PipelineHandler::queueRequest, + ConnectionTypeQueued, request); + + return 0; } /** diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index e3d4975d..433c05f6 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -371,10 +371,8 @@ const ControlList &PipelineHandler::properties(const Camera *camera) const * signalled by the pipeline handler using the completeRequest() method. * * \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); @@ -387,8 +385,6 @@ int PipelineHandler::queueRequest(Request *request) int ret = queueRequestDevice(camera, request); if (ret) data->queuedRequests_.remove(request); - - return ret; } /** |