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

filter-blur: Update in load and create

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2019-01-27 23:29:47 +01:00
parent 8a64e360c4
commit 39b0600aa3
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/filter-blur.cpp
View File

@ -123,6 +123,7 @@ filter::blur::factory::factory()
source_info.deactivate = deactivate; source_info.deactivate = deactivate;
source_info.video_tick = video_tick; source_info.video_tick = video_tick;
source_info.video_render = video_render; source_info.video_render = video_render;
source_info.load = load;
obs_register_source(&source_info); obs_register_source(&source_info);
} }
@ -293,6 +294,11 @@ void filter::blur::factory::update(void* inptr, obs_data_t* settings)
reinterpret_cast<filter::blur::instance*>(inptr)->update(settings); reinterpret_cast<filter::blur::instance*>(inptr)->update(settings);
} }
void filter::blur::factory::load(void* inptr, obs_data_t* settings)
{
reinterpret_cast<filter::blur::instance*>(inptr)->update(settings);
}
const char* filter::blur::factory::get_name(void*) const char* filter::blur::factory::get_name(void*)
{ {
return P_TRANSLATE(SOURCE_NAME); return P_TRANSLATE(SOURCE_NAME);
@ -422,8 +428,8 @@ bool filter::blur::instance::apply_gaussian_param(uint8_t width)
return true; return true;
} }
bool filter::blur::instance::apply_mask_parameters(std::shared_ptr<gs::effect> effect, gs_texture_t* original_texture, bool filter::blur::instance::apply_mask_parameters(std::shared_ptr<gs::effect> effect,
gs_texture_t* blurred_texture) gs_texture_t* original_texture, gs_texture_t* blurred_texture)
{ {
if (effect->has_parameter("image_orig")) { if (effect->has_parameter("image_orig")) {
effect->get_parameter("image_orig").set_texture(original_texture); effect->get_parameter("image_orig").set_texture(original_texture);
@ -487,7 +493,8 @@ bool filter::blur::instance::apply_mask_parameters(std::shared_ptr<gs::effect> e
return true; return true;
} }
bool filter::blur::instance::modified_properties(void*, obs_properties_t* props, obs_property*, obs_data_t* settings) bool filter::blur::instance::modified_properties(void*, obs_properties_t* props, obs_property*,
obs_data_t* settings)
{ {
// bilateral blur // bilateral blur
bool show_bilateral = (obs_data_get_int(settings, P_TYPE) == type::Bilateral); bool show_bilateral = (obs_data_get_int(settings, P_TYPE) == type::Bilateral);
@ -561,6 +568,7 @@ filter::blur::instance::instance(obs_data_t* settings, obs_source_t* parent)
filter::blur::instance::~instance() filter::blur::instance::~instance()
{ {
this->mask.source.source_texture.reset();
this->rt_primary.reset(); this->rt_primary.reset();
this->rt_secondary.reset(); this->rt_secondary.reset();
} }
@ -756,6 +764,11 @@ void filter::blur::instance::update(obs_data_t* settings)
} }
} }
void filter::blur::instance::load(obs_data_t* settings)
{
update(settings);
}
uint32_t filter::blur::instance::get_width() uint32_t filter::blur::instance::get_width()
{ {
return uint32_t(0); return uint32_t(0);
@ -770,9 +783,7 @@ void filter::blur::instance::activate() {}
void filter::blur::instance::deactivate() {} void filter::blur::instance::deactivate() {}
void filter::blur::instance::video_tick(float) void filter::blur::instance::video_tick(float) {}
{
}
void filter::blur::instance::video_render(gs_effect_t* effect) void filter::blur::instance::video_render(gs_effect_t* effect)
{ {

2
source/filter-blur.hpp
View File

@ -91,6 +91,7 @@ namespace filter {
static void get_defaults(obs_data_t* settings); static void get_defaults(obs_data_t* settings);
static obs_properties_t* get_properties(void* source); static obs_properties_t* get_properties(void* source);
static void update(void* source, obs_data_t* settings); static void update(void* source, obs_data_t* settings);
static void load(void* source, obs_data_t* settings);
static const char* get_name(void* source); static const char* get_name(void* source);
static uint32_t get_width(void* source); static uint32_t get_width(void* source);
@ -196,6 +197,7 @@ namespace filter {
obs_properties_t* get_properties(); obs_properties_t* get_properties();
void update(obs_data_t*); void update(obs_data_t*);
void load(obs_data_t*);
uint32_t get_width(); uint32_t get_width();
uint32_t get_height(); uint32_t get_height();