summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2021-05-10 12:10:12 +0200
committerJacopo Mondi <jacopo@jmondi.org>2021-06-14 12:26:28 +0200
commit103dfb85a7e12c00c1a41eef69f45faa8f5c7597 (patch)
treeb688a1008de7b49197eee270f7bbd6d5ac73483e
parent10b31904d821d2467f02eee9ad1acf433d3731f2 (diff)
android: Rename CameraDevice::mutex_
With the introduction of an additional mutex class member, the name of the existing one is too generic. Rename CameraDevice::mutex_ in CameraDevice::descriptorsMutex_ and use the libcamera provided libcamera::Mutex type to align the style with the rest of the code base. Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/android/camera_device.cpp4
-rw-r--r--src/android/camera_device.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index d3581c70..b29c1edc 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -2009,7 +2009,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
worker_.queueRequest(descriptor.request_.get());
{
- MutexLocker lock(mutex_);
+ MutexLocker descriptorsLock(descriptorsMutex_);
descriptors_[descriptor.request_->cookie()] = std::move(descriptor);
}
@@ -2020,7 +2020,7 @@ void CameraDevice::requestComplete(Request *request)
{
decltype(descriptors_)::node_type node;
{
- MutexLocker lock(mutex_);
+ MutexLocker descriptorsLock(descriptorsMutex_);
auto it = descriptors_.find(request->cookie());
if (it == descriptors_.end()) {
/*
diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index 117d829e..c949fa50 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -24,6 +24,7 @@
#include "libcamera/internal/buffer.h"
#include "libcamera/internal/log.h"
#include "libcamera/internal/message.h"
+#include "libcamera/internal/thread.h"
#include "camera_metadata.h"
#include "camera_stream.h"
@@ -134,7 +135,7 @@ private:
std::map<int, libcamera::PixelFormat> formatsMap_;
std::vector<CameraStream> streams_;
- std::mutex mutex_; /* Protect descriptors_ */
+ libcamera::Mutex descriptorsMutex_; /* Protects descriptors_. */
std::map<uint64_t, Camera3RequestDescriptor> descriptors_;
std::string maker_;