Git subtree pull latest AMF shared code in preparation for 1.4.9 release.

Merge commit 'e74b6c9156dae944f7326c66246b2669ed0de83b'

Author: tnarine-amd

amf/public/common/AMFFactory.cpp

@@ -9,7 +9,7 @@
 // 
 // MIT license 
 // 
-// Copyright (c) 2016 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -66,13 +66,13 @@ AMF_RESULT AMFFactoryHelper::Init()
         amf_atomic_inc(&m_iRefCount);
         return AMF_OK;
     }
-    m_hDLLHandle = LoadLibraryW(AMF_DLL_NAME);
+    m_hDLLHandle = amf_load_library(AMF_DLL_NAME);
     if(m_hDLLHandle == NULL)
     {
         return AMF_FAIL;
     }
 
-    AMFInit_Fn initFun = (AMFInit_Fn)::GetProcAddress(m_hDLLHandle, AMF_INIT_FUNCTION_NAME);
+    AMFInit_Fn initFun = (AMFInit_Fn)::amf_get_proc_address(m_hDLLHandle, AMF_INIT_FUNCTION_NAME);
     if(initFun == NULL)
     {
         return AMF_FAIL;
@@ -82,7 +82,7 @@ AMF_RESULT AMFFactoryHelper::Init()
     {
         return res;
     }
-    AMFQueryVersion_Fn versionFun = (AMFQueryVersion_Fn)::GetProcAddress(m_hDLLHandle, AMF_QUERY_VERSION_FUNCTION_NAME);
+    AMFQueryVersion_Fn versionFun = (AMFQueryVersion_Fn)::amf_get_proc_address(m_hDLLHandle, AMF_QUERY_VERSION_FUNCTION_NAME);
     if(versionFun == NULL)
     {
         return AMF_FAIL;
@@ -114,7 +114,7 @@ AMF_RESULT AMFFactoryHelper::Terminate()
         amf_atomic_dec(&m_iRefCount);
         if(m_iRefCount == 0)
         { 
-            FreeLibrary(m_hDLLHandle);
+            amf_free_library(m_hDLLHandle);
             m_hDLLHandle = NULL;
             m_pFactory= NULL;
             m_pDebug = NULL;
@@ -155,10 +155,14 @@ AMF_RESULT  AMFFactoryHelper::LoadExternalComponent(amf::AMFContext* pContext, c
     }
 
     // check if DLL has already been loaded
-    HMODULE  hDll = NULL;
+    amf_handle  hDll = NULL;
     for (std::vector<ComponentHolder>::iterator it = m_extComponents.begin(); it != m_extComponents.end(); ++it)
     { 
-        if (wcsicmp(it->m_DLL.c_str(), dll) == 0)
+#if defined(_WIN32)
+         if (wcsicmp(it->m_DLL.c_str(), dll) == 0) // ignore case on Windows
+#elif defined(__linux) // Linux
+        if (wcscmp(it->m_DLL.c_str(), dll) == 0) // case sensitive on Linux
+#endif
         {
             if (it->m_hDLLHandle != NULL)
             {
@@ -179,7 +183,7 @@ AMF_RESULT  AMFFactoryHelper::LoadExternalComponent(amf::AMFContext* pContext, c
         component.m_hDLLHandle = NULL;
         component.m_DLL = dll;
 
-        hDll = LoadLibraryW(dll);
+        hDll = amf_load_library(dll);
         if (hDll == NULL)
             return AMF_FAIL;
 
@@ -194,7 +198,7 @@ AMF_RESULT  AMFFactoryHelper::LoadExternalComponent(amf::AMFContext* pContext, c
 
     // look for function we want in the dll we just loaded
     typedef AMF_RESULT(AMF_CDECL_CALL *AMFCreateComponentFunc)(amf::AMFContext*, void* reserved, amf::AMFComponent**);
-    AMFCreateComponentFunc  initFn = (AMFCreateComponentFunc)::GetProcAddress(hDll, function);
+    AMFCreateComponentFunc  initFn = (AMFCreateComponentFunc)::amf_get_proc_address(hDll, function);
     if (initFn == NULL)
         return AMF_FAIL;
 
@@ -209,7 +213,11 @@ AMF_RESULT  AMFFactoryHelper::UnLoadExternalComponent(const wchar_t* dll)
     }
     for (std::vector<ComponentHolder>::iterator it = m_extComponents.begin(); it != m_extComponents.end(); ++it)
     { 
-        if (wcsicmp(it->m_DLL.c_str(), dll) == 0)
+#if defined(_WIN32)
+         if (wcsicmp(it->m_DLL.c_str(), dll) == 0) // ignore case on Windows
+#elif defined(__linux) // Linux
+        if (wcscmp(it->m_DLL.c_str(), dll) == 0) // case sensitive on Linux
+#endif
         {
             if (it->m_hDLLHandle == NULL)
             {
@@ -218,7 +226,7 @@ AMF_RESULT  AMFFactoryHelper::UnLoadExternalComponent(const wchar_t* dll)
             amf_atomic_dec(&it->m_iRefCount);
             if (it->m_iRefCount == 0)
             { 
-                FreeLibrary(it->m_hDLLHandle);
+                amf_free_library(it->m_hDLLHandle);
                 m_extComponents.erase(it);
             }
             break;

amf/public/common/AMFFactory.h

@@ -9,7 +9,7 @@
 // 
 // MIT license 
 // 
-// Copyright (c) 2016 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -59,7 +59,7 @@ class AMFFactoryHelper
 protected:
     struct ComponentHolder
     {
-        HMODULE         m_hDLLHandle;
+        amf_handle      m_hDLLHandle;
         amf_long        m_iRefCount;
         std::wstring    m_DLL;
 
@@ -70,7 +70,7 @@ class AMFFactoryHelper
         }
     };
 
-    HMODULE             m_hDLLHandle;
+    amf_handle          m_hDLLHandle;
     amf::AMFFactory*    m_pFactory;
     amf::AMFDebug*      m_pDebug;
     amf::AMFTrace*      m_pTrace;