summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-12-15 18:14:05 -0800
committerThe Android Automerger <android-build@android.com>2011-12-15 20:52:26 -0800
commit94180377e709ed0faff6ea94c75af0f0a1183b36 (patch)
tree19859b4ce1f24b9b4af5237f88c7babd35e189e8
parentce2ac73d1d0bc11aacc5fd9db88c5239df0bc512 (diff)
downloadbase-android-4.0.3_r1.tar.gz
SurfaceMediaSource: use the HW_TEXTURE usage bitandroid-4.0.3_r1
This change makes SurfaceMediaSource request Gralloc buffers with the HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a temporary workaround for what is likely a Gralloc bug. Bug: 5771063 Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
-rw-r--r--media/libstagefright/SurfaceMediaSource.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp
index 86b33d1c4fd1..38daf72f9104 100644
--- a/media/libstagefright/SurfaceMediaSource.cpp
+++ b/media/libstagefright/SurfaceMediaSource.cpp
@@ -336,7 +336,9 @@ status_t SurfaceMediaSource::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h,
(uint32_t(buffer->height) != h) ||
(uint32_t(buffer->format) != format) ||
((uint32_t(buffer->usage) & usage) != usage)) {
- usage |= GraphicBuffer::USAGE_HW_VIDEO_ENCODER;
+ // XXX: This will be changed to USAGE_HW_VIDEO_ENCODER once driver
+ // issues with that flag get fixed.
+ usage |= GraphicBuffer::USAGE_HW_TEXTURE;
status_t error;
sp<GraphicBuffer> graphicBuffer(
mGraphicBufferAlloc->createGraphicBuffer(