| commit | c7481bbeb35c8c64cf21e79794dafb615197dbf1 | [log] [tgz] |
|---|---|---|
| author | Stan Iliev <stani@google.com> | Fri Jul 17 15:04:29 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 17 15:04:29 2020 +0000 |
| tree | d1f9f9615a100b9705b9de8982ad346167d032c8 | |
| parent | a22cda2c3294c945ef21f602f256bab413bc72ba [diff] | |
| parent | df8a0739f7ab42ce59e2370867d26ed2793b6228 [diff] |
Fix TextureView calling eglCreateImage with a destructed buffer am: df8a0739f7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/12174650 Change-Id: I619eabbcbba87981e5acf99b16ebcf8b736c940e
diff --git a/libs/nativedisplay/include/surfacetexture/surface_texture_platform.h b/libs/nativedisplay/include/surfacetexture/surface_texture_platform.h index e2d036b..f371667 100644 --- a/libs/nativedisplay/include/surfacetexture/surface_texture_platform.h +++ b/libs/nativedisplay/include/surfacetexture/surface_texture_platform.h
@@ -79,6 +79,8 @@ /** * ASurfaceTexture_dequeueBuffer returns the next available AHardwareBuffer. + * The caller gets ownership of the buffer and need to release it with + * AHardwareBuffer_release. */ AHardwareBuffer* ASurfaceTexture_dequeueBuffer(ASurfaceTexture* st, int* outSlotid, android_dataspace* outDataspace,
diff --git a/libs/nativedisplay/surfacetexture/surface_texture.cpp b/libs/nativedisplay/surfacetexture/surface_texture.cpp index d1bcd8d..ebe4484 100644 --- a/libs/nativedisplay/surfacetexture/surface_texture.cpp +++ b/libs/nativedisplay/surfacetexture/surface_texture.cpp
@@ -208,7 +208,15 @@ *outNewContent = true; } } while (buffer.get() && (!queueEmpty)); - return reinterpret_cast<AHardwareBuffer*>(buffer.get()); + AHardwareBuffer* result = nullptr; + if (buffer.get()) { + result = buffer->toAHardwareBuffer(); + // add a reference to keep the hardware buffer alive, even if + // BufferQueueProducer is disconnected. This is needed, because + // sp reference is destroyed at the end of this function. + AHardwareBuffer_acquire(result); + } + return result; } } // namespace android