From 61deb78a8a608955e120469ea7a5d39e652b2ae8 Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Fri, 22 Aug 2014 11:28:18 -0700 Subject: [PATCH] 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 --- services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp b/services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp index 50a2c10906..cc664592b2 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; } -- 2.11.0