starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-24 02:34:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

nv-filters: Improve handling of SDK DLL loading

Browse Source
This commit is contained in:
Richard Stanway
2026-06-05 15:27:30 -04:00
committed by Ryan Foster
parent e29a640ddd
commit 9541600b3d
2 changed files with 86 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/nv-filters/nvafx-load.h
+43 -15
View File
@@ -285,26 +285,50 @@ void release_lib(void)
}
}
static bool nvafx_get_sdk_path(char *buffer, const size_t len)
static inline bool nvafx_get_sdk_path(char *buffer, const size_t len)
{
DWORD ret = GetEnvironmentVariableA("NVAFX_SDK_DIR", buffer, (DWORD)len);
if (!ret || ret >= len - 1)
if (!ret || ret >= len - 1) {
char path[MAX_PATH];
if (!GetEnvironmentVariableA("ProgramFiles", path, MAX_PATH)) {
buffer[0] = 0;
return false;
}
if (_snprintf_s(buffer, len, _TRUNCATE, "%s\\NVIDIA Corporation\\NVIDIA Audio Effects SDK", path) > 0) {
return true;
}
return false;
}
return true;
}
static bool load_lib(void)
static inline bool load_lib()
{
char path[MAX_PATH];
if (!nvafx_get_sdk_path(path, sizeof(path)))
char sdkPath[MAX_PATH];
char effectsPath[MAX_PATH];
char cudaPath[MAX_PATH];
if (!nvafx_get_sdk_path(sdkPath, MAX_PATH)) {
return false;
}
if (_snprintf_s(effectsPath, _countof(effectsPath), _TRUNCATE, "%s\\NVAudioEffects.dll", sdkPath) == -1) {
return false;
}
if (_snprintf_s(cudaPath, _countof(cudaPath), _TRUNCATE, "%s\\nvcuda.dll", sdkPath) == -1) {
return false;
}
nv_audiofx =
LoadLibraryExA(effectsPath, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
nv_cuda = LoadLibraryExA(cudaPath, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
SetDllDirectoryA(path);
nv_audiofx = LoadLibrary(L"NVAudioEffects.dll");
SetDllDirectoryA(NULL);
nv_cuda = LoadLibrary(L"nvcuda.dll");
return !!nv_audiofx && !!nv_cuda;
}
@@ -318,17 +342,21 @@ static unsigned int get_lib_version(void)
version_checked = true;
char path[MAX_PATH];
if (!nvafx_get_sdk_path(path, sizeof(path)))
return 0;
char sdkPath[MAX_PATH];
wchar_t dllPath[MAX_PATH];
SetDllDirectoryA(path);
if (!nvafx_get_sdk_path(sdkPath, MAX_PATH)) {
return version;
}
if (_snwprintf_s(dllPath, _countof(dllPath), _TRUNCATE, L"%S\\NVAudioEffects.dll", sdkPath) == -1) {
return version;
}
struct win_version_info nto_ver = {0};
if (get_dll_ver(L"NVAudioEffects.dll", &nto_ver))
if (get_dll_ver(dllPath, &nto_ver))
version = nto_ver.major << 24 | nto_ver.minor << 16 | nto_ver.build << 8 | nto_ver.revis << 0;
SetDllDirectoryA(NULL);
return version;
}
plugins/nv-filters/nvvfx-load.h
+43 -15
View File
@@ -667,28 +667,51 @@ static inline void release_nv_vfx()
}
}
static inline void nvvfx_get_sdk_path(char *buffer, const size_t len)
static inline bool nvvfx_get_sdk_path(char *buffer, const size_t len)
{
DWORD ret = GetEnvironmentVariableA("NV_VIDEO_EFFECTS_PATH", buffer, (DWORD)len);
if (!ret || ret >= len - 1) {
char path[MAX_PATH];
GetEnvironmentVariableA("ProgramFiles", path, MAX_PATH);
if (!GetEnvironmentVariableA("ProgramFiles", path, MAX_PATH)) {
buffer[0] = 0;
return false;
}
size_t max_len = sizeof(path) / sizeof(char);
snprintf(buffer, max_len, "%s\\NVIDIA Corporation\\NVIDIA Video Effects", path);
if (_snprintf_s(buffer, len, _TRUNCATE, "%s\\NVIDIA Corporation\\NVIDIA Video Effects", path) > 0) {
return true;
}
return false;
}
return true;
}
static inline bool load_nv_vfx_libs()
{
char fullPath[MAX_PATH];
nvvfx_get_sdk_path(fullPath, MAX_PATH);
SetDllDirectoryA(fullPath);
char sdkPath[MAX_PATH];
char effectsPath[MAX_PATH];
char imagePath[MAX_PATH];
if (!nvvfx_get_sdk_path(sdkPath, MAX_PATH)) {
return false;
}
if (_snprintf_s(effectsPath, _countof(effectsPath), _TRUNCATE, "%s\\NVVideoEffects.dll", sdkPath) == -1) {
return false;
}
if (_snprintf_s(imagePath, _countof(imagePath), _TRUNCATE, "%s\\NVCVImage.dll", sdkPath) == -1) {
return false;
}
nv_videofx =
LoadLibraryExA(effectsPath, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
nv_cvimage =
LoadLibraryExA(imagePath, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
nv_videofx = LoadLibrary(L"NVVideoEffects.dll");
nv_cvimage = LoadLibrary(L"NVCVImage.dll");
SetDllDirectoryA(NULL);
return !!nv_videofx && !!nv_cvimage;
}
@@ -702,16 +725,21 @@ static unsigned int get_lib_version(void)
version_checked = true;
char path[MAX_PATH];
nvvfx_get_sdk_path(path, sizeof(path));
char sdkPath[MAX_PATH];
wchar_t dllPath[MAX_PATH];
SetDllDirectoryA(path);
if (!nvvfx_get_sdk_path(sdkPath, MAX_PATH)) {
return version;
}
if (_snwprintf_s(dllPath, _countof(dllPath), _TRUNCATE, L"%S\\NVVideoEffects.dll", sdkPath) == -1) {
return version;
}
struct win_version_info nto_ver = {0};
if (get_dll_ver(L"NVVideoEffects.dll", &nto_ver))
if (get_dll_ver(dllPath, &nto_ver))
version = nto_ver.major << 24 | nto_ver.minor << 16 | nto_ver.build << 8 | nto_ver.revis << 0;
SetDllDirectoryA(NULL);
return version;
}
#endif