QCamera2: HAL3: Synchronize access to offline buffers
"mOfflineMetaBuffers" and "mOfflineBuffers" can be modified
by two threads at the same leading to crashes. To avoid this
serialize the access by using an additional mutex.
Bug: 64112147
Test: Camera CTS
Change-Id: I358a1412e944084d4a54f3cdd9aa4a7eb08e8a95
diff --git a/msm8998/QCamera2/HAL3/QCamera3Channel.cpp b/msm8998/QCamera2/HAL3/QCamera3Channel.cpp
index 6b30f3a..df0e84c 100644
--- a/msm8998/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3Channel.cpp
@@ -4646,6 +4646,7 @@
int32_t QCamera3ReprocessChannel::unmapOfflineBuffers(bool all)
{
int rc = NO_ERROR;
+ Mutex::Autolock l(mOfflineBuffersLock);
if (!mOfflineBuffers.empty()) {
QCamera3Stream *stream = NULL;
List<OfflineBuffer>::iterator it = mOfflineBuffers.begin();
@@ -5066,6 +5067,7 @@
frame->input_buffer.fd, frame->input_buffer.buffer,
frame->input_buffer.frame_len);
if (NO_ERROR == rc) {
+ Mutex::Autolock l(mOfflineBuffersLock);
mappedBuffer.index = buf_idx;
mappedBuffer.stream = pStream;
mappedBuffer.type = CAM_MAPPING_BUF_TYPE_OFFLINE_INPUT_BUF;
@@ -5086,6 +5088,7 @@
frame->metadata_buffer.fd, frame->metadata_buffer.buffer,
frame->metadata_buffer.frame_len);
if (NO_ERROR == rc) {
+ Mutex::Autolock l(mOfflineBuffersLock);
mappedBuffer.index = meta_buf_idx;
mappedBuffer.stream = pStream;
mappedBuffer.type = CAM_MAPPING_BUF_TYPE_OFFLINE_META_BUF;
diff --git a/msm8998/QCamera2/HAL3/QCamera3Channel.h b/msm8998/QCamera2/HAL3/QCamera3Channel.h
index 36182b9..4a8c358 100644
--- a/msm8998/QCamera2/HAL3/QCamera3Channel.h
+++ b/msm8998/QCamera2/HAL3/QCamera3Channel.h
@@ -664,6 +664,7 @@
} OfflineBuffer;
int32_t resetToCamPerfNormal(uint32_t frameNumber);
+ Mutex mOfflineBuffersLock; // Lock for offline buffers
android::List<OfflineBuffer> mOfflineBuffers;
android::List<OfflineBuffer> mOfflineMetaBuffers;
int32_t mOfflineBuffersIndex;