NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

android: Rename CameraDevice::mutex_

Browse source 
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>
This commit is contained in:
Jacopo Mondi 2021-05-10 12:10:12 +02:00
parent 10b31904d8
commit 103dfb85a7
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/android/camera_device.cpp
View file

@ -2009,7 +2009,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
worker_.queueRequest(descriptor.request_.get()); worker_.queueRequest(descriptor.request_.get());
{ {
MutexLocker lock(mutex_); MutexLocker descriptorsLock(descriptorsMutex_);
descriptors_[descriptor.request_->cookie()] = std::move(descriptor); descriptors_[descriptor.request_->cookie()] = std::move(descriptor);
} }
@ -2020,7 +2020,7 @@ void CameraDevice::requestComplete(Request *request)
{ {
decltype(descriptors_)::node_type node; decltype(descriptors_)::node_type node;
{ {
MutexLocker lock(mutex_); MutexLocker descriptorsLock(descriptorsMutex_);
auto it = descriptors_.find(request->cookie()); auto it = descriptors_.find(request->cookie());
if (it == descriptors_.end()) { if (it == descriptors_.end()) {
/* /*

3
src/android/camera_device.h
View file

@ -24,6 +24,7 @@
#include "libcamera/internal/buffer.h" #include "libcamera/internal/buffer.h"
#include "libcamera/internal/log.h" #include "libcamera/internal/log.h"
#include "libcamera/internal/message.h" #include "libcamera/internal/message.h"
#include "libcamera/internal/thread.h"
#include "camera_metadata.h" #include "camera_metadata.h"
#include "camera_stream.h" #include "camera_stream.h"
@ -134,7 +135,7 @@ private:
std::map<int, libcamera::PixelFormat> formatsMap_; std::map<int, libcamera::PixelFormat> formatsMap_;
std::vector<CameraStream> streams_; std::vector<CameraStream> streams_;
std::mutex mutex_; /* Protect descriptors_ */ libcamera::Mutex descriptorsMutex_; /* Protects descriptors_. */
std::map<uint64_t, Camera3RequestDescriptor> descriptors_; std::map<uint64_t, Camera3RequestDescriptor> descriptors_;
std::string maker_; std::string maker_;