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

filter-transform: Catch and log exceptions

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2019-10-13 07:08:02 +02:00
parent 96466100b4
commit 06d9a3d2f5
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/filters/filter-transform.cpp
View File

@ -238,8 +238,12 @@ obs_properties_t* filter::transform::transform_factory::get_properties(void*) no
obs_property_set_long_description(p, D_TRANSLATE(D_DESC(S_MIPGENERATOR_INTENSITY))); obs_property_set_long_description(p, D_TRANSLATE(D_DESC(S_MIPGENERATOR_INTENSITY)));
return pr; return pr;
} catch (const std::exception& ex) {
P_LOG_ERROR("Unexpected exception in function '%s': %s.", __FUNCTION_NAME__, ex.what());
return nullptr;
} catch (...) { } catch (...) {
P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__); P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
return nullptr;
} }
bool filter::transform::transform_factory::modified_properties(obs_properties_t* pr, obs_property_t*, bool filter::transform::transform_factory::modified_properties(obs_properties_t* pr, obs_property_t*,
@ -264,12 +268,17 @@ bool filter::transform::transform_factory::modified_properties(obs_properties_t*
obs_property_set_visible(obs_properties_get(pr, S_MIPGENERATOR_INTENSITY), mipmappingVisible); obs_property_set_visible(obs_properties_get(pr, S_MIPGENERATOR_INTENSITY), mipmappingVisible);
return true; return true;
} catch (const std::exception& ex) {
P_LOG_ERROR("Unexpected exception in function '%s': %s.", __FUNCTION_NAME__, ex.what());
} catch (...) { } catch (...) {
P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__); P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
} }
void* filter::transform::transform_factory::create(obs_data_t* data, obs_source_t* source) noexcept try { void* filter::transform::transform_factory::create(obs_data_t* data, obs_source_t* source) noexcept try {
return new transform_instance(data, source); return new transform_instance(data, source);
} catch (const std::exception& ex) {
P_LOG_ERROR("Unexpected exception in function '%s': %s.", __FUNCTION_NAME__, ex.what());
return nullptr;
} catch (...) { } catch (...) {
P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__); P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
return nullptr; return nullptr;
@ -277,48 +286,68 @@ void* filter::transform::transform_factory::create(obs_data_t* data, obs_source_
void filter::transform::transform_factory::destroy(void* ptr) noexcept try { void filter::transform::transform_factory::destroy(void* ptr) noexcept try {
delete reinterpret_cast<transform_instance*>(ptr); delete reinterpret_cast<transform_instance*>(ptr);
} catch (const std::exception& ex) {
P_LOG_ERROR("Unexpected exception in function '%s': %s.", __FUNCTION_NAME__, ex.what());
} catch (...) { } catch (...) {
P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__); P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
} }
uint32_t filter::transform::transform_factory::get_width(void* ptr) noexcept try { uint32_t filter::transform::transform_factory::get_width(void* ptr) noexcept try {
return reinterpret_cast<transform_instance*>(ptr)->get_width(); return reinterpret_cast<transform_instance*>(ptr)->get_width();
} catch (const std::exception& ex) {
P_LOG_ERROR("Unexpected exception in function '%s': %s.", __FUNCTION_NAME__, ex.what());
return 0;
} catch (...) { } catch (...) {
P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__); P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
return 0;
} }
uint32_t filter::transform::transform_factory::get_height(void* ptr) noexcept try { uint32_t filter::transform::transform_factory::get_height(void* ptr) noexcept try {
return reinterpret_cast<transform_instance*>(ptr)->get_height(); return reinterpret_cast<transform_instance*>(ptr)->get_height();
} catch (const std::exception& ex) {
P_LOG_ERROR("Unexpected exception in function '%s': %s.", __FUNCTION_NAME__, ex.what());
return 0;
} catch (...) { } catch (...) {
P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__); P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
return 0;
} }
void filter::transform::transform_factory::update(void* ptr, obs_data_t* data) noexcept try { void filter::transform::transform_factory::update(void* ptr, obs_data_t* data) noexcept try {
reinterpret_cast<transform_instance*>(ptr)->update(data); reinterpret_cast<transform_instance*>(ptr)->update(data);
} catch (const std::exception& ex) {
P_LOG_ERROR("Unexpected exception in function '%s': %s.", __FUNCTION_NAME__, ex.what());
} catch (...) { } catch (...) {
P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__); P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
} }
void filter::transform::transform_factory::activate(void* ptr) noexcept try { void filter::transform::transform_factory::activate(void* ptr) noexcept try {
reinterpret_cast<transform_instance*>(ptr)->activate(); reinterpret_cast<transform_instance*>(ptr)->activate();
} catch (const std::exception& ex) {
P_LOG_ERROR("Unexpected exception in function '%s': %s.", __FUNCTION_NAME__, ex.what());
} catch (...) { } catch (...) {
P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__); P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
} }
void filter::transform::transform_factory::deactivate(void* ptr) noexcept try { void filter::transform::transform_factory::deactivate(void* ptr) noexcept try {
reinterpret_cast<transform_instance*>(ptr)->deactivate(); reinterpret_cast<transform_instance*>(ptr)->deactivate();
} catch (const std::exception& ex) {
P_LOG_ERROR("Unexpected exception in function '%s': %s.", __FUNCTION_NAME__, ex.what());
} catch (...) { } catch (...) {
P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__); P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
} }
void filter::transform::transform_factory::video_tick(void* ptr, float time) noexcept try { void filter::transform::transform_factory::video_tick(void* ptr, float time) noexcept try {
reinterpret_cast<transform_instance*>(ptr)->video_tick(time); reinterpret_cast<transform_instance*>(ptr)->video_tick(time);
} catch (const std::exception& ex) {
P_LOG_ERROR("Unexpected exception in function '%s': %s.", __FUNCTION_NAME__, ex.what());
} catch (...) { } catch (...) {
P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__); P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
} }
void filter::transform::transform_factory::video_render(void* ptr, gs_effect_t* effect) noexcept try { void filter::transform::transform_factory::video_render(void* ptr, gs_effect_t* effect) noexcept try {
reinterpret_cast<transform_instance*>(ptr)->video_render(effect); reinterpret_cast<transform_instance*>(ptr)->video_render(effect);
} catch (const std::exception& ex) {
P_LOG_ERROR("Unexpected exception in function '%s': %s.", __FUNCTION_NAME__, ex.what());
} catch (...) { } catch (...) {
P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__); P_LOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
} }