ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 05989772: am 3ed2736c: am b21a4e3b: ConsumerBase: free buffers outside the lock

Browse Source 
* commit '05989772d5b46cd5328e88d546f04deef39cc3c8':
  ConsumerBase: free buffers outside the lock
This commit is contained in:
Jamie Gennis 2012-12-06 23:24:25 -08:00 committed by Android Git Automerger
commit b5fe96b813
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libs/gui/ConsumerBase.cpp
View File

@ -109,21 +109,35 @@ void ConsumerBase::onFrameAvailable() {
}
void ConsumerBase::onBuffersReleased() {
Mutex::Autolock lock(mMutex);
sp<GraphicBuffer> bufRefs[BufferQueue::NUM_BUFFER_SLOTS];
CB_LOGV("onBuffersReleased");
{ // Scope for the lock
Mutex::Autolock lock(mMutex);
if (mAbandoned) {
// Nothing to do if we're already abandoned.
return;
CB_LOGV("onBuffersReleased");
if (mAbandoned) {
// Nothing to do if we're already abandoned.
return;
}
uint32_t mask = 0;
mBufferQueue->getReleasedBuffers(&mask);
for (int i = 0; i < BufferQueue::NUM_BUFFER_SLOTS; i++) {
if (mask & (1 << i)) {
// Grab a local reference to the buffers so that they don't
// get freed while the lock is held.
bufRefs[i] = mSlots[i].mGraphicBuffer;
freeBufferLocked(i);
}
}
}
uint32_t mask = 0;
mBufferQueue->getReleasedBuffers(&mask);
// Clear the local buffer references. This would happen automatically
// when the array gets dtor'd, but I'm doing it explicitly for clarity.
for (int i = 0; i < BufferQueue::NUM_BUFFER_SLOTS; i++) {
if (mask & (1 << i)) {
freeBufferLocked(i);
}
bufRefs[i].clear();
}
}