diff options
| author | Jacopo Mondi <jacopo@jmondi.org> | 2021-05-10 12:10:12 +0200 |
|---|---|---|
| committer | Jacopo Mondi <jacopo@jmondi.org> | 2021-06-14 12:26:28 +0200 |
| commit | 103dfb85a7e12c00c1a41eef69f45faa8f5c7597 (patch) | |
| tree | b688a1008de7b49197eee270f7bbd6d5ac73483e /src/android/camera_device.h | |
| parent | 10b31904d821d2467f02eee9ad1acf433d3731f2 (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>
Diffstat (limited to 'src/android/camera_device.h')
| -rw-r--r-- | src/android/camera_device.h | 3 |
1 files changed, 2 insertions, 1 deletions
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_; |