etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-12-28 02:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

code: Don't crash if there is no encoder instance

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2023-05-20 19:42:11 +02:00 committed by Xaymar
parent 3e13126f89
commit 38d87f6fcf
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/encoders/ffmpeg/dnxhd.cpp
View file

@ -48,16 +48,17 @@ void dnxhd::defaults(ffmpeg_factory* factory, obs_data_t* settings)
void dnxhd::properties(ffmpeg_factory* factory, ffmpeg_instance* instance, obs_properties_t* props) void dnxhd::properties(ffmpeg_factory* factory, ffmpeg_instance* instance, obs_properties_t* props)
{ {
AVCodecContext* ctx = instance->get_avcodeccontext(); // Try and acquire a valid context.
std::shared_ptr<AVCodecContext> ctx;
//Create dummy context if null was passed to the function if (instance) {
if (!ctx) { ctx = std::shared_ptr<AVCodecContext>(instance->get_avcodeccontext(), [](AVCodecContext*) {});
ctx = avcodec_alloc_context3(factory->get_avcodec()); } else { // If we don't have a context, create a temporary one that is automatically freed.
ctx = std::shared_ptr<AVCodecContext>(avcodec_alloc_context3(factory->get_avcodec()), [](AVCodecContext* v) { avcodec_free_context(&v); });
if (!ctx->priv_data) { if (!ctx->priv_data) {
avcodec_free_context(&ctx);
return; return;
} }
} }
auto p = obs_properties_add_list(props, S_CODEC_DNXHR_PROFILE, D_TRANSLATE(S_CODEC_DNXHR_PROFILE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING); auto p = obs_properties_add_list(props, S_CODEC_DNXHR_PROFILE, D_TRANSLATE(S_CODEC_DNXHR_PROFILE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
streamfx::ffmpeg::tools::avoption_list_add_entries(ctx->priv_data, "profile", [&p](const AVOption* opt) { streamfx::ffmpeg::tools::avoption_list_add_entries(ctx->priv_data, "profile", [&p](const AVOption* opt) {
@ -72,11 +73,6 @@ void dnxhd::properties(ffmpeg_factory* factory, ffmpeg_instance* instance, obs_p
//Therefore, new entries will always be inserted at the top, effectively reversing the list //Therefore, new entries will always be inserted at the top, effectively reversing the list
obs_property_list_insert_string(p, 0, dnx_profile_to_display_name(opt->name), opt->name); obs_property_list_insert_string(p, 0, dnx_profile_to_display_name(opt->name), opt->name);
}); });
//Free context if we created it here
if (ctx && ctx != instance->get_avcodeccontext()) {
avcodec_free_context(&ctx);
}
} }
void dnxhd::update(ffmpeg_factory* factory, ffmpeg_instance* instance, obs_data_t* settings) void dnxhd::update(ffmpeg_factory* factory, ffmpeg_instance* instance, obs_data_t* settings)