Merge "BufferQueue: fixed issues with buffer slots not available"

Jamie Gennis · Android (Google) Code Review · commit ac3c33745f1a · 2012-03-07T15:48:11.000-08:00
diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp
@@ -371,18 +371,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
`@@ -371,18 +371,13 @@ status_t BufferQueue::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h,`
`371`	`371`	`}`
`372`	`372`	`}`
`373`	`373`
`374`		`- // we're in synchronous mode and didn't find a buffer, we need to`
`375`		`- // wait for some buffers to be consumed`
`376`		`- tryAgain = mSynchronousMode && (foundSync == INVALID_BUFFER_SLOT);`
	`374`	`+ // if no buffer is found, wait for a buffer to be released`
	`375`	`+ tryAgain = found == INVALID_BUFFER_SLOT;`
`377`	`376`	`if (tryAgain) {`
`378`	`377`	`mDequeueCondition.wait(mMutex);`
`379`	`378`	`}`
`380`	`379`	`}`
`381`	`380`
`382`		`- if (mSynchronousMode && found == INVALID_BUFFER_SLOT) {`
`383`		`- // foundSync guaranteed to be != INVALID_BUFFER_SLOT`
`384`		`- found = foundSync;`
`385`		`- }`
`386`	`381`
`387`	`382`	`if (found == INVALID_BUFFER_SLOT) {`
`388`	`383`	`// This should not happen.`