resolved conflicts for merge of c66d53f9 to eclair-mr2

1 files changed, 29 insertions, 21 deletions

diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp
index e361018..5b3cc1b 100644
--- a/media/libstagefright/omx/OMX.cpp
+++ b/media/libstagefright/omx/OMX.cpp
@@ -24,9 +24,7 @@
 #include "pv_omxcore.h"
 
 #include "../include/OMXNodeInstance.h"
-#include "../include/QComHardwareRenderer.h"
 #include "../include/SoftwareRenderer.h"
-#include "../include/TIHardwareRenderer.h"
 
 #include <binder/IMemory.h>
 #include <media/stagefright/MediaDebug.h>
@@ -431,27 +429,37 @@ sp<IOMXRenderer> OMX::createRenderer(
         OMX_COLOR_FORMATTYPE colorFormat,
         size_t encodedWidth, size_t encodedHeight,
         size_t displayWidth, size_t displayHeight) {
+    Mutex::Autolock autoLock(mLock);
+
     VideoRenderer *impl = NULL;
 
-    static const int OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00;
-
-    if (colorFormat == OMX_QCOM_COLOR_FormatYVU420SemiPlanar
-        && !strncmp(componentName, "OMX.qcom.video.decoder.", 23)) {
-        LOGW("Using QComHardwareRenderer.");
-        impl =
-            new QComHardwareRenderer(
-                    surface,
-                    displayWidth, displayHeight,
-                    encodedWidth, encodedHeight);
-    } else if (colorFormat == OMX_COLOR_FormatCbYCrY
-            && !strcmp(componentName, "OMX.TI.Video.Decoder")) {
-        LOGW("Using TIHardwareRenderer.");
-        impl =
-            new TIHardwareRenderer(
-                    surface,
-                    displayWidth, displayHeight,
-                    encodedWidth, encodedHeight);
-    } else {
+    static void *libHandle = NULL;
+
+    if (!libHandle) {
+        libHandle = dlopen("libstagefrighthw.so", RTLD_NOW);
+    }
+
+    if (libHandle) {
+        typedef VideoRenderer *(*CreateRendererFunc)(
+                const sp<ISurface> &surface,
+                const char *componentName,
+                OMX_COLOR_FORMATTYPE colorFormat,
+                size_t displayWidth, size_t displayHeight,
+                size_t decodedWidth, size_t decodedHeight);
+
+        CreateRendererFunc func =
+            (CreateRendererFunc)dlsym(
+                    libHandle,
+                    "_Z14createRendererRKN7android2spINS_8ISurfaceEEEPKc20"
+                    "OMX_COLOR_FORMATTYPEjjjj");
+
+        if (func) {
+            impl = (*func)(surface, componentName, colorFormat,
+                    displayWidth, displayHeight, encodedWidth, encodedHeight);
+        }
+    }
+
+    if (!impl) {
         LOGW("Using software renderer.");
         impl = new SoftwareRenderer(
                 colorFormat,