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

android: Consolidate mutex classes to Mutex and MutexLocker

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

12
src/android/camera_stream.cpp
View file

@ -119,7 +119,7 @@ int CameraStream::configure()
if (type_ == Type::Internal) {
allocator_ = std::make_unique<FrameBufferAllocator>(cameraDevice_->camera());
mutex_ = std::make_unique<std::mutex>();
mutex_ = std::make_unique<Mutex>();
int ret = allocator_->allocate(stream());
if (ret < 0)
@ -208,7 +208,7 @@ FrameBuffer *CameraStream::getBuffer()
if (!allocator_)
return nullptr;
std::lock_guard<std::mutex> locker(*mutex_);
MutexLocker locker(*mutex_);
if (buffers_.empty()) {
LOG(HAL, Error) << "Buffer underrun";
@ -226,7 +226,7 @@ void CameraStream::putBuffer(FrameBuffer *buffer)
if (!allocator_)
return;
std::lock_guard<std::mutex> locker(*mutex_);
MutexLocker locker(*mutex_);
buffers_.push_back(buffer);
}
@ -239,7 +239,7 @@ CameraStream::PostProcessorWorker::PostProcessorWorker(PostProcessor *postProces
CameraStream::PostProcessorWorker::~PostProcessorWorker()
{
{
libcamera::MutexLocker lock(mutex_);
MutexLocker lock(mutex_);
state_ = State::Stopped;
}
@ -250,7 +250,7 @@ CameraStream::PostProcessorWorker::~PostProcessorWorker()
void CameraStream::PostProcessorWorker::start()
{
{
libcamera::MutexLocker lock(mutex_);
MutexLocker lock(mutex_);
ASSERT(state_ != State::Running);
state_ = State::Running;
}
@ -308,7 +308,7 @@ void CameraStream::PostProcessorWorker::run()
void CameraStream::PostProcessorWorker::flush()
{
libcamera::MutexLocker lock(mutex_);
MutexLocker lock(mutex_);
state_ = State::Flushing;
lock.unlock();