BufferQueue: fixed issues with buffer slots not available

Daniel Lam · Daniel Lam · commit c930cf3cf32d · 2012-03-07T14:15:34.000-08:00
Bug: 6120953
Change-Id: Ief43f042ee9e1512e86fff8632a1c9dd31bdff35
diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp
@@ -370,18 +370,13 @@ status_t BufferQueue::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h,
                 }
             }
 
-            // we're in synchronous mode and didn't find a buffer, we need to
-            // wait for some buffers to be consumed
-            tryAgain = mSynchronousMode && (foundSync == INVALID_BUFFER_SLOT);
+            // if no buffer is found, wait for a buffer to be released
+            tryAgain = found == INVALID_BUFFER_SLOT;
             if (tryAgain) {
                 mDequeueCondition.wait(mMutex);
             }
         }
 
-        if (mSynchronousMode && found == INVALID_BUFFER_SLOT) {
-            // foundSync guaranteed to be != INVALID_BUFFER_SLOT
-            found = foundSync;
-        }
 
         if (found == INVALID_BUFFER_SLOT) {
             // This should not happen.

Original file line number	Diff line number	Diff line change
`@@ -370,18 +370,13 @@ status_t BufferQueue::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h,`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`
`373`		`- // we're in synchronous mode and didn't find a buffer, we need to`
`374`		`- // wait for some buffers to be consumed`
`375`		`- tryAgain = mSynchronousMode && (foundSync == INVALID_BUFFER_SLOT);`
	`373`	`+ // if no buffer is found, wait for a buffer to be released`
	`374`	`+ tryAgain = found == INVALID_BUFFER_SLOT;`
`376`	`375`	`if (tryAgain) {`
`377`	`376`	`mDequeueCondition.wait(mMutex);`
`378`	`377`	`}`
`379`	`378`	`}`
`380`	`379`
`381`		`- if (mSynchronousMode && found == INVALID_BUFFER_SLOT) {`
`382`		`- // foundSync guaranteed to be != INVALID_BUFFER_SLOT`
`383`		`- found = foundSync;`
`384`		`- }`
`385`	`380`
`386`	`381`	`if (found == INVALID_BUFFER_SLOT) {`
`387`	`382`	`// This should not happen.`