jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5269 from jpark37/wasapi-cleanup

Browse Source 
win-wasapi: WASAPISource improvements
This commit is contained in:
Jim 2021-10-24 02:16:40 -07:00 committed by GitHub
commit 355eb4b8df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 646 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
UI/obs-app.cpp
View File

@ -2689,6 +2689,14 @@ int main(int argc, char *argv[])
SetErrorMode(SEM_FAILCRITICALERRORS); SetErrorMode(SEM_FAILCRITICALERRORS);
load_debug_privilege(); load_debug_privilege();
base_set_crash_handler(main_crash_handler, nullptr); base_set_crash_handler(main_crash_handler, nullptr);
const HMODULE hRtwq = LoadLibrary(L"RTWorkQ.dll");
if (hRtwq) {
typedef HRESULT(STDAPICALLTYPE * PFN_RtwqStartup)();
PFN_RtwqStartup func =
(PFN_RtwqStartup)GetProcAddress(hRtwq, "RtwqStartup");
func();
}
#endif #endif
base_get_log_handler(&def_log_handler, nullptr); base_get_log_handler(&def_log_handler, nullptr);
@ -2828,6 +2836,16 @@ int main(int argc, char *argv[])
curl_global_init(CURL_GLOBAL_ALL); curl_global_init(CURL_GLOBAL_ALL);
int ret = run_program(logFile, argc, argv); int ret = run_program(logFile, argc, argv);
#ifdef _WIN32
if (hRtwq) {
typedef HRESULT(STDAPICALLTYPE * PFN_RtwqShutdown)();
PFN_RtwqShutdown func =
(PFN_RtwqShutdown)GetProcAddress(hRtwq, "RtwqShutdown");
func();
FreeLibrary(hRtwq);
}
#endif
blog(LOG_INFO, "Number of memory leaks: %ld", bnum_allocs()); blog(LOG_INFO, "Number of memory leaks: %ld", bnum_allocs());
base_set_log_handler(nullptr, nullptr); base_set_log_handler(nullptr, nullptr);
return ret; return ret;

1
plugins/win-wasapi/CMakeLists.txt
View File

@ -15,6 +15,7 @@ add_library(win-wasapi MODULE
${win-wasapi_SOURCES} ${win-wasapi_SOURCES}
${win-wasapi_HEADERS}) ${win-wasapi_HEADERS})
target_link_libraries(win-wasapi target_link_libraries(win-wasapi
Avrt
libobs) libobs)
set_target_properties(win-wasapi PROPERTIES FOLDER "plugins") set_target_properties(win-wasapi PROPERTIES FOLDER "plugins")

2
plugins/win-wasapi/enum-wasapi.cpp
View File

@ -36,7 +36,7 @@ string GetDeviceName(IMMDevice *device)
return device_name; return device_name;
} }
void GetWASAPIAudioDevices_(vector<AudioDeviceInfo> &devices, bool input) static void GetWASAPIAudioDevices_(vector<AudioDeviceInfo> &devices, bool input)
{ {
ComPtr<IMMDeviceEnumerator> enumerator; ComPtr<IMMDeviceEnumerator> enumerator;
ComPtr<IMMDeviceCollection> collection; ComPtr<IMMDeviceCollection> collection;

848
plugins/win-wasapi/win-wasapi.cpp
View File

File diff suppressed because it is too large Load Diff