RomanNum3ral
/
obs-streamFX
mirror of https://github.com/RomanNum3ral/obs-StreamFX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code: Migrate filter::virtual_greenscreen to new dynamic loader

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2023-05-14 08:54:42 +02:00 committed by Xaymar
parent e630ddc8a7
commit 0556db97df
3 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
source/filters/filter-virtual-greenscreen.cpp
View File

@ -155,7 +155,7 @@ void virtual_greenscreen_instance::update(obs_data_t* data)
// Check if the user changed which Denoising provider we use. // Check if the user changed which Denoising provider we use.
virtual_greenscreen_provider provider = static_cast<virtual_greenscreen_provider>(obs_data_get_int(data, ST_KEY_PROVIDER)); virtual_greenscreen_provider provider = static_cast<virtual_greenscreen_provider>(obs_data_get_int(data, ST_KEY_PROVIDER));
if (provider == virtual_greenscreen_provider::AUTOMATIC) { if (provider == virtual_greenscreen_provider::AUTOMATIC) {
provider = virtual_greenscreen_factory::get()->find_ideal_provider(); provider = virtual_greenscreen_factory::instance()->find_ideal_provider();
} }
// Check if the provider was changed, and if so switch. // Check if the provider was changed, and if so switch.
@ -617,7 +617,7 @@ bool streamfx::filter::virtual_greenscreen::virtual_greenscreen_factory::is_prov
virtual_greenscreen_provider streamfx::filter::virtual_greenscreen::virtual_greenscreen_factory::find_ideal_provider() virtual_greenscreen_provider streamfx::filter::virtual_greenscreen::virtual_greenscreen_factory::find_ideal_provider()
{ {
for (auto v : provider_priority) { for (auto v : provider_priority) {
if (virtual_greenscreen_factory::get()->is_provider_available(v)) { if (virtual_greenscreen_factory::instance()->is_provider_available(v)) {
return v; return v;
break; break;
} }
@ -625,26 +625,27 @@ virtual_greenscreen_provider streamfx::filter::virtual_greenscreen::virtual_gree
return virtual_greenscreen_provider::AUTOMATIC; return virtual_greenscreen_provider::AUTOMATIC;
} }
std::shared_ptr<virtual_greenscreen_factory> _video_superresolution_factory_instance = nullptr; std::shared_ptr<virtual_greenscreen_factory> virtual_greenscreen_factory::instance()
void virtual_greenscreen_factory::initialize()
{ {
try { static std::weak_ptr<virtual_greenscreen_factory> winst;
if (!_video_superresolution_factory_instance) static std::mutex mtx;
_video_superresolution_factory_instance = std::make_shared<virtual_greenscreen_factory>();
} catch (const std::exception& ex) { std::unique_lock<decltype(mtx)> lock(mtx);
D_LOG_ERROR("Failed to initialize due to error: %s", ex.what()); auto instance = winst.lock();
} catch (...) { if (!instance) {
D_LOG_ERROR("Failed to initialize due to unknown error.", ""); instance = std::shared_ptr<virtual_greenscreen_factory>(new virtual_greenscreen_factory());
winst = instance;
} }
return instance;
} }
void virtual_greenscreen_factory::finalize() static std::shared_ptr<virtual_greenscreen_factory> loader_instance;
{
_video_superresolution_factory_instance.reset();
}
std::shared_ptr<virtual_greenscreen_factory> virtual_greenscreen_factory::get() static auto loader = streamfx::loader(
{ []() { // Initalizer
return _video_superresolution_factory_instance; loader_instance = virtual_greenscreen_factory::instance();
} },
[]() { // Finalizer
loader_instance.reset();
},
streamfx::loader_priority::NORMAL);

2
source/filters/filter-virtual-greenscreen.hpp
View File

@ -109,7 +109,7 @@ namespace streamfx::filter::virtual_greenscreen {
public: // Singleton public: // Singleton
static void initialize(); static void initialize();
static void finalize(); static void finalize();
static std::shared_ptr<::streamfx::filter::virtual_greenscreen::virtual_greenscreen_factory> get(); static std::shared_ptr<::streamfx::filter::virtual_greenscreen::virtual_greenscreen_factory> instance();
}; };
} // namespace streamfx::filter::virtual_greenscreen } // namespace streamfx::filter::virtual_greenscreen

9
source/plugin.cpp
View File

@ -28,9 +28,6 @@
#ifdef ENABLE_FILTER_UPSCALING #ifdef ENABLE_FILTER_UPSCALING
#include "filters/filter-upscaling.hpp" #include "filters/filter-upscaling.hpp"
#endif #endif
#ifdef ENABLE_FILTER_VIRTUAL_GREENSCREEN
#include "filters/filter-virtual-greenscreen.hpp"
#endif
#ifdef ENABLE_FRONTEND #ifdef ENABLE_FRONTEND
#include "ui/ui.hpp" #include "ui/ui.hpp"
@ -142,9 +139,6 @@ MODULE_EXPORT bool obs_module_load(void)
#endif #endif
#ifdef ENABLE_FILTER_UPSCALING #ifdef ENABLE_FILTER_UPSCALING
streamfx::filter::upscaling::upscaling_factory::initialize(); streamfx::filter::upscaling::upscaling_factory::initialize();
#endif
#ifdef ENABLE_FILTER_VIRTUAL_GREENSCREEN
streamfx::filter::virtual_greenscreen::virtual_greenscreen_factory::initialize();
#endif #endif
} }
@ -177,9 +171,6 @@ MODULE_EXPORT void obs_module_unload(void)
#endif #endif
#ifdef ENABLE_FILTER_UPSCALING #ifdef ENABLE_FILTER_UPSCALING
streamfx::filter::upscaling::upscaling_factory::finalize(); streamfx::filter::upscaling::upscaling_factory::finalize();
#endif
#ifdef ENABLE_FILTER_VIRTUAL_GREENSCREEN
streamfx::filter::virtual_greenscreen::virtual_greenscreen_factory::finalize();
#endif #endif
} }