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

am 64d8b190: CpuConsumer: Don\'t unlock buffers on producer disconnect

Browse Source 
* commit '64d8b1903e4b5f2838818eedcf4fef748b38709c':
  CpuConsumer: Don't unlock buffers on producer disconnect
This commit is contained in:
Eino-Ville Talvala 2013-03-01 01:53:30 +00:00 committed by Android Git Automerger
commit 12a6311c92
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/gui/CpuConsumer.h
View File

@ -92,7 +92,11 @@ class CpuConsumer: public ConsumerBase
// Array for tracking pointers passed to the consumer, matching the // Array for tracking pointers passed to the consumer, matching the
// mSlots indexing // mSlots indexing
void *mBufferPointers[BufferQueue::NUM_BUFFER_SLOTS]; struct LockedSlot {
sp<GraphicBuffer> mGraphicBuffer;
void *mBufferPointer;
} mLockedSlots[BufferQueue::NUM_BUFFER_SLOTS];
// Count of currently locked buffers // Count of currently locked buffers
uint32_t mCurrentLockedBuffers; uint32_t mCurrentLockedBuffers;

46
libs/gui/CpuConsumer.cpp
View File

@ -34,9 +34,8 @@ CpuConsumer::CpuConsumer(uint32_t maxLockedBuffers) :
mMaxLockedBuffers(maxLockedBuffers), mMaxLockedBuffers(maxLockedBuffers),
mCurrentLockedBuffers(0) mCurrentLockedBuffers(0)
{ {
for (size_t i=0; i < BufferQueue::NUM_BUFFER_SLOTS; i++) {
for (int i = 0; i < BufferQueue::NUM_BUFFER_SLOTS; i++) { mLockedSlots[i].mBufferPointer = NULL;
mBufferPointers[i] = NULL;
} }
mBufferQueue->setSynchronousMode(true); mBufferQueue->setSynchronousMode(true);
@ -45,6 +44,19 @@ CpuConsumer::CpuConsumer(uint32_t maxLockedBuffers) :
} }
CpuConsumer::~CpuConsumer() { CpuConsumer::~CpuConsumer() {
status_t err;
for (size_t i=0; i < BufferQueue::NUM_BUFFER_SLOTS; i++) {
if (mLockedSlots[i].mBufferPointer != NULL) {
mLockedSlots[i].mBufferPointer = NULL;
err = mLockedSlots[i].mGraphicBuffer->unlock();
mLockedSlots[i].mGraphicBuffer.clear();
if (err != OK) {
CC_LOGE("%s: Unable to unlock graphic buffer %d", __FUNCTION__,
i);
}
}
}
} }
void CpuConsumer::setName(const String8& name) { void CpuConsumer::setName(const String8& name) {
@ -86,18 +98,22 @@ status_t CpuConsumer::lockNextBuffer(LockedBuffer *nativeBuffer) {
} }
} }
void *bufferPointer = NULL;
err = mSlots[buf].mGraphicBuffer->lock( err = mSlots[buf].mGraphicBuffer->lock(
GraphicBuffer::USAGE_SW_READ_OFTEN, GraphicBuffer::USAGE_SW_READ_OFTEN,
b.mCrop, b.mCrop,
&mBufferPointers[buf]); &bufferPointer);
if (mBufferPointers[buf] != NULL && err != OK) { if (bufferPointer != NULL && err != OK) {
CC_LOGE("Unable to lock buffer for CPU reading: %s (%d)", strerror(-err), CC_LOGE("Unable to lock buffer for CPU reading: %s (%d)", strerror(-err),
err); err);
return err; return err;
} }
mLockedSlots[buf].mBufferPointer = bufferPointer;
mLockedSlots[buf].mGraphicBuffer = mSlots[buf].mGraphicBuffer;
nativeBuffer->data = reinterpret_cast<uint8_t*>(mBufferPointers[buf]); nativeBuffer->data =
reinterpret_cast<uint8_t*>(bufferPointer);
nativeBuffer->width = mSlots[buf].mGraphicBuffer->getWidth(); nativeBuffer->width = mSlots[buf].mGraphicBuffer->getWidth();
nativeBuffer->height = mSlots[buf].mGraphicBuffer->getHeight(); nativeBuffer->height = mSlots[buf].mGraphicBuffer->getHeight();
nativeBuffer->format = mSlots[buf].mGraphicBuffer->getPixelFormat(); nativeBuffer->format = mSlots[buf].mGraphicBuffer->getPixelFormat();
@ -121,15 +137,16 @@ status_t CpuConsumer::unlockBuffer(const LockedBuffer &nativeBuffer) {
void *bufPtr = reinterpret_cast<void *>(nativeBuffer.data); void *bufPtr = reinterpret_cast<void *>(nativeBuffer.data);
for (; slotIndex < BufferQueue::NUM_BUFFER_SLOTS; slotIndex++) { for (; slotIndex < BufferQueue::NUM_BUFFER_SLOTS; slotIndex++) {
if (bufPtr == mBufferPointers[slotIndex]) break; if (bufPtr == mLockedSlots[slotIndex].mBufferPointer) break;
} }
if (slotIndex == BufferQueue::NUM_BUFFER_SLOTS) { if (slotIndex == BufferQueue::NUM_BUFFER_SLOTS) {
CC_LOGE("%s: Can't find buffer to free", __FUNCTION__); CC_LOGE("%s: Can't find buffer to free", __FUNCTION__);
return BAD_VALUE; return BAD_VALUE;
} }
mBufferPointers[slotIndex] = NULL; mLockedSlots[slotIndex].mBufferPointer = NULL;
err = mSlots[slotIndex].mGraphicBuffer->unlock(); err = mLockedSlots[slotIndex].mGraphicBuffer->unlock();
mLockedSlots[slotIndex].mGraphicBuffer.clear();
if (err != OK) { if (err != OK) {
CC_LOGE("%s: Unable to unlock graphic buffer %d", __FUNCTION__, slotIndex); CC_LOGE("%s: Unable to unlock graphic buffer %d", __FUNCTION__, slotIndex);
return err; return err;
@ -142,17 +159,6 @@ status_t CpuConsumer::unlockBuffer(const LockedBuffer &nativeBuffer) {
} }
void CpuConsumer::freeBufferLocked(int slotIndex) { void CpuConsumer::freeBufferLocked(int slotIndex) {
if (mBufferPointers[slotIndex] != NULL) {
status_t err;
CC_LOGW("Buffer %d freed while locked by consumer", slotIndex);
mBufferPointers[slotIndex] = NULL;
err = mSlots[slotIndex].mGraphicBuffer->unlock();
if (err != OK) {
CC_LOGE("%s: Unable to unlock graphic buffer %d", __FUNCTION__,
slotIndex);
}
mCurrentLockedBuffers--;
}
ConsumerBase::freeBufferLocked(slotIndex); ConsumerBase::freeBufferLocked(slotIndex);
} }