commit f42917964a76720932b23e67a05d034cd0cf346b
author Chong Zhang <chz@google.com> Tue Jul 28 17:56:36 2015 -0700
committer Chong Zhang <chz@google.com> Tue Jul 28 17:59:15 2015 -0700
tree 79937def38a4341e9eadf978a6265bb24839cff1
parent 70c1f74f3d4c43b67949f3e742195d60f4677462

add GRALLOC_USAGE_HW_COMPOSER flag to video usage bits

bug: 22657091
Change-Id: I6a11bc15bba34035ef31c2f4d41196ece60d4ad9

include/media/stagefright/ACodec.h

diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index 2ca3f1c..05f6786 100644
--- a/include/media/stagefright/ACodec.h
+++ b/include/media/stagefright/ACodec.h
@@ -145,6 +145,12 @@
         kFlagIsGrallocUsageProtected                  = 4,
     };
 
+    enum {
+        kVideoGrallocUsage = (GRALLOC_USAGE_HW_TEXTURE
+                            | GRALLOC_USAGE_HW_COMPOSER
+                            | GRALLOC_USAGE_EXTERNAL_DISP),
+    };
+
     struct BufferInfo {
         enum Status {
             OWNED_BY_US,

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 4e1f094..e904c49 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -668,8 +668,7 @@
         return err;
     }
 
-    int ignoredFlags = (GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_COMPOSER
-            | GRALLOC_USAGE_EXTERNAL_DISP);
+    int ignoredFlags = kVideoGrallocUsage;
     // New output surface is not allowed to add new usage flag except ignored ones.
     if ((usageBits & ~(mNativeWindowUsageBits | ignoredFlags)) != 0) {
         ALOGW("cannot change usage from %#x to %#x", mNativeWindowUsageBits, usageBits);
@@ -905,7 +904,7 @@
         usage |= GRALLOC_USAGE_PROTECTED;
     }
 
-    usage |= GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP;
+    usage |= kVideoGrallocUsage;
     *finalUsage = usage;
 
     ALOGV("gralloc usage: %#x(OMX) => %#x(ACodec)", omxUsage, usage);