Minor fix in SurfaceTexture
Change-Id: Ic859715becf3e6d5107bd8beb8c577034d00ec52
This commit is contained in:
parent
e709d94a29
commit
292a31a4c2
|
@ -141,7 +141,7 @@ public:
|
|||
|
||||
// setFrameAvailableListener sets the listener object that will be notified
|
||||
// when a new frame becomes available.
|
||||
void setFrameAvailableListener(const sp<FrameAvailableListener>& l);
|
||||
void setFrameAvailableListener(const sp<FrameAvailableListener>& listener);
|
||||
|
||||
// getAllocator retrieves the binder object that must be referenced as long
|
||||
// as the GraphicBuffers dequeued from this SurfaceTexture are referenced.
|
||||
|
@ -345,7 +345,7 @@ private:
|
|||
uint32_t mNextTransform;
|
||||
|
||||
// mTexName is the name of the OpenGL texture to which streamed images will
|
||||
// be bound when updateTexImage is called. It is set at construction time
|
||||
// be bound when updateTexImage is called. It is set at construction time
|
||||
// changed with a call to setTexName.
|
||||
const GLuint mTexName;
|
||||
|
||||
|
|
|
@ -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() {
|
||||
|
|
Loading…
Reference in New Issue