media: Require property to be set to use QC AV enhancements

 * Because of the wild divergence between branches and the fragility
   of this interface, we will disable it by default even if the
   library is in place. After thorough testing for a device it
   can then be enabled. At this point, these enhancements bring
   little value except on the very latest hardware.

Change-Id: I99147a466bfbb020d05ffbb6c2773414f2439755

1 files changed, 7 insertions, 3 deletions

diff --git a/media/libavextensions/common/ExtensionsLoader.hpp b/media/libavextensions/common/ExtensionsLoader.hpp
index e03979c..48bcf3b 100644
--- a/media/libavextensions/common/ExtensionsLoader.hpp
+++ b/media/libavextensions/common/ExtensionsLoader.hpp
@@ -28,6 +28,7 @@
  */
 #include <dlfcn.h>
 #include <common/AVExtensionsCommon.h>
+#include <cutils/properties.h>
 
 namespace android {
 
@@ -52,9 +53,12 @@ T *ExtensionsLoader<T>::createInstance(const char *createFunctionName) {
         // create extended object if extensions-lib is available and
         // AV_ENHANCEMENTS is enabled
 #if ENABLE_AV_ENHANCEMENTS
-        createFunction_t createFunc = loadCreateFunction(createFunctionName);
-        if (createFunc) {
-            return reinterpret_cast<T *>((*createFunc)());
+        bool enabled = property_get_bool("media.avenhancements.enabled", false);
+        if (enabled) {
+            createFunction_t createFunc = loadCreateFunction(createFunctionName);
+            if (createFunc) {
+                return reinterpret_cast<T *>((*createFunc)());
+            }
         }
 #endif
         // Else, create the default object