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>
This commit is contained in:
Hirokazu Honda 2021-12-01 16:53:38 +09:00 committed by Laurent Pinchart
parent 923cf7f40a
commit 3536473e06
5 changed files with 11 additions and 16 deletions

View file

@ -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);