commit aef47bf801dcbcb88cec8426c03237c6313da1c2
author Lajos Molnar <lajos@google.com> Fri Feb 12 15:44:48 2016 -0800
committer Lajos Molnar <lajos@google.com> Tue Feb 16 22:36:37 2016 -0800
tree 6530bda43c616208f9810472176aa70558f1aa48
parent a63141af8f036bda0b8f7800107ca8a0e0623135

stagefright: allow system property to signal native handle use

Bug: 26782004
Change-Id: I0ca38c25e2886ff260aec441e1d49048c38ff47c

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index 3e83f24..a8c55fa 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -29,6 +29,7 @@
 #include <OMX_AsString.h>
 
 #include <binder/IMemory.h>
+#include <cutils/properties.h>
 #include <gui/BufferQueue.h>
 #include <HardwareAPI.h>
 #include <media/stagefright/foundation/ADebug.h>
@@ -485,6 +486,17 @@
             mSecureBufferType[portIndex] =
                 enable ? kSecureBufferTypeNativeHandle : kSecureBufferTypeOpaque;
         } else if (mSecureBufferType[portIndex] == kSecureBufferTypeUnknown) {
+
+            // BEGIN ALTERNATE SIGNALING FOR USING NATIVE HANDLES
+            char value[PROPERTY_VALUE_MAX];
+            if (property_get("media.mediadrmservice.enable", value, NULL)
+                    && (!strcmp("1", value) || !strcasecmp("true", value))) {
+                CLOG_CONFIG(enableNativeBuffers, "system property override: using native-handles");
+                mSecureBufferType[portIndex] = kSecureBufferTypeNativeHandle;
+                return OK;
+            }
+            // END ALTERNATE SIGNALING FOR USING NATIVE HANDLES
+
             mSecureBufferType[portIndex] = kSecureBufferTypeOpaque;
         }
     }