Enable oneVPL dispatch on Android

Change the lib path for loading oneVPL runtime on Android

Tracked-On: OAM-118498
Signed-off-by: zhangyichix <yichix.zhang@intel.com>
Signed-off-by: Shaofeng Tang <shaofeng.tang@intel.com>

Author: zhangyichix

libvpl/src/linux/mfxloader.cpp

@@ -27,17 +27,33 @@
 namespace MFX {
 
 #if defined(__x86_64__) || (INTPTR_MAX == INT64_MAX)
+#ifdef ANDROID
+    #define LIBMFXSW "libmfxsw64.so"
+    #define LIBMFXHW "libmfxhw64.so"
+
+    #define ONEVPLSW "libvplswref64.so"
+    #define ONEVPLHW "libmfx-gen.so"
+#else
     #define LIBMFXSW "libmfxsw64.so.1"
     #define LIBMFXHW "libmfxhw64.so.1"
 
     #define ONEVPLSW "libvplswref64.so.1"
     #define ONEVPLHW "libmfx-gen.so.1.2"
+#endif
 #elif defined(__i386__) || (INTPTR_MAX == INT32_MAX)
+#ifdef ANDROID
+    #define LIBMFXSW "libmfxsw32.so"
+    #define LIBMFXHW "libmfxhw32.so"
+
+    #define ONEVPLSW "libvplswref32.so"
+    #define ONEVPLHW "libmfx-gen.so"
+#else
     #define LIBMFXSW "libmfxsw32.so.1"
     #define LIBMFXHW "libmfxhw32.so.1"
 
     #define ONEVPLSW "libvplswref32.so.1"
     #define ONEVPLHW "libmfx-gen.so.1.2"
+#endif
 #else
     #error Unsupported architecture
 #endif

libvpl/src/mfx_dispatcher_vpl.h

@@ -48,9 +48,14 @@ typedef char CHAR_TYPE;
         #define MSDK_LIB_NAME L"libmfxhw64."
     #endif
     #define ONEVPL_PRIORITY_PATH_VAR L"ONEVPL_PRIORITY_PATH"
-#elif defined(__linux__)
-    // Linux x64
-    #define MSDK_LIB_NAME            "libmfxhw64."
+#elif defined(__linux__) || defined ANDROID
+    #if defined __i386
+        // Linux or Android 32
+        #define MSDK_LIB_NAME "libmfxhw32."
+    #else
+        // Linux x64
+        #define MSDK_LIB_NAME            "libmfxhw64."
+    #endif
     #define ONEVPL_PRIORITY_PATH_VAR "ONEVPL_PRIORITY_PATH"
 #endif
 

libvpl/src/mfx_dispatcher_vpl_loader.cpp

@@ -129,7 +129,11 @@ mfxU32 LoaderCtxVPL::ParseEnvSearchPaths(const CHAR_TYPE *envVarName,
 #else
     CHAR_TYPE *envVar = getenv(envVarName);
     if (!envVar)
+#ifdef ANDROID
+        envVar = (CHAR_TYPE *)ONEVPL_SEARCH_PATH;
+#else	
         return 0; // environment variable not defined
+#endif
 
     // parse env variable into individual directories
     std::stringstream envPath((CHAR_TYPE *)envVar);
@@ -239,8 +243,12 @@ mfxStatus LoaderCtxVPL::SearchDirForLibs(STRING_TYPE searchDir,
             if (strstr(currFile->d_name, ".so")) {
                 // library names must begin with "libvpl*" or "libmfx*"
                 if ((strstr(currFile->d_name, "libvpl") != currFile->d_name) &&
+                #ifdef ANDROID
+                    (strstr(currFile->d_name, "libmfx") != currFile->d_name))
+                #else
                     (strcmp(currFile->d_name, "libmfx-gen.so.1.2") != 0) &&
                     (strcmp(currFile->d_name, "libmfxhw64.so.1") != 0))
+                #endif
                     continue;
 
                 // special case: do not include dispatcher itself (libmfx.so*, libvpl.so*) or tracer library
@@ -414,6 +422,15 @@ mfxU32 LoaderCtxVPL::GetSearchPathsSystemDefault(std::list<STRING_TYPE> &searchD
     searchDirs.clear();
 
 #ifdef __linux__
+    #ifdef ANDROID
+    searchDirs.push_back("/usr/lib/x86_64-linux-gnu");
+
+    // Add other default paths
+    searchDirs.push_back("/lib");
+    searchDirs.push_back("/vendor/lib");
+    searchDirs.push_back("/lib64");
+    searchDirs.push_back("/vendor/lib64");
+    #else
     // Add the standard path for libmfx1 install in Ubuntu
     searchDirs.push_back("/usr/lib/x86_64-linux-gnu");
 
@@ -422,6 +439,7 @@ mfxU32 LoaderCtxVPL::GetSearchPathsSystemDefault(std::list<STRING_TYPE> &searchD
     searchDirs.push_back("/usr/lib");
     searchDirs.push_back("/lib64");
     searchDirs.push_back("/usr/lib64");
+    #endif
 #endif
 
     return (mfxU32)searchDirs.size();

libvpl/src/mfx_dispatcher_vpl_lowlatency.cpp

@@ -19,9 +19,19 @@
         #define LIB_MSDK   L"libmfxhw64.dll"
     #endif
 #elif defined(__linux__)
-    // Linux x64
-    #define LIB_ONEVPL "libmfx-gen.so.1.2"
-    #define LIB_MSDK   "libmfxhw64.so.1"
+    #ifdef ANDROID
+        #if defined __i386
+            #define LIB_ONEVPL "libmfx-gen.so"
+            #define LIB_MSDK   "libmfxhw32.so"
+        #else
+            #define LIB_ONEVPL "libmfx-gen.so"
+            #define LIB_MSDK   "libmfxhw64.so"
+        #endif
+    #else
+        // Linux x64
+        #define LIB_ONEVPL "libmfx-gen.so.1.2"
+        #define LIB_MSDK   "libmfxhw64.so.1"
+    #endif
 #endif
 
 //Intel® Video Processing Library (Intel® VPL) low latency dispatcher
@@ -195,13 +205,23 @@ mfxStatus LoaderCtxVPL::LoadLibsFromMultipleDirs(LibType libType) {
     // clang-format off
 
     // standard paths for RT installation on Linux
+    #ifdef ANDROID
+    std::vector<std::string> llSearchDir = {
+        "/usr/lib/x86_64-linux-gnu",
+        "/lib",
+        "/vendor/lib",
+        "/lib64",
+        "/vendor/lib64",
+    };
+    #else
     std::vector<std::string> llSearchDir = {
         "/usr/lib/x86_64-linux-gnu",
         "/lib",
         "/usr/lib",
         "/lib64",
         "/usr/lib64",
     };
+    #endif
 
     // clang-format on