\r
#include <tbb/parallel_for_each.h>\r
\r
+#include <functional>\r
#include <map>\r
#include <vector>\r
\r
namespace caspar { namespace core {\r
\r
struct stage::impl : public std::enable_shared_from_this<impl>\r
-{ \r
+{ \r
+ spl::shared_ptr<diagnostics::graph> graph_;\r
+ spl::shared_ptr<monitor::subject> event_subject_;\r
std::map<int, layer> layers_; \r
- std::map<int, tweened_transform> transforms_; \r
+ std::map<int, tweened_transform> tweens_; \r
executor executor_;\r
public:\r
- impl() : executor_(L"stage")\r
+ impl(spl::shared_ptr<diagnostics::graph> graph) \r
+ : graph_(std::move(graph))\r
+ , executor_(L"stage")\r
{\r
+ graph_->set_color("produce-time", diagnostics::color(0.0f, 1.0f, 0.0f));\r
}\r
\r
std::map<int, spl::shared_ptr<draw_frame>> operator()(const struct video_format_desc& format_desc)\r
{ \r
return executor_.invoke([=]() -> std::map<int, spl::shared_ptr<draw_frame>>\r
{\r
- std::map<int, spl::shared_ptr<class draw_frame>> frames;\r
+ boost::timer frame_timer;\r
\r
+ std::map<int, spl::shared_ptr<class draw_frame>> frames;\r
+ \r
try\r
- { \r
- BOOST_FOREACH(auto& layer, layers_) \r
- frames[layer.first] = draw_frame::empty(); \r
-\r
- auto format_desc2 = format_desc;\r
+ { \r
+ std::vector<int> indices;\r
\r
- tbb::parallel_for_each(layers_.begin(), layers_.end(), [&](std::map<int, layer>::value_type& layer)\r
+ BOOST_FOREACH(auto& layer, layers_) \r
{\r
- auto transform = transforms_[layer.first].fetch_and_tick(1);\r
-\r
- frame_producer::flags flags = frame_producer::flags::none;\r
- if(format_desc2.field_mode != field_mode::progressive)\r
- {\r
- flags |= std::abs(transform.fill_scale[1] - 1.0) > 0.0001 ? frame_producer::flags::deinterlace : frame_producer::flags::none;\r
- flags |= std::abs(transform.fill_translation[1]) > 0.0001 ? frame_producer::flags::deinterlace : frame_producer::flags::none;\r
- }\r
-\r
- if(transform.is_key)\r
- flags |= frame_producer::flags::alpha_only;\r
+ frames[layer.first] = draw_frame::empty(); \r
+ indices.push_back(layer.first);\r
+ } \r
\r
- auto frame = layer.second.receive(flags); \r
- \r
- auto frame1 = spl::make_shared<core::draw_frame>(frame);\r
- frame1->get_frame_transform() = transform;\r
-\r
- if(format_desc2.field_mode != core::field_mode::progressive)\r
- { \r
- auto frame2 = spl::make_shared<core::draw_frame>(frame);\r
- frame2->get_frame_transform() = transforms_[layer.first].fetch_and_tick(1);\r
- frame1 = core::draw_frame::interlace(frame1, frame2, format_desc2.field_mode);\r
- }\r
-\r
- frames[layer.first] = frame1;\r
- }); \r
+ // WORKAROUND: Compiler doesn't seem to like lambda.\r
+ tbb::parallel_for_each(indices.begin(), indices.end(), std::bind(&stage::impl::draw, this, std::placeholders::_1, std::ref(format_desc), std::ref(frames)));\r
}\r
catch(...)\r
{\r
layers_.clear();\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
} \r
+ \r
+ graph_->set_value("produce-time", frame_timer.elapsed()*format_desc.fps*0.5);\r
+ *event_subject_ << monitor::event("profiler/time") % frame_timer.elapsed() % (1.0/format_desc.fps);\r
\r
return frames;\r
});\r
}\r
+\r
+ void draw(int index, const video_format_desc& format_desc, std::map<int, spl::shared_ptr<draw_frame>>& frames)\r
+ {\r
+ auto& layer = layers_[index];\r
+ auto& tween = tweens_[index];\r
+ auto transform = tween.fetch_and_tick(1);\r
+\r
+ frame_producer::flags flags = frame_producer::flags::none;\r
+ if(format_desc.field_mode != field_mode::progressive)\r
+ {\r
+ flags |= std::abs(transform.fill_scale[1] - 1.0) > 0.0001 ? frame_producer::flags::deinterlace : frame_producer::flags::none;\r
+ flags |= std::abs(transform.fill_translation[1]) > 0.0001 ? frame_producer::flags::deinterlace : frame_producer::flags::none;\r
+ }\r
+\r
+ if(transform.is_key)\r
+ flags |= frame_producer::flags::alpha_only;\r
+\r
+ auto frame = layer.receive(flags, format_desc); \r
+ \r
+ frame = spl::make_shared<core::draw_frame>(frame);\r
+ frame->get_frame_transform() = transform;\r
+\r
+ if(format_desc.field_mode != core::field_mode::progressive)\r
+ { \r
+ auto frame2 = spl::make_shared<core::draw_frame>(frame);\r
+ frame2->get_frame_transform() = tween.fetch_and_tick(1);\r
+ frame = core::draw_frame::interlace(frame, frame2, format_desc.field_mode);\r
+ }\r
+\r
+ frames[index] = frame;\r
+ }\r
+\r
+ layer& get_layer(int index)\r
+ {\r
+ auto it = layers_.find(index);\r
+ if(it == std::end(layers_))\r
+ {\r
+ it = layers_.insert(std::make_pair(index, layer(index))).first;\r
+ it->second.subscribe(event_subject_);\r
+ }\r
+ return it->second;\r
+ }\r
\r
void apply_transforms(const std::vector<std::tuple<int, stage::transform_func_t, unsigned int, tweener>>& transforms)\r
{\r
{\r
BOOST_FOREACH(auto& transform, transforms)\r
{\r
- auto src = transforms_[std::get<0>(transform)].fetch();\r
+ auto src = tweens_[std::get<0>(transform)].fetch();\r
auto dst = std::get<1>(transform)(src);\r
- transforms_[std::get<0>(transform)] = tweened_transform(src, dst, std::get<2>(transform), std::get<3>(transform));\r
+ tweens_[std::get<0>(transform)] = tweened_transform(src, dst, std::get<2>(transform), std::get<3>(transform));\r
}\r
}, task_priority::high_priority);\r
}\r
{\r
executor_.begin_invoke([=]\r
{\r
- auto src = transforms_[index].fetch();\r
+ auto src = tweens_[index].fetch();\r
auto dst = transform(src);\r
- transforms_[index] = tweened_transform(src, dst, mix_duration, tween);\r
+ tweens_[index] = tweened_transform(src, dst, mix_duration, tween);\r
}, task_priority::high_priority);\r
}\r
\r
{\r
executor_.begin_invoke([=]\r
{\r
- transforms_.erase(index);\r
+ tweens_.erase(index);\r
}, task_priority::high_priority);\r
}\r
\r
{\r
executor_.begin_invoke([=]\r
{\r
- transforms_.clear();\r
+ tweens_.clear();\r
}, task_priority::high_priority);\r
}\r
\r
- void load(int index, const spl::shared_ptr<frame_producer>& producer, int auto_play_delta)\r
+ void load(int index, const spl::shared_ptr<frame_producer>& producer, const boost::optional<int32_t>& auto_play_delta)\r
{\r
executor_.begin_invoke([=]\r
{\r
- layers_[index].load(producer, auto_play_delta);\r
+ get_layer(index).load(producer, auto_play_delta);\r
}, task_priority::high_priority);\r
}\r
\r
}, task_priority::high_priority);\r
} \r
\r
- void swap_layers(const spl::shared_ptr<stage>& other)\r
+ void swap_layers(stage& other)\r
{\r
- if(other->impl_.get() == this)\r
+ auto other_impl = other.impl_;\r
+\r
+ if(other_impl.get() == this)\r
return;\r
\r
auto func = [=]\r
{\r
- std::swap(layers_, other->impl_->layers_);\r
+ auto layers = layers_ | boost::adaptors::map_values;\r
+ auto other_layers = other_impl->layers_ | boost::adaptors::map_values;\r
+\r
+ BOOST_FOREACH(auto& layer, layers)\r
+ layer.unsubscribe(event_subject_);\r
+ \r
+ BOOST_FOREACH(auto& layer, other_layers)\r
+ layer.unsubscribe(event_subject_);\r
+ \r
+ std::swap(layers_, other_impl->layers_);\r
+ \r
+ BOOST_FOREACH(auto& layer, layers)\r
+ layer.subscribe(event_subject_);\r
+ \r
+ BOOST_FOREACH(auto& layer, other_layers)\r
+ layer.subscribe(event_subject_);\r
}; \r
executor_.begin_invoke([=]\r
{\r
- other->impl_->executor_.invoke(func, task_priority::high_priority);\r
+ other_impl->executor_.invoke(func, task_priority::high_priority);\r
}, task_priority::high_priority);\r
}\r
\r
}, task_priority::high_priority);\r
}\r
\r
- void swap_layer(int index, int other_index, const spl::shared_ptr<stage>& other)\r
+ void swap_layer(int index, int other_index, stage& other)\r
{\r
- if(other->impl_.get() == this)\r
+ auto other_impl = other.impl_;\r
+\r
+ if(other_impl.get() == this)\r
swap_layer(index, other_index);\r
else\r
{\r
auto func = [=]\r
{\r
- std::swap(layers_[index], other->impl_->layers_[other_index]);\r
+ auto& my_layer = get_layer(index);\r
+ auto& other_layer = other_impl->get_layer(other_index);\r
+\r
+ my_layer.unsubscribe(event_subject_);\r
+ other_layer.unsubscribe(other_impl->event_subject_);\r
+\r
+ std::swap(my_layer, other_layer);\r
+\r
+ my_layer.subscribe(event_subject_);\r
+ other_layer.subscribe(other_impl->event_subject_);\r
}; \r
executor_.begin_invoke([=]\r
{\r
- other->impl_->executor_.invoke(func, task_priority::high_priority);\r
+ other_impl->executor_.invoke(func, task_priority::high_priority);\r
}, task_priority::high_priority);\r
}\r
}\r
} \r
};\r
\r
-stage::stage() : impl_(new impl()){}\r
+stage::stage(spl::shared_ptr<diagnostics::graph> graph) : impl_(new impl(std::move(graph))){}\r
void stage::apply_transforms(const std::vector<stage::transform_tuple_t>& transforms){impl_->apply_transforms(transforms);}\r
void stage::apply_transform(int index, const std::function<core::frame_transform(core::frame_transform)>& transform, unsigned int mix_duration, const tweener& tween){impl_->apply_transform(index, transform, mix_duration, tween);}\r
void stage::clear_transforms(int index){impl_->clear_transforms(index);}\r
void stage::clear_transforms(){impl_->clear_transforms();}\r
-void stage::load(int index, const spl::shared_ptr<frame_producer>& producer, int auto_play_delta){impl_->load(index, producer, auto_play_delta);}\r
+void stage::load(int index, const spl::shared_ptr<frame_producer>& producer, const boost::optional<int32_t>& auto_play_delta){impl_->load(index, producer, auto_play_delta);}\r
void stage::pause(int index){impl_->pause(index);}\r
void stage::play(int index){impl_->play(index);}\r
void stage::stop(int index){impl_->stop(index);}\r
void stage::clear(int index){impl_->clear(index);}\r
void stage::clear(){impl_->clear();}\r
-void stage::swap_layers(const spl::shared_ptr<stage>& other){impl_->swap_layers(other);}\r
+void stage::swap_layers(stage& other){impl_->swap_layers(other);}\r
void stage::swap_layer(int index, int other_index){impl_->swap_layer(index, other_index);}\r
-void stage::swap_layer(int index, int other_index, const spl::shared_ptr<stage>& other){impl_->swap_layer(index, other_index, other);}\r
+void stage::swap_layer(int index, int other_index, stage& other){impl_->swap_layer(index, other_index, other);}\r
boost::unique_future<spl::shared_ptr<frame_producer>> stage::foreground(int index) {return impl_->foreground(index);}\r
boost::unique_future<spl::shared_ptr<frame_producer>> stage::background(int index) {return impl_->background(index);}\r
boost::unique_future<boost::property_tree::wptree> stage::info() const{return impl_->info();}\r
boost::unique_future<boost::property_tree::wptree> stage::info(int index) const{return impl_->info(index);}\r
std::map<int, spl::shared_ptr<class draw_frame>> stage::operator()(const video_format_desc& format_desc){return (*impl_)(format_desc);}\r
+void stage::subscribe(const monitor::observable::observer_ptr& o) {impl_->event_subject_->subscribe(o);}\r
+void stage::unsubscribe(const monitor::observable::observer_ptr& o) {impl_->event_subject_->unsubscribe(o);}\r
}}
\ No newline at end of file
projects / casparcg / blobdiff