commit 32816e05ce436aee937e72b2248f107bc4a4542b
author Eino-Ville Talvala <etalvala@google.com> Thu Jul 20 17:37:42 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 20 17:37:42 2017 +0000
tree e922d3e71e3430ec94dffb31d939580502b39865
parent 6e7b7ad377748ad7f5c65c4e3bce3e93d248bd4a
parent 0b3fcb04b75783f8e4060fb4c1e7b3efef4a690e

Merge "Increase frame timeouts to allow for longer exposures" into oc-dr1-dev

msm8998/QCamera2/HAL3/QCamera3Channel.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3Channel.cpp b/msm8998/QCamera2/HAL3/QCamera3Channel.cpp
index 5975e2e..47b84e6 100644
--- a/msm8998/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3Channel.cpp
@@ -3884,7 +3884,15 @@
 void QCamera3PicChannel::putStreamBufs()
 {
     QCamera3ProcessingChannel::putStreamBufs();
+    Mutex::Autolock lock(mFreeBuffersLock);
     mFreeBufferList.clear();
+
+    if (nullptr != mYuvMemory) {
+        uint32_t count = mYuvMemory->getCnt();
+        for (uint32_t i = 0; i < count; i++) {
+            mFreeBufferList.push_back(i);
+        }
+    }
 }
 
 int32_t QCamera3PicChannel::queueJpegSetting(uint32_t index, metadata_buffer_t *metadata)