summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2014-08-22 11:28:18 -0700
committerZhijun He <zhijunhe@google.com>2014-08-22 11:28:18 -0700
commit61deb78a8a608955e120469ea7a5d39e652b2ae8 (patch)
tree67000dee41e1feb40db3b70e606ab3fdc79bbd5c /services
parentfa1fc7086313f2f1868cae4c1a5698e592a437cb (diff)
downloadframeworks_av-61deb78a8a608955e120469ea7a5d39e652b2ae8.zip
frameworks_av-61deb78a8a608955e120469ea7a5d39e652b2ae8.tar.gz
frameworks_av-61deb78a8a608955e120469ea7a5d39e652b2ae8.tar.bz2
Camera API1: remove unnecessary buffer count check
This check doesn't work with ZSL use case. Since the ZSL is both an input and output stream, When an input buffer is acquired, checking the handout buffer count for that stream could trigger false alarm when all the output buffers are sent to hal, instead, we should wait for an output buffer to return. Bug: 17188380 Change-Id: I7eb166eb49d2f063189d993195ef389d2cf4f2b4
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp b/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp
index 50a2c10..cc66459 100644
--- a/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp
+++ b/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp
@@ -184,15 +184,6 @@ status_t Camera3IOStreamBase::getBufferPreconditionCheckLocked() const {
return INVALID_OPERATION;
}
- // Only limit dequeue amount when fully configured
- if (mState == STATE_CONFIGURED &&
- mHandoutTotalBufferCount == camera3_stream::max_buffers) {
- ALOGE("%s: Stream %d: Already dequeued maximum number of simultaneous"
- " buffers (%d)", __FUNCTION__, mId,
- camera3_stream::max_buffers);
- return INVALID_OPERATION;
- }
-
return OK;
}