diff options
author | Hirokazu Honda <hiroh@chromium.org> | 2021-12-01 16:53:38 +0900 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-12-01 13:46:39 +0200 |
commit | 3536473e06f9abe5027b25db3b97900bf474bccf (patch) | |
tree | bb35ef7b99d7b6616e4df85ba9bfc20738351e8c /src/android/camera_request.h | |
parent | 923cf7f40a7f1875874384b30a7c8dcb1f23467a (diff) |
android: Consolidate mutex classes to Mutex and MutexLocker
std::mutex and std::unique_lock are used in android directories,
mixing Mutex and MutexLocker. This consolidates them to Mutex
and MutexLocker.
Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/android/camera_request.h')
-rw-r--r-- | src/android/camera_request.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/android/camera_request.h b/src/android/camera_request.h index f3cb6d64..88d501a8 100644 --- a/src/android/camera_request.h +++ b/src/android/camera_request.h @@ -9,10 +9,10 @@ #include <map> #include <memory> -#include <mutex> #include <vector> #include <libcamera/base/class.h> +#include <libcamera/base/thread.h> #include <libcamera/camera.h> #include <libcamera/framebuffer.h> @@ -58,7 +58,7 @@ public: /* Keeps track of streams requiring post-processing. */ std::map<CameraStream *, StreamBuffer *> pendingStreamsToProcess_; - std::mutex streamsProcessMutex_; + libcamera::Mutex streamsProcessMutex_; Camera3RequestDescriptor(libcamera::Camera *camera, const camera3_capture_request_t *camera3Request); |