mirror of
https://github.com/Xaymar/obs-StreamFX
synced 2024-11-10 22:05:06 +00:00
filter/denoising: Wait for internal task to be completed
This commit is contained in:
parent
926cb740b3
commit
f0b0b0d33d
1 changed files with 32 additions and 11 deletions
|
@ -90,6 +90,8 @@ denoising_instance::denoising_instance(obs_data_t* data, obs_source_t* self)
|
||||||
_size(1, 1), _provider_ready(false), _provider(denoising_provider::INVALID), _provider_lock(), _provider_task(),
|
_size(1, 1), _provider_ready(false), _provider(denoising_provider::INVALID), _provider_lock(), _provider_task(),
|
||||||
_input(), _output()
|
_input(), _output()
|
||||||
{
|
{
|
||||||
|
D_LOG_DEBUG("Initializating... (Addr: 0x%" PRIuPTR ")", this);
|
||||||
|
|
||||||
{
|
{
|
||||||
::streamfx::obs::gs::context gctx;
|
::streamfx::obs::gs::context gctx;
|
||||||
|
|
||||||
|
@ -120,8 +122,19 @@ denoising_instance::denoising_instance(obs_data_t* data, obs_source_t* self)
|
||||||
|
|
||||||
denoising_instance::~denoising_instance()
|
denoising_instance::~denoising_instance()
|
||||||
{
|
{
|
||||||
// TODO: Make this asynchronous.
|
D_LOG_DEBUG("Finalizing... (Addr: 0x%" PRIuPTR ")", this);
|
||||||
|
|
||||||
|
{ // Unload the underlying effect ASAP.
|
||||||
std::unique_lock<std::mutex> ul(_provider_lock);
|
std::unique_lock<std::mutex> ul(_provider_lock);
|
||||||
|
|
||||||
|
// De-queue the underlying task.
|
||||||
|
if (_provider_task) {
|
||||||
|
streamfx::threadpool()->pop(_provider_task);
|
||||||
|
_provider_task->await_completion();
|
||||||
|
_provider_task.reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Make this asynchronous.
|
||||||
switch (_provider) {
|
switch (_provider) {
|
||||||
#ifdef ENABLE_FILTER_DENOISING_NVIDIA
|
#ifdef ENABLE_FILTER_DENOISING_NVIDIA
|
||||||
case denoising_provider::NVIDIA_DENOISING:
|
case denoising_provider::NVIDIA_DENOISING:
|
||||||
|
@ -132,6 +145,7 @@ denoising_instance::~denoising_instance()
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void denoising_instance::load(obs_data_t* data)
|
void denoising_instance::load(obs_data_t* data)
|
||||||
{
|
{
|
||||||
|
@ -370,17 +384,24 @@ void streamfx::filter::denoising::denoising_instance::switch_provider(denoising_
|
||||||
D_LOG_INFO("Instance '%s' is switching provider from '%s' to '%s'.", obs_source_get_name(_self), cstring(_provider),
|
D_LOG_INFO("Instance '%s' is switching provider from '%s' to '%s'.", obs_source_get_name(_self), cstring(_provider),
|
||||||
cstring(provider));
|
cstring(provider));
|
||||||
|
|
||||||
// 1.If there is an existing task, attempt to cancel it.
|
// If there is an existing task, attempt to cancel it.
|
||||||
if (_provider_task) {
|
if (_provider_task) {
|
||||||
|
// De-queue it.
|
||||||
streamfx::threadpool()->pop(_provider_task);
|
streamfx::threadpool()->pop(_provider_task);
|
||||||
|
|
||||||
|
// Await the death of the task itself.
|
||||||
|
_provider_task->await_completion();
|
||||||
|
|
||||||
|
// Clear any memory associated with it.
|
||||||
|
_provider_task.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Build data to pass into the task.
|
// Build data to pass into the task.
|
||||||
auto spd = std::make_shared<switch_provider_data_t>();
|
auto spd = std::make_shared<switch_provider_data_t>();
|
||||||
spd->provider = _provider;
|
spd->provider = _provider;
|
||||||
_provider = provider;
|
_provider = provider;
|
||||||
|
|
||||||
// 3. Then spawn a new task to switch provider.
|
// Then spawn a new task to switch provider.
|
||||||
_provider_task = streamfx::threadpool()->push(
|
_provider_task = streamfx::threadpool()->push(
|
||||||
std::bind(&denoising_instance::task_switch_provider, this, std::placeholders::_1), spd);
|
std::bind(&denoising_instance::task_switch_provider, this, std::placeholders::_1), spd);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue