diff options
| author | Pannag Sanketi <psanketi@google.com> | 2011-06-24 09:56:27 -0700 |
|---|---|---|
| committer | Pannag Sanketi <psanketi@google.com> | 2011-06-30 15:41:19 -0700 |
| commit | c9ec69eb6f07881e1d0582156e5697eff69f5546 (patch) | |
| tree | e2f7e8aa3ace307cf0771c620b3abb6e137ef93f /libs/gui | |
| parent | c18e7e73158f794064fed5017c6c1c9a288673bd (diff) | |
| download | frameworks_base-c9ec69eb6f07881e1d0582156e5697eff69f5546.zip frameworks_base-c9ec69eb6f07881e1d0582156e5697eff69f5546.tar.gz frameworks_base-c9ec69eb6f07881e1d0582156e5697eff69f5546.tar.bz2 | |
Minor fix in SurfaceTexture
Change-Id: Ic859715becf3e6d5107bd8beb8c577034d00ec52
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/SurfaceTexture.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index 37e6d11..eef4a19 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -148,6 +148,11 @@ status_t SurfaceTexture::setBufferCount(int bufferCount) { LOGV("SurfaceTexture::setBufferCount"); Mutex::Autolock lock(mMutex); + if (bufferCount > NUM_BUFFER_SLOTS) { + LOGE("setBufferCount: bufferCount larger than slots available"); + return BAD_VALUE; + } + // Error out if the user has dequeued buffers for (int i=0 ; i<mBufferCount ; i++) { if (mSlots[i].mBufferState == BufferSlot::DEQUEUED) { @@ -208,7 +213,7 @@ status_t SurfaceTexture::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h, uint32_t format, uint32_t usage) { LOGV("SurfaceTexture::dequeueBuffer"); - if ((w && !h) || (!w & h)) { + if ((w && !h) || (!w && h)) { LOGE("dequeueBuffer: invalid size: w=%u, h=%u", w, h); return BAD_VALUE; } @@ -704,10 +709,10 @@ nsecs_t SurfaceTexture::getTimestamp() { } void SurfaceTexture::setFrameAvailableListener( - const sp<FrameAvailableListener>& l) { + const sp<FrameAvailableListener>& listener) { LOGV("SurfaceTexture::setFrameAvailableListener"); Mutex::Autolock lock(mMutex); - mFrameAvailableListener = l; + mFrameAvailableListener = listener; } sp<IBinder> SurfaceTexture::getAllocator() { |