diff --git a/source/encoders/encoder-ffmpeg.cpp b/source/encoders/encoder-ffmpeg.cpp index 3401433..0fc2db4 100644 --- a/source/encoders/encoder-ffmpeg.cpp +++ b/source/encoders/encoder-ffmpeg.cpp @@ -84,7 +84,7 @@ ffmpeg_instance::ffmpeg_instance(obs_data_t* settings, obs_encoder_t* self, bool _factory(reinterpret_cast(obs_encoder_get_type_data(self))), - _codec(_factory->get_avcodec()), _context(nullptr), _handler(ffmpeg_manager::get()->get_handler(_codec->name)), + _codec(_factory->get_avcodec()), _context(nullptr), _handler(ffmpeg_manager::instance()->get_handler(_codec->name)), _scaler(), _packet(), @@ -958,7 +958,7 @@ ffmpeg_factory::ffmpeg_factory(const AVCodec* codec) : _avcodec(codec) } // Find any available handlers for this codec. - if (_handler = ffmpeg_manager::get()->get_handler(_avcodec->name); _handler) { + if (_handler = ffmpeg_manager::instance()->get_handler(_avcodec->name); _handler) { // Override any found info with the one specified by the handler. _handler->adjust_info(this, _avcodec, _id, _name, _codec); @@ -1213,22 +1213,28 @@ bool ffmpeg_manager::has_handler(std::string_view codec) return (_handlers.find(codec.data()) != _handlers.end()); } -std::shared_ptr _ffmepg_encoder_factory_instance = nullptr; -void ffmpeg_manager::initialize() +std::shared_ptr ffmpeg_manager::instance() { - if (!_ffmepg_encoder_factory_instance) { - _ffmepg_encoder_factory_instance = std::make_shared(); - _ffmepg_encoder_factory_instance->register_encoders(); + static std::weak_ptr winst; + static std::mutex mtx; + + std::unique_lock lock(mtx); + auto instance = winst.lock(); + if (!instance) { + instance = std::shared_ptr(new ffmpeg_manager()); + winst = instance; } + return instance; } -void ffmpeg_manager::finalize() -{ - _ffmepg_encoder_factory_instance.reset(); -} +static std::shared_ptr loader_instance; -std::shared_ptr ffmpeg_manager::get() -{ - return _ffmepg_encoder_factory_instance; -} +static auto loader = streamfx::loader( + []() { // Initalizer + loader_instance = ffmpeg_manager::instance(); + }, + []() { // Finalizer + loader_instance.reset(); + }, + streamfx::loader_priority::NORMAL); diff --git a/source/encoders/encoder-ffmpeg.hpp b/source/encoders/encoder-ffmpeg.hpp index d2a7646..9b82eee 100644 --- a/source/encoders/encoder-ffmpeg.hpp +++ b/source/encoders/encoder-ffmpeg.hpp @@ -160,6 +160,6 @@ namespace streamfx::encoder::ffmpeg { static void finalize(); - static std::shared_ptr get(); + static std::shared_ptr instance(); }; } // namespace streamfx::encoder::ffmpeg diff --git a/source/plugin.cpp b/source/plugin.cpp index 3be4f2e..2aadf31 100644 --- a/source/plugin.cpp +++ b/source/plugin.cpp @@ -15,9 +15,6 @@ #ifdef ENABLE_ENCODER_AOM_AV1 #include "encoders/encoder-aom-av1.hpp" #endif -#ifdef ENABLE_ENCODER_FFMPEG -#include "encoders/encoder-ffmpeg.hpp" -#endif #ifdef ENABLE_FILTER_AUTOFRAMING #include "filters/filter-autoframing.hpp" @@ -158,10 +155,6 @@ MODULE_EXPORT bool obs_module_load(void) { #ifdef ENABLE_ENCODER_AOM_AV1 streamfx::encoder::aom::av1::aom_av1_factory::initialize(); -#endif -#ifdef ENABLE_ENCODER_FFMPEG - using namespace streamfx::encoder::ffmpeg; - ffmpeg_manager::initialize(); #endif } @@ -301,9 +294,6 @@ MODULE_EXPORT void obs_module_unload(void) // Encoders { -#ifdef ENABLE_ENCODER_FFMPEG - streamfx::encoder::ffmpeg::ffmpeg_manager::finalize(); -#endif #ifdef ENABLE_ENCODER_AOM_AV1 streamfx::encoder::aom::av1::aom_av1_factory::finalize(); #endif