commit 20d6cbf0b16c5d7cf81d6f4d1cfe4c2e93720a13
author Emilian Peev <epeev@google.com> Mon Nov 19 01:49:15 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 19 01:49:15 2018 -0800
tree 6b485d294d7e9030b54ac652285a62f875288d4b
parent 644bdbcbcf6578825d50244e402a487d01112c5c
parent a0f9adaf25f1a1a75a32aa1f0843f44ea904c159

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

Change-Id: I96b594a7ae6151425aa6c6429ec31ad8db516ba0

services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp b/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
index 6d08842..ecb980a 100644
--- a/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
+++ b/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
@@ -253,6 +253,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);
 
@@ -324,11 +328,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;