]> git.sesse.net Git - casparcg/blobdiff - core/producer/stage.cpp
[stage] #575 Don't submit double amount of audio samples for interlaced modes
[casparcg] / core / producer / stage.cpp
index cda09dac54d3980115297b036bfb3bb382cc7cf1..a0b16806d5aa03c348c696d7f191ba7b76aa0187 100644 (file)
@@ -28,6 +28,7 @@
 #include "../frame/draw_frame.h"
 #include "../frame/frame_factory.h"
 #include "../interaction/interaction_aggregator.h"
+#include "../consumer/write_frame_consumer.h"
 
 #include <common/executor.h>
 #include <common/future.h>
 #include <future>
 
 namespace caspar { namespace core {
-       
+
 struct stage::impl : public std::enable_shared_from_this<impl>
-{                              
-       spl::shared_ptr<diagnostics::graph>                                                     graph_;
-       spl::shared_ptr<monitor::subject>                                                       monitor_subject_;
-       //reactive::basic_subject<std::map<int, draw_frame>>            frames_subject_;
-       std::map<int, layer>                                                                            layers_;        
-       std::map<int, tweened_transform>                                                        tweens_;
-       interaction_aggregator                                                                          aggregator_;
-       executor                                                                                                        executor_;
+{
+       int                                                                                                                                             channel_index_;
+       spl::shared_ptr<diagnostics::graph>                                                                             graph_;
+       spl::shared_ptr<monitor::subject>                                                                               monitor_subject_        = spl::make_shared<monitor::subject>("/stage");
+       std::map<int, layer>                                                                                                    layers_;
+       std::map<int, tweened_transform>                                                                                tweens_;
+       interaction_aggregator                                                                                                  aggregator_;
+       // map of layer -> map of tokens (src ref) -> layer_consumer
+       std::map<int, std::map<void*, spl::shared_ptr<write_frame_consumer>>>   layer_consumers_;
+       executor                                                                                                                                executor_                       { L"stage " + boost::lexical_cast<std::wstring>(channel_index_) };
 public:
-       impl(spl::shared_ptr<diagnostics::graph> graph) 
-               : graph_(std::move(graph))
-               , monitor_subject_(spl::make_shared<monitor::subject>("/stage"))
+       impl(int channel_index, spl::shared_ptr<diagnostics::graph> graph)
+               : channel_index_(channel_index)
+               , graph_(std::move(graph))
                , aggregator_([=] (double x, double y) { return collission_detect(x, y); })
-               , executor_(L"stage")
        {
                graph_->set_color("produce-time", diagnostics::color(0.0f, 1.0f, 0.0f));
        }
-               
+
        std::map<int, draw_frame> operator()(const video_format_desc& format_desc)
-       {               
+       {
                caspar::timer frame_timer;
 
                auto frames = executor_.invoke([=]() -> std::map<int, draw_frame>
                {
 
                        std::map<int, draw_frame> frames;
-                       
+
                        try
-                       {                       
+                       {
                                std::vector<int> indices;
 
-                               for (auto& layer : layers_)     
+                               for (auto& layer : layers_)
                                {
-                                       frames[layer.first] = draw_frame::empty();      
+                                       // Prevent race conditions in parallel for each later
+                                       frames[layer.first] = draw_frame::empty();
+                                       tweens_[layer.first];
+                                       layer_consumers_[layer.first];
+
                                        indices.push_back(layer.first);
                                }
 
@@ -96,14 +102,14 @@ public:
                        {
                                layers_.clear();
                                CASPAR_LOG_CURRENT_EXCEPTION();
-                       }       
-                       
+                       }
+
 
                        return frames;
                });
-               
+
                //frames_subject_ << frames;
-               
+
                graph_->set_value("produce-time", frame_timer.elapsed()*format_desc.fps*0.5);
                *monitor_subject_ << monitor::message("/profiler/time") % frame_timer.elapsed() % (1.0/format_desc.fps);
 
@@ -114,15 +120,28 @@ public:
        {
                auto& layer             = layers_[index];
                auto& tween             = tweens_[index];
-                               
-               auto frame  = layer.receive(format_desc);                                       
+               auto& consumers = layer_consumers_[index];
+
+               auto frame  = layer.receive(format_desc);
+
+               if (!consumers.empty())
+               {
+                       auto consumer_it = consumers | boost::adaptors::map_values;
+                       tbb::parallel_for_each(consumer_it.begin(), consumer_it.end(), [&](decltype(*consumer_it.begin()) layer_consumer)
+                       {
+                               layer_consumer->send(frame);
+                       });
+               }
+
                auto frame1 = frame;
+
                frame1.transform() *= tween.fetch_and_tick(1);
 
                if(format_desc.field_mode != core::field_mode::progressive)
-               {                               
+               {
                        auto frame2 = frame;
                        frame2.transform() *= tween.fetch_and_tick(1);
+                       frame2.transform().audio_transform.volume = 0.0;
                        frame1 = core::draw_frame::interlace(frame1, frame2, format_desc.field_mode);
                }
 
@@ -139,20 +158,21 @@ public:
                }
                return it->second;
        }
-               
+
        std::future<void> apply_transforms(const std::vector<std::tuple<int, stage::transform_func_t, unsigned int, tweener>>& transforms)
        {
                return executor_.begin_invoke([=]
                {
                        for (auto& transform : transforms)
                        {
-                               auto src = tweens_[std::get<0>(transform)].fetch();
-                               auto dst = std::get<1>(transform)(src);
+                               auto& tween = tweens_[std::get<0>(transform)];
+                               auto src = tween.fetch();
+                               auto dst = std::get<1>(transform)(tween.dest());
                                tweens_[std::get<0>(transform)] = tweened_transform(src, dst, std::get<2>(transform), std::get<3>(transform));
                        }
                }, task_priority::high_priority);
        }
-                                               
+
        std::future<void> apply_transform(int index, const stage::transform_func_t& transform, unsigned int mix_duration, const tweener& tween)
        {
                return executor_.begin_invoke([=]
@@ -191,20 +211,28 @@ public:
        {
                return executor_.begin_invoke([=]
                {
-                       get_layer(index).load(producer, preview, auto_play_delta);                      
+                       get_layer(index).load(producer, preview, auto_play_delta);
                }, task_priority::high_priority);
        }
 
        std::future<void> pause(int index)
-       {               
+       {
                return executor_.begin_invoke([=]
                {
                        get_layer(index).pause();
                }, task_priority::high_priority);
        }
 
+       std::future<void> resume(int index)
+       {
+               return executor_.begin_invoke([=]
+               {
+                       get_layer(index).resume();
+               }, task_priority::high_priority);
+       }
+
        std::future<void> play(int index)
-       {               
+       {
                return executor_.begin_invoke([=]
                {
                        get_layer(index).play();
@@ -212,7 +240,7 @@ public:
        }
 
        std::future<void> stop(int index)
-       {               
+       {
                return executor_.begin_invoke([=]
                {
                        get_layer(index).stop();
@@ -226,16 +254,16 @@ public:
                        layers_.erase(index);
                }, task_priority::high_priority);
        }
-               
+
        std::future<void> clear()
        {
                return executor_.begin_invoke([=]
                {
                        layers_.clear();
                }, task_priority::high_priority);
-       }       
-               
-       std::future<void> swap_layers(stage& other)
+       }
+
+       std::future<void> swap_layers(stage& other, bool swap_transforms)
        {
                auto other_impl = other.impl_;
 
@@ -243,7 +271,7 @@ public:
                {
                        return make_ready_future();
                }
-               
+
                auto func = [=]
                {
                        auto layers                     = layers_ | boost::adaptors::map_values;
@@ -251,18 +279,21 @@ public:
 
                        for (auto& layer : layers)
                                layer.monitor_output().detach_parent();
-                       
+
                        for (auto& layer : other_layers)
                                layer.monitor_output().detach_parent();
-                       
+
                        std::swap(layers_, other_impl->layers_);
-                                               
+
                        for (auto& layer : layers)
                                layer.monitor_output().attach_parent(monitor_subject_);
-                       
+
                        for (auto& layer : other_layers)
                                layer.monitor_output().attach_parent(monitor_subject_);
-               };              
+
+                       if (swap_transforms)
+                               std::swap(tweens_, other_impl->tweens_);
+               };
 
                return executor_.begin_invoke([=]
                {
@@ -270,20 +301,23 @@ public:
                }, task_priority::high_priority);
        }
 
-       std::future<void> swap_layer(int index, int other_index)
+       std::future<void> swap_layer(int index, int other_index, bool swap_transforms)
        {
                return executor_.begin_invoke([=]
                {
                        std::swap(get_layer(index), get_layer(other_index));
+
+                       if (swap_transforms)
+                               std::swap(tweens_[index], tweens_[other_index]);
                }, task_priority::high_priority);
        }
 
-       std::future<void> swap_layer(int index, int other_index, stage& other)
+       std::future<void> swap_layer(int index, int other_index, stage& other, bool swap_transforms)
        {
                auto other_impl = other.impl_;
 
                if(other_impl.get() == this)
-                       return swap_layer(index, other_index);
+                       return swap_layer(index, other_index, swap_transforms);
                else
                {
                        auto func = [=]
@@ -298,7 +332,14 @@ public:
 
                                my_layer.monitor_output().attach_parent(monitor_subject_);
                                other_layer.monitor_output().attach_parent(other_impl->monitor_subject_);
-                       };              
+
+                               if (swap_transforms)
+                               {
+                                       auto& my_tween          = tweens_[index];
+                                       auto& other_tween       = other_impl->tweens_[other_index];
+                                       std::swap(my_tween, other_tween);
+                               }
+                       };
 
                        return executor_.begin_invoke([=]
                        {
@@ -306,7 +347,28 @@ public:
                        }, task_priority::high_priority);
                }
        }
-               
+
+       void add_layer_consumer(void* token, int layer, const spl::shared_ptr<write_frame_consumer>& layer_consumer)
+       {
+               executor_.begin_invoke([=]
+               {
+                       layer_consumers_[layer].insert(std::make_pair(token, layer_consumer));
+               }, task_priority::high_priority);
+       }
+
+       void remove_layer_consumer(void* token, int layer)
+       {
+               executor_.begin_invoke([=]
+               {
+                       auto& layer_map = layer_consumers_[layer];
+                       layer_map.erase(token);
+                       if (layer_map.empty())
+                       {
+                               layer_consumers_.erase(layer);
+                       }
+               }, task_priority::high_priority);
+       }
+
        std::future<std::shared_ptr<frame_producer>> foreground(int index)
        {
                return executor_.begin_invoke([=]() -> std::shared_ptr<frame_producer>
@@ -314,7 +376,7 @@ public:
                        return get_layer(index).foreground();
                }, task_priority::high_priority);
        }
-       
+
        std::future<std::shared_ptr<frame_producer>> background(int index)
        {
                return executor_.begin_invoke([=]() -> std::shared_ptr<frame_producer>
@@ -328,9 +390,9 @@ public:
                return executor_.begin_invoke([this]() -> boost::property_tree::wptree
                {
                        boost::property_tree::wptree info;
-                       for (auto& layer : layers_)                     
+                       for (auto& layer : layers_)
                                info.add_child(L"layers.layer", layer.second.info())
-                                       .add(L"index", layer.first);    
+                                       .add(L"index", layer.first);
                        return info;
                }, task_priority::high_priority);
        }
@@ -341,8 +403,29 @@ public:
                {
                        return get_layer(index).info();
                }, task_priority::high_priority);
-       }               
-       
+       }
+
+       std::future<boost::property_tree::wptree> delay_info()
+       {
+               return std::move(executor_.begin_invoke([this]() -> boost::property_tree::wptree
+               {
+                       boost::property_tree::wptree info;
+
+                       for (auto& layer : layers_)
+                               info.add_child(L"layer", layer.second.delay_info()).add(L"index", layer.first);
+
+                       return info;
+               }, task_priority::high_priority));
+       }
+
+       std::future<boost::property_tree::wptree> delay_info(int index)
+       {
+               return std::move(executor_.begin_invoke([=]() -> boost::property_tree::wptree
+               {
+                       return get_layer(index).delay_info();
+               }, task_priority::high_priority));
+       }
+
        std::future<std::wstring> call(int index, const std::vector<std::wstring>& params)
        {
                return flatten(executor_.begin_invoke([=]
@@ -380,7 +463,7 @@ public:
        }
 };
 
-stage::stage(spl::shared_ptr<diagnostics::graph> graph) : impl_(new impl(std::move(graph))){}
+stage::stage(int channel_index, spl::shared_ptr<diagnostics::graph> graph) : impl_(new impl(channel_index, std::move(graph))){}
 std::future<std::wstring> stage::call(int index, const std::vector<std::wstring>& params){return impl_->call(index, params);}
 std::future<void> stage::apply_transforms(const std::vector<stage::transform_tuple_t>& transforms){ return impl_->apply_transforms(transforms); }
 std::future<void> stage::apply_transform(int index, const std::function<core::frame_transform(core::frame_transform)>& transform, unsigned int mix_duration, const tweener& tween){ return impl_->apply_transform(index, transform, mix_duration, tween); }
@@ -389,20 +472,22 @@ std::future<void> stage::clear_transforms(){ return impl_->clear_transforms(); }
 std::future<frame_transform> stage::get_current_transform(int index){ return impl_->get_current_transform(index); }
 std::future<void> stage::load(int index, const spl::shared_ptr<frame_producer>& producer, bool preview, const boost::optional<int32_t>& auto_play_delta){ return impl_->load(index, producer, preview, auto_play_delta); }
 std::future<void> stage::pause(int index){ return impl_->pause(index); }
+std::future<void> stage::resume(int index){ return impl_->resume(index); }
 std::future<void> stage::play(int index){ return impl_->play(index); }
 std::future<void> stage::stop(int index){ return impl_->stop(index); }
 std::future<void> stage::clear(int index){ return impl_->clear(index); }
 std::future<void> stage::clear(){ return impl_->clear(); }
-std::future<void> stage::swap_layers(stage& other){ return impl_->swap_layers(other); }
-std::future<void> stage::swap_layer(int index, int other_index){ return impl_->swap_layer(index, other_index); }
-std::future<void> stage::swap_layer(int index, int other_index, stage& other){ return impl_->swap_layer(index, other_index, other); }
-std::future<std::shared_ptr<frame_producer>> stage::foreground(int index) { return impl_->foreground(index); }
+std::future<void> stage::swap_layers(stage& other, bool swap_transforms){ return impl_->swap_layers(other, swap_transforms); }
+std::future<void> stage::swap_layer(int index, int other_index, bool swap_transforms){ return impl_->swap_layer(index, other_index, swap_transforms); }
+std::future<void> stage::swap_layer(int index, int other_index, stage& other, bool swap_transforms){ return impl_->swap_layer(index, other_index, other, swap_transforms); }
+void stage::add_layer_consumer(void* token, int layer, const spl::shared_ptr<write_frame_consumer>& layer_consumer){ impl_->add_layer_consumer(token, layer, layer_consumer); }
+void stage::remove_layer_consumer(void* token, int layer){ impl_->remove_layer_consumer(token, layer); }std::future<std::shared_ptr<frame_producer>> stage::foreground(int index) { return impl_->foreground(index); }
 std::future<std::shared_ptr<frame_producer>> stage::background(int index) { return impl_->background(index); }
 std::future<boost::property_tree::wptree> stage::info() const{ return impl_->info(); }
 std::future<boost::property_tree::wptree> stage::info(int index) const{ return impl_->info(index); }
-std::map<int, draw_frame> stage::operator()(const video_format_desc& format_desc){return (*impl_)(format_desc);}
+std::future<boost::property_tree::wptree> stage::delay_info() const{ return impl_->delay_info(); }
+std::future<boost::property_tree::wptree> stage::delay_info(int index) const{ return impl_->delay_info(index); }
+std::map<int, draw_frame> stage::operator()(const video_format_desc& format_desc){ return (*impl_)(format_desc); }
 monitor::subject& stage::monitor_output(){return *impl_->monitor_subject_;}
-//void stage::subscribe(const frame_observable::observer_ptr& o) {impl_->frames_subject_.subscribe(o);}
-//void stage::unsubscribe(const frame_observable::observer_ptr& o) {impl_->frames_subject_.unsubscribe(o);}
 void stage::on_interaction(const interaction_event::ptr& event) { impl_->on_interaction(event); }
 }}