commit c514e5467caa77730c40874ee72869c13c533647
author Emilian Peev <epeev@google.com> Mon Nov 19 01:54:14 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 19 01:54:14 2018 -0800
tree c233ca75c6625f7d33e05098e4ea50aec75eb412
parent 340d378c87ea9581b807286db78bcc627658a6ce
parent 20d6cbf0b16c5d7cf81d6f4d1cfe4c2e93720a13

Merge "Camera: Relax maximum Hal buffers and acquired count check" am: 6bff4d55bf am: a0f9adaf25
am: 20d6cbf0b1

Change-Id: I8e987a9324f24ce38846a628480d601367f147ae

services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp b/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
index 2b5debf..84c2ec7 100644
--- a/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
+++ b/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
@@ -257,6 +257,10 @@
     // Add new entry into mOutputs
     mOutputs[surfaceId] = gbp;
     mConsumerBufferCount[surfaceId] = maxConsumerBuffers;
+    if (mConsumerBufferCount[surfaceId] > mMaxHalBuffers) {
+        SP_LOGW("%s: Consumer buffer count %zu larger than max. Hal buffers: %zu", __FUNCTION__,
+                mConsumerBufferCount[surfaceId], mMaxHalBuffers);
+    }
     mNotifiers[gbp] = listener;
     mOutputSlots[gbp] = std::make_unique<OutputSlots>(totalBufferCount);
 
@@ -328,11 +332,7 @@
     }
 
     mNotifiers[gbp] = nullptr;
-    if (mConsumerBufferCount[surfaceId] < mMaxHalBuffers) {
-        mMaxConsumerBuffers -= mConsumerBufferCount[surfaceId];
-    } else {
-        SP_LOGE("%s: Cached consumer buffer count mismatch!", __FUNCTION__);
-    }
+    mMaxConsumerBuffers -= mConsumerBufferCount[surfaceId];
     mConsumerBufferCount[surfaceId] = 0;
 
     return res;