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

am 0ba1a16b: am e60a0b1e: Merge "gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired" into klp-dev

Browse Source 
* commit '0ba1a16bbb2c7ea5f52691c062613a2309821354':
  gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired
This commit is contained in:
Igor Murashkin 2013-08-16 14:10:00 -07:00 committed by Android Git Automerger
commit 68322a366c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gui/CpuConsumer.h
View File

@ -90,7 +90,7 @@ class CpuConsumer : public ConsumerBase
// Gets the next graphics buffer from the producer and locks it for CPU use,
// filling out the passed-in locked buffer structure with the native pointer
// and metadata. Returns BAD_VALUE if no new buffer is available, and
// INVALID_OPERATION if the maximum number of buffers is already locked.
// NOT_ENOUGH_DATA if the maximum number of buffers is already locked.
//
// Only a fixed number of buffers can be locked at a time, determined by the
// construction-time maxLockedBuffers parameter. If INVALID_OPERATION is

4
libs/gui/CpuConsumer.cpp
View File

@ -72,7 +72,9 @@ status_t CpuConsumer::lockNextBuffer(LockedBuffer *nativeBuffer) {
if (!nativeBuffer) return BAD_VALUE;
if (mCurrentLockedBuffers == mMaxLockedBuffers) {
return INVALID_OPERATION;
CC_LOGW("Max buffers have been locked (%d), cannot lock anymore.",
mMaxLockedBuffers);
return NOT_ENOUGH_DATA;
}
BufferQueue::BufferItem b;