commit 7e2f99569ae7d22307957abecc2e1818b4e7ab5e
author Dave Burke <daveburke@google.com> Thu Dec 15 19:25:07 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 15 19:25:07 2011 -0800
tree c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0
parent 3453bf678e3d0187015cdde1c9263299ea361726
parent 69aac3e6cd68e8c305a41b2677123db7662efd4b

am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1

* commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f':
  SurfaceMediaSource: use the HW_TEXTURE usage bit

media/libstagefright/SurfaceMediaSource.cpp

diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp
index 86b33d1..38daf72 100644
--- a/media/libstagefright/SurfaceMediaSource.cpp
+++ b/media/libstagefright/SurfaceMediaSource.cpp
@@ -336,7 +336,9 @@
         (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(