diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-06-13 16:29:51 -0700 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2012-06-21 16:54:43 -0700 |
| commit | 1e5b2b3361ddd07259bf4b29820ca4aa5f3a861b (patch) | |
| tree | 75bbec756f6a14bdcbd0d8100a2af5ca25d95074 /media/libstagefright/colorconversion | |
| parent | 95e6e6efcac831874b3d08947d1751d8f65503f9 (diff) | |
| download | frameworks_av-1e5b2b3361ddd07259bf4b29820ca4aa5f3a861b.zip frameworks_av-1e5b2b3361ddd07259bf4b29820ca4aa5f3a861b.tar.gz frameworks_av-1e5b2b3361ddd07259bf4b29820ca4aa5f3a861b.tar.bz2 | |
Update ANativeWindow client code for sync
This change updates all the uses of ANativeWindow to use the new ANW functions
that accept and return Sync HAL fence file descriptors.
Change-Id: Id7db42d8d6380f8b440d88476ce9211c6225fb16
Diffstat (limited to 'media/libstagefright/colorconversion')
| -rw-r--r-- | media/libstagefright/colorconversion/SoftwareRenderer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp index 8673bad..2704a37 100644 --- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp +++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp @@ -141,13 +141,12 @@ void SoftwareRenderer::render( const void *data, size_t size, void *platformPrivate) { ANativeWindowBuffer *buf; int err; - if ((err = mNativeWindow->dequeueBuffer(mNativeWindow.get(), &buf)) != 0) { + if ((err = native_window_dequeue_buffer_and_wait(mNativeWindow.get(), + &buf)) != 0) { ALOGW("Surface::dequeueBuffer returned error %d", err); return; } - CHECK_EQ(0, mNativeWindow->lockBuffer(mNativeWindow.get(), buf)); - GraphicBufferMapper &mapper = GraphicBufferMapper::get(); Rect bounds(mCropWidth, mCropHeight); @@ -231,7 +230,8 @@ void SoftwareRenderer::render( CHECK_EQ(0, mapper.unlock(buf->handle)); - if ((err = mNativeWindow->queueBuffer(mNativeWindow.get(), buf)) != 0) { + if ((err = mNativeWindow->queueBuffer(mNativeWindow.get(), buf, + -1)) != 0) { ALOGW("Surface::queueBuffer returned error %d", err); } buf = NULL; |