X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fvideo_channel.cpp;h=a0ac2c2012fd249ac76d0fcd85a8483826ee7e86;hb=9e4b08cde6c6de9e83a3fff42d90affc3cd8e5bc;hp=9eb8998bb37b6a0e114b9b10109cf7f668d98f59;hpb=36b3cca88192e4a866cbc3156a33ffe3b168a486;p=casparcg diff --git a/core/video_channel.cpp b/core/video_channel.cpp index 9eb8998bb..a0ac2c201 100644 --- a/core/video_channel.cpp +++ b/core/video_channel.cpp @@ -31,12 +31,14 @@ #include "frame/frame.h" #include "frame/draw_frame.h" #include "frame/frame_factory.h" +#include "frame/audio_channel_layout.h" #include #include #include #include #include +#include #include #include @@ -47,6 +49,7 @@ #include #include +#include namespace caspar { namespace core { @@ -58,27 +61,39 @@ struct video_channel::impl final mutable tbb::spin_mutex format_desc_mutex_; core::video_format_desc format_desc_; - - const spl::shared_ptr graph_ = [](int index) - { - core::diagnostics::scoped_call_context save; - core::diagnostics::call_context::for_thread().video_channel = index; - return spl::make_shared(); - }(index_); + mutable tbb::spin_mutex channel_layout_mutex_; + core::audio_channel_layout channel_layout_; + + const spl::shared_ptr graph_ = [](int index) + { + core::diagnostics::scoped_call_context save; + core::diagnostics::call_context::for_thread().video_channel = index; + return spl::make_shared(); + }(index_); caspar::core::output output_; + std::future output_ready_for_frame_ = make_ready_future(); spl::shared_ptr image_mixer_; caspar::core::mixer mixer_; - caspar::core::stage stage_; + caspar::core::stage stage_; + + mutable tbb::spin_mutex tick_listeners_mutex_; + int64_t last_tick_listener_id = 0; + std::unordered_map> tick_listeners_; - executor executor_ { L"video_channel " + boost::lexical_cast(index_) }; + executor executor_ { L"video_channel " + boost::lexical_cast(index_) }; public: - impl(int index, const core::video_format_desc& format_desc, std::unique_ptr image_mixer) + impl( + int index, + const core::video_format_desc& format_desc, + const core::audio_channel_layout& channel_layout, + std::unique_ptr image_mixer) : monitor_subject_(spl::make_shared( "/channel/" + boost::lexical_cast(index))) , index_(index) , format_desc_(format_desc) - , output_(graph_, format_desc, index) + , channel_layout_(channel_layout) + , output_(graph_, format_desc, channel_layout, index) , image_mixer_(std::move(image_mixer)) , mixer_(index, graph_, image_mixer_) , stage_(index, graph_) @@ -86,15 +101,21 @@ public: graph_->set_color("tick-time", caspar::diagnostics::color(0.0f, 0.6f, 0.9f)); graph_->set_text(print()); caspar::diagnostics::register_graph(graph_); - + output_.monitor_output().attach_parent(monitor_subject_); + mixer_.monitor_output().attach_parent(monitor_subject_); stage_.monitor_output().attach_parent(monitor_subject_); executor_.begin_invoke([=]{tick();}); CASPAR_LOG(info) << print() << " Successfully Initialized."; } - + + ~impl() + { + CASPAR_LOG(info) << print() << " Uninitializing."; + } + core::video_format_desc video_format_desc() const { return lock(format_desc_mutex_, [&] @@ -102,7 +123,7 @@ public: return format_desc_; }); } - + void video_format_desc(const core::video_format_desc& format_desc) { lock(format_desc_mutex_, [&] @@ -112,31 +133,68 @@ public: }); } + core::audio_channel_layout audio_channel_layout() const + { + return lock(channel_layout_mutex_, [&] + { + return channel_layout_; + }); + } + + void audio_channel_layout(const core::audio_channel_layout& channel_layout) + { + lock(channel_layout_mutex_, [&] + { + channel_layout_ = channel_layout; + stage_.clear(); + }); + } + + void invoke_tick_listeners() + { + auto listeners = lock(tick_listeners_mutex_, [=] { return tick_listeners_; }); + + for (auto listener : listeners) + { + try + { + listener.second(); + } + catch (...) + { + CASPAR_LOG_CURRENT_EXCEPTION(); + } + } + } + void tick() { try { + invoke_tick_listeners(); + + auto format_desc = video_format_desc(); + auto channel_layout = audio_channel_layout(); - auto format_desc = video_format_desc(); - caspar::timer frame_timer; // Produce - + auto stage_frames = stage_(format_desc); - + // Mix - - auto mixed_frame = mixer_(std::move(stage_frames), format_desc); - + + auto mixed_frame = mixer_(std::move(stage_frames), format_desc, channel_layout); + // Consume - - output_(std::move(mixed_frame), format_desc); - + + output_ready_for_frame_ = output_(std::move(mixed_frame), format_desc, channel_layout); + output_ready_for_frame_.get(); + auto frame_time = frame_timer.elapsed()*format_desc.fps*0.5; graph_->set_value("tick-time", frame_time); - *monitor_subject_ << monitor::message("/profiler/time") % frame_timer.elapsed() % (1.0/format_desc_.fps) + *monitor_subject_ << monitor::message("/profiler/time") % frame_timer.elapsed() % (1.0/ video_format_desc().fps) << monitor::message("/format") % format_desc.name; } catch(...) @@ -144,9 +202,10 @@ public: CASPAR_LOG_CURRENT_EXCEPTION(); } - executor_.begin_invoke([=]{tick();}); + if (executor_.is_running()) + executor_.begin_invoke([=]{tick();}); } - + std::wstring print() const { return L"video_channel[" + boost::lexical_cast(index_) + L"|" + video_format_desc().name + L"]"; @@ -165,28 +224,70 @@ public: auto mixer_info = mixer_.info(); auto output_info = output_.info(); - info.add(L"video-mode", format_desc_.name); + info.add(L"video-mode", video_format_desc().name); + info.add(L"audio-channel-layout", audio_channel_layout().print()); info.add_child(L"stage", stage_info.get()); info.add_child(L"mixer", mixer_info.get()); info.add_child(L"output", output_info.get()); - - return info; + + return info; + } + + boost::property_tree::wptree delay_info() const + { + boost::property_tree::wptree info; + + auto stage_info = stage_.delay_info(); + auto mixer_info = mixer_.delay_info(); + auto output_info = output_.delay_info(); + + // TODO: because of std::async deferred timed waiting does not work so for now we have to block + info.add_child(L"layers", stage_info.get()); + info.add_child(L"mix-time", mixer_info.get()); + info.add_child(L"output", output_info.get()); + + return info; + } + + std::shared_ptr add_tick_listener(std::function listener) + { + return lock(tick_listeners_mutex_, [&] + { + auto tick_listener_id = last_tick_listener_id++; + tick_listeners_.insert(std::make_pair(tick_listener_id, listener)); + + return std::shared_ptr(nullptr, [=](void*) + { + lock(tick_listeners_mutex_, [&] + { + tick_listeners_.erase(tick_listener_id); + }); + }); + }); } }; -video_channel::video_channel(int index, const core::video_format_desc& format_desc, std::unique_ptr image_mixer) : impl_(new impl(index, format_desc, std::move(image_mixer))){} +video_channel::video_channel( + int index, + const core::video_format_desc& format_desc, + const core::audio_channel_layout& channel_layout, + std::unique_ptr image_mixer) : impl_(new impl(index, format_desc, channel_layout, std::move(image_mixer))){} video_channel::~video_channel(){} -const stage& video_channel::stage() const { return impl_->stage_;} -stage& video_channel::stage() { return impl_->stage_;} -const mixer& video_channel::mixer() const{ return impl_->mixer_;} -mixer& video_channel::mixer() { return impl_->mixer_;} -const output& video_channel::output() const { return impl_->output_;} -output& video_channel::output() { return impl_->output_;} -spl::shared_ptr video_channel::frame_factory() { return impl_->image_mixer_;} +const stage& video_channel::stage() const { return impl_->stage_;} +stage& video_channel::stage() { return impl_->stage_;} +const mixer& video_channel::mixer() const{ return impl_->mixer_;} +mixer& video_channel::mixer() { return impl_->mixer_;} +const output& video_channel::output() const { return impl_->output_;} +output& video_channel::output() { return impl_->output_;} +spl::shared_ptr video_channel::frame_factory() { return impl_->image_mixer_;} core::video_format_desc video_channel::video_format_desc() const{return impl_->video_format_desc();} void core::video_channel::video_format_desc(const core::video_format_desc& format_desc){impl_->video_format_desc(format_desc);} +core::audio_channel_layout video_channel::audio_channel_layout() const { return impl_->audio_channel_layout(); } +void core::video_channel::audio_channel_layout(const core::audio_channel_layout& channel_layout) { impl_->audio_channel_layout(channel_layout); } boost::property_tree::wptree video_channel::info() const{return impl_->info();} +boost::property_tree::wptree video_channel::delay_info() const { return impl_->delay_info(); } int video_channel::index() const { return impl_->index(); } monitor::subject& video_channel::monitor_output(){ return *impl_->monitor_subject_; } +std::shared_ptr video_channel::add_tick_listener(std::function listener) { return impl_->add_tick_listener(std::move(listener)); } }}