etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-13 07:15:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

obs/source-factory: Skip broken filter rendering by default

Browse source 
Fixes a black screen issue if a filter happens to run into an unexpected issue which it considers unrecoverable.
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-11-08 03:19:52 +01:00
parent 5185c720ea
commit 032a3c6deb
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/obs/obs-source-factory.hpp
View file

@ -143,7 +143,7 @@ namespace obs {
break; break;
case OBS_SOURCE_VIDEO: case OBS_SOURCE_VIDEO:
_info.video_tick = _video_tick; _info.video_tick = _video_tick;
_info.video_render = _video_render; _info.video_render = _video_render_filter;
break; break;
} }
if ((_info.output_flags & OBS_SOURCE_AUDIO) != 0) { if ((_info.output_flags & OBS_SOURCE_AUDIO) != 0) {
@ -327,6 +327,18 @@ namespace obs {
DLOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__); DLOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
} }
static void _video_render_filter(void* data, gs_effect_t* effect) noexcept
try {
if (data)
reinterpret_cast<_instance*>(data)->video_render(effect);
} catch (const std::exception& ex) {
DLOG_ERROR("Unexpected exception in function '%s': %s.", __FUNCTION_NAME__, ex.what());
obs_source_skip_video_filter(reinterpret_cast<_instance*>(data)->get());
} catch (...) {
DLOG_ERROR("Unexpected exception in function '%s'.", __FUNCTION_NAME__);
obs_source_skip_video_filter(reinterpret_cast<_instance*>(data)->get());
}
static struct obs_source_frame* _filter_video(void* data, struct obs_source_frame* frame) noexcept static struct obs_source_frame* _filter_video(void* data, struct obs_source_frame* frame) noexcept
try { try {
if (data) if (data)
@ -549,6 +561,11 @@ namespace obs {
source_instance(obs_data_t* settings, obs_source_t* source) : _self(source) {} source_instance(obs_data_t* settings, obs_source_t* source) : _self(source) {}
virtual ~source_instance(){}; virtual ~source_instance(){};
virtual obs_source_t* get()
{
return _self;
}
virtual uint32_t get_width() virtual uint32_t get_width()
{ {
return 0; return 0;