]> git.sesse.net Git - casparcg/blobdiff - core/producer/frame_producer.cpp
#430 Fixed bug where it was assumed that all Decklink devices implements the IDeckLin...
[casparcg] / core / producer / frame_producer.cpp
index f5075b782aaef1a19fbc1e5094b5feb27924e755..2b78c61778998ba10c57bf77552893eb2a830224 100644 (file)
@@ -27,7 +27,6 @@
 #include "../frame/frame_transform.h"
 
 #include "color/color_producer.h"
-#include "draw/freehand_producer.h"
 #include "separated/separated_producer.h"
 #include "variable.h"
 
@@ -44,7 +43,7 @@ namespace caspar { namespace core {
 struct frame_producer_registry::impl
 {
        std::vector<producer_factory_t>         producer_factories;
-       std::vector<producer_factory_t>         thumbnail_factories;
+       std::vector<thumbnail_producer_t>       thumbnail_producers;
        spl::shared_ptr<help_repository>        help_repo;
 
        impl(spl::shared_ptr<help_repository> help_repo)
@@ -64,9 +63,9 @@ void frame_producer_registry::register_producer_factory(std::wstring name, const
        impl_->help_repo->register_item({ L"producer" }, std::move(name), describer);
 }
 
-void frame_producer_registry::register_thumbnail_producer_factory(const producer_factory_t& factory)
+void frame_producer_registry::register_thumbnail_producer(const thumbnail_producer_t& thumbnail_producer)
 {
-       impl_->thumbnail_factories.push_back(factory);
+       impl_->thumbnail_producers.push_back(thumbnail_producer);
 }
 
 frame_producer_dependencies::frame_producer_dependencies(
@@ -128,10 +127,6 @@ struct frame_producer_base::impl
        {
                return draw_frame::still(last_frame_);
        }
-       draw_frame create_thumbnail_frame()
-       {
-               return draw_frame::empty();
-       }
 };
 
 frame_producer_base::frame_producer_base() : impl_(new impl(*this))
@@ -152,10 +147,6 @@ draw_frame frame_producer_base::last_frame()
 {
        return impl_->last_frame();
 }
-draw_frame frame_producer_base::create_thumbnail_frame()
-{
-       return impl_->create_thumbnail_frame();
-}
 
 std::future<std::wstring> frame_producer_base::call(const std::vector<std::wstring>&) 
 {
@@ -174,7 +165,7 @@ uint32_t frame_producer_base::frame_number() const
 
 variable& frame_producer_base::get_variable(const std::wstring& name)
 {
-       CASPAR_THROW_EXCEPTION(caspar_exception() 
+       CASPAR_THROW_EXCEPTION(user_error()
                        << msg_info(L"No variable called " + name + L" found in " + print()));
 }
 
@@ -198,11 +189,10 @@ const spl::shared_ptr<frame_producer>& frame_producer::empty()
                monitor::subject& monitor_output() override {static monitor::subject monitor_subject(""); return monitor_subject;}                                                                              
                std::wstring name() const override {return L"empty";}
                uint32_t frame_number() const override {return 0;}
-               std::future<std::wstring> call(const std::vector<std::wstring>& params) override{CASPAR_THROW_EXCEPTION(not_supported());}
-               variable& get_variable(const std::wstring& name) override { CASPAR_THROW_EXCEPTION(not_supported()); }
+               std::future<std::wstring> call(const std::vector<std::wstring>& params) override{CASPAR_THROW_EXCEPTION(not_implemented());}
+               variable& get_variable(const std::wstring& name) override { CASPAR_THROW_EXCEPTION(not_implemented()); }
                const std::vector<std::wstring>& get_variables() const override { static std::vector<std::wstring> empty; return empty; }
                draw_frame last_frame() {return draw_frame::empty();}
-               draw_frame create_thumbnail_frame() {return draw_frame::empty();}
                constraints& pixel_constraints() override { static constraints c; return c; }
        
                boost::property_tree::wptree info() const override
@@ -215,7 +205,19 @@ const spl::shared_ptr<frame_producer>& frame_producer::empty()
 
        static spl::shared_ptr<frame_producer> producer = spl::make_shared<empty_frame_producer>();
        return producer;
-}      
+}
+
+tbb::atomic<bool>& destroy_producers_in_separate_thread()
+{
+       static tbb::atomic<bool> state;
+
+       return state;
+}
+
+void destroy_producers_synchronously()
+{
+       destroy_producers_in_separate_thread() = false;
+}
 
 class destroy_producer_proxy : public frame_producer
 {      
@@ -224,15 +226,16 @@ public:
        destroy_producer_proxy(spl::shared_ptr<frame_producer>&& producer) 
                : producer_(std::move(producer))
        {
+               destroy_producers_in_separate_thread() = true;
        }
 
        virtual ~destroy_producer_proxy()
-       {               
+       {
                static tbb::atomic<int> counter;
                static std::once_flag counter_init_once;
                std::call_once(counter_init_once, []{ counter = 0; });
                
-               if(producer_ == core::frame_producer::empty())
+               if(producer_ == core::frame_producer::empty() || !destroy_producers_in_separate_thread())
                        return;
 
                ++counter;
@@ -245,10 +248,12 @@ public:
                        auto str = (*producer)->print();
                        try
                        {
-                               if(!producer->unique())
-                                       CASPAR_LOG(trace) << str << L" Not destroyed on asynchronous destruction thread: " << producer->use_count();
+                               ensure_gpf_handler_installed_for_thread(u8(L"Destroyer: " + str).c_str());
+
+                               if (!producer->unique())
+                                       CASPAR_LOG(debug) << str << L" Not destroyed on asynchronous destruction thread: " << producer->use_count();
                                else
-                                       CASPAR_LOG(trace) << str << L" Destroying on asynchronous destruction thread.";
+                                       CASPAR_LOG(debug) << str << L" Destroying on asynchronous destruction thread.";
                        }
                        catch(...){}
                        
@@ -278,7 +283,6 @@ public:
        void                                                                                            leading_producer(const spl::shared_ptr<frame_producer>& producer) override              {return producer_->leading_producer(producer);}
        uint32_t                                                                                        nb_frames() const override                                                                                                              {return producer_->nb_frames();}
        draw_frame                                                                                      last_frame()                                                                                                                                    {return producer_->last_frame();}
-       draw_frame                                                                                      create_thumbnail_frame()                                                                                                                {return producer_->create_thumbnail_frame();}
        monitor::subject&                                                                       monitor_output() override                                                                                                               {return producer_->monitor_output();}                                                                           
        bool                                                                                            collides(double x, double y) const override                                                                             {return producer_->collides(x, y);}
        void                                                                                            on_interaction(const interaction_event::ptr& event)     override                                        {return producer_->on_interaction(event);}
@@ -293,7 +297,7 @@ spl::shared_ptr<core::frame_producer> create_destroy_proxy(spl::shared_ptr<core:
 spl::shared_ptr<core::frame_producer> do_create_producer(const frame_producer_dependencies& dependencies, const std::vector<std::wstring>& params, const std::vector<producer_factory_t>& factories, bool throw_on_fail = false)
 {
        if(params.empty())
-               CASPAR_THROW_EXCEPTION(invalid_argument() << arg_name_info("params") << arg_value_info(""));
+               CASPAR_THROW_EXCEPTION(invalid_argument() << msg_info("params cannot be empty"));
        
        auto producer = frame_producer::empty();
        std::any_of(factories.begin(), factories.end(), [&](const producer_factory_t& factory) -> bool
@@ -302,6 +306,10 @@ spl::shared_ptr<core::frame_producer> do_create_producer(const frame_producer_de
                        {
                                producer = factory(dependencies, params);
                        }
+                       catch (user_error&)
+                       {
+                               throw;
+                       }
                        catch(...)
                        {
                                if(throw_on_fail)
@@ -315,44 +323,44 @@ spl::shared_ptr<core::frame_producer> do_create_producer(const frame_producer_de
        if(producer == frame_producer::empty())
                producer = create_color_producer(dependencies.frame_factory, params);
 
-       if (producer == frame_producer::empty())
-               producer = create_freehand_producer(dependencies.frame_factory, params);
-
        if(producer == frame_producer::empty())
                return producer;
                
        return producer;
 }
 
-spl::shared_ptr<core::frame_producer> frame_producer_registry::create_thumbnail_producer(const frame_producer_dependencies& dependencies, const std::wstring& media_file) const
+draw_frame do_create_thumbnail_frame(
+               const frame_producer_dependencies& dependencies,
+               const std::wstring& media_file,
+               const std::vector<thumbnail_producer_t>& thumbnail_producers)
+{
+       for (auto& thumbnail_producer : thumbnail_producers)
+       {
+               auto frame = thumbnail_producer(dependencies, media_file);
+
+               if (frame != draw_frame::empty())
+                       return frame;
+       }
+
+       return draw_frame::empty();
+}
+
+draw_frame frame_producer_registry::create_thumbnail(const frame_producer_dependencies& dependencies, const std::wstring& media_file) const
 {
-       auto& thumbnail_factories = impl_->thumbnail_factories;
+       auto& thumbnail_producers = impl_->thumbnail_producers;
        std::vector<std::wstring> params;
        params.push_back(media_file);
 
-       auto producer = do_create_producer(dependencies, params, thumbnail_factories, true);
-       auto key_producer = frame_producer::empty();
-  
-       try // to find a key file.
-       {
-               auto params_copy = params;
-               if (params_copy.size() > 0)
-               {
-                       params_copy[0] += L"_A";
-                       key_producer = do_create_producer(dependencies, params_copy, thumbnail_factories, true);
-                       if (key_producer == frame_producer::empty())
-                       {
-                               params_copy[0] += L"LPHA";
-                               key_producer = do_create_producer(dependencies, params_copy, thumbnail_factories, true);
-                       }
-               }
-       }
-       catch(...){}
+       auto fill_frame = do_create_thumbnail_frame(dependencies, media_file, thumbnail_producers);
+       auto key_frame = do_create_thumbnail_frame(dependencies, media_file + L"_A", thumbnail_producers);
 
-       if (producer != frame_producer::empty() && key_producer != frame_producer::empty())
-               return create_separated_producer(producer, key_producer);
+       if (key_frame == draw_frame::empty())
+               key_frame = do_create_thumbnail_frame(dependencies, media_file + L"_ALPHA", thumbnail_producers);
   
-       return producer;
+       if (fill_frame != draw_frame::empty() && key_frame != draw_frame::empty())
+               return draw_frame::mask(fill_frame, key_frame);
+  
+       return fill_frame;
 }
 
 spl::shared_ptr<core::frame_producer> frame_producer_registry::create_producer(const frame_producer_dependencies& dependencies, const std::vector<std::wstring>& params) const