Skip to content

Commit e1da8a5

Browse files
committed
Add AMFLite loading sequence
1 parent 681af0d commit e1da8a5

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

amf/public/common/AMFFactory.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ AMF_RESULT AMFFactoryHelper::Init(const wchar_t* dllName)
8484
m_hDLLHandle = amf_load_library(dllName_);
8585
#else
8686
m_hDLLHandle = amf_load_library1(dllName_, false); //load with local flags
87+
#endif
88+
#ifdef AMFLITE_DLL_NAME
89+
if (m_hDLLHandle == NULL && dllName == nullptr)
90+
{
91+
m_hDLLHandle = amf_load_library(AMFLITE_DLL_NAME);
92+
}
8793
#endif
8894
if(m_hDLLHandle == NULL)
8995
{

amf/public/include/core/Factory.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,16 @@ extern "C"
110110
#if defined(_M_AMD64)
111111
#define AMF_DLL_NAME L"amfrt64.dll"
112112
#define AMF_DLL_NAMEA "amfrt64.dll"
113+
114+
#define AMFLITE_DLL_NAME L"amfrtlt64.dll"
115+
#define AMFLITE_DLL_NAMEA "amfrtlt64.dll"
113116
#else
114117
#define AMF_DLL_NAME L"amfrt32.dll"
115118
#define AMF_DLL_NAMEA "amfrt32.dll"
116-
#endif
119+
120+
#define AMFLITE_DLL_NAME L"amfrtlt32.dll"
121+
#define AMFLITE_DLL_NAMEA "amfrtlt32.dll"
122+
#endif
117123
#elif defined(__ANDROID__) && !defined(AMF_ANDROID_ENCODER)
118124
#define AMF_DLL_NAME L"libamf.so"
119125
#define AMF_DLL_NAMEA "libamf.so"
@@ -124,9 +130,15 @@ extern "C"
124130
#if defined(__x86_64__) || defined(__aarch64__)
125131
#define AMF_DLL_NAME L"libamfrt64.so.1"
126132
#define AMF_DLL_NAMEA "libamfrt64.so.1"
133+
134+
#define AMFLITE_DLL_NAME L"libamfrtlt64.so.1"
135+
#define AMFLITE_DLL_NAMEA "libamfrtlt64.so.1"
127136
#else
128137
#define AMF_DLL_NAME L"libamfrt32.so.1"
129138
#define AMF_DLL_NAMEA "libamfrt32.so.1"
139+
140+
#define AMFLITE_DLL_NAME L"libamfrtlt32.so.1"
141+
#define AMFLITE_DLL_NAMEA "libamfrtlt32.so.1"
130142
#endif
131143
#endif
132144
//----------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)