Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't assert on unexpected surface flinger dequeue/enqueueBuffer errors, log a warning and ignore them instead."

Browse Source
This commit is contained in:
Andreas Huber
2010-09-07 14:17:49 -07:00
committed by Android (Google) Code Review
parent 2e8b36cc01 94e6b66237
commit babb35ed75
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/libstagefright/colorconversion/SoftwareRenderer.cpp
View File

@@ -106,7 +106,12 @@ static inline size_t ALIGN(size_t x, size_t alignment) {
void SoftwareRenderer::render(
const void *data, size_t size, void *platformPrivate) {
android_native_buffer_t *buf;
CHECK_EQ(0, mSurface->dequeueBuffer(mSurface.get(), &buf));
int err;
if ((err = mSurface->dequeueBuffer(mSurface.get(), &buf)) != 0) {
LOGW("Surface::dequeueBuffer returned error %d", err);
return;
}
CHECK_EQ(0, mSurface->lockBuffer(mSurface.get(), buf));
GraphicBufferMapper &mapper = GraphicBufferMapper::get();
@@ -186,7 +191,9 @@ void SoftwareRenderer::render(
CHECK_EQ(0, mapper.unlock(buf->handle));
CHECK_EQ(0, mSurface->queueBuffer(mSurface.get(), buf));
if ((err = mSurface->queueBuffer(mSurface.get(), buf)) != 0) {
LOGW("Surface::queueBuffer returned error %d", err);
}
buf = NULL;
}