#include "layer.h"\r
\r
#include "frame_producer.h"\r
-#include "frame/basic_frame.h"\r
-#include "frame/frame_transform.h"\r
+\r
+#include "../video_format.h"\r
+#include "../frame/draw_frame.h"\r
+#include "../frame/frame_transform.h"\r
\r
#include <boost/optional.hpp>\r
-#include <boost/property_tree/ptree.hpp>\r
+#include <boost/thread/future.hpp>\r
\r
namespace caspar { namespace core {\r
\r
struct layer::impl\r
{ \r
- safe_ptr<frame_producer> foreground_;\r
- safe_ptr<frame_producer> background_;\r
- int64_t frame_number_;\r
- boost::optional<int32_t> auto_play_delta_;\r
- bool is_paused_;\r
+ monitor::basic_subject event_subject_;\r
+ monitor::basic_subject foreground_event_subject_;\r
+ monitor::basic_subject background_event_subject_;\r
+ spl::shared_ptr<frame_producer> foreground_;\r
+ spl::shared_ptr<frame_producer> background_;\r
+ boost::optional<int32_t> auto_play_delta_;\r
\r
public:\r
- impl() \r
- : foreground_(frame_producer::empty())\r
+ impl(int index) \r
+ : event_subject_(monitor::path("layer") % index)\r
+ , foreground_event_subject_("")\r
+ , background_event_subject_("background")\r
+ , foreground_(frame_producer::empty())\r
, background_(frame_producer::empty())\r
- , frame_number_(0)\r
- , is_paused_(false)\r
- {\r
- }\r
- \r
- void pause()\r
{\r
- is_paused_ = true;\r
+ foreground_event_subject_.subscribe(event_subject_);\r
+ background_event_subject_.subscribe(event_subject_);\r
}\r
\r
- void resume()\r
+ void pause()\r
{\r
- is_paused_ = false;\r
+ foreground_->paused(true);\r
}\r
-\r
- void load(const safe_ptr<frame_producer>& producer, bool preview, const boost::optional<int32_t>& auto_play_delta)\r
+ \r
+ void load(spl::shared_ptr<frame_producer> producer, bool preview, const boost::optional<int32_t>& auto_play_delta)\r
{ \r
- background_ = producer;\r
+ background_->unsubscribe(background_event_subject_);\r
+ background_ = std::move(producer);\r
+ background_->subscribe(background_event_subject_);\r
+\r
auto_play_delta_ = auto_play_delta;\r
\r
- if(auto_play_delta_ && foreground_ == frame_producer::empty())\r
+ if(preview)\r
+ {\r
play();\r
+ foreground_->receive();\r
+ foreground_->paused(true);\r
+ }\r
\r
- if(preview) // Play the first frame and pause.\r
- { \r
+ if(auto_play_delta_ && foreground_ == frame_producer::empty())\r
play();\r
- receive(frame_producer::NO_FLAG);\r
- pause();\r
- }\r
}\r
\r
void play()\r
{ \r
if(background_ != frame_producer::empty())\r
{\r
- background_->set_leading_producer(foreground_);\r
+ background_->leading_producer(foreground_);\r
+\r
+ background_->unsubscribe(background_event_subject_);\r
+ foreground_->unsubscribe(foreground_event_subject_);\r
+\r
+ foreground_ = std::move(background_);\r
+ background_ = std::move(frame_producer::empty());\r
\r
- foreground_ = background_;\r
- background_ = frame_producer::empty();\r
- frame_number_ = 0;\r
- auto_play_delta_ = nullptr; \r
+ foreground_->subscribe(foreground_event_subject_);\r
+\r
+ auto_play_delta_.reset();\r
}\r
\r
- is_paused_ = false;\r
+ foreground_->paused(false);\r
}\r
\r
void stop()\r
{\r
- foreground_ = frame_producer::empty();\r
- background_ = background_;\r
- frame_number_ = 0;\r
- auto_play_delta_ = nullptr; \r
+ foreground_->unsubscribe(foreground_event_subject_);\r
\r
- is_paused_ = true;\r
+ foreground_ = std::move(frame_producer::empty());\r
+\r
+ auto_play_delta_.reset();\r
}\r
\r
- safe_ptr<basic_frame> receive(int flags)\r
+ draw_frame receive(const video_format_desc& format_desc)\r
{ \r
try\r
- {\r
- if(is_paused_)\r
- return disable_audio(foreground_->last_frame());\r
- \r
- auto frame = receive_and_follow(foreground_, flags);\r
- if(frame == core::basic_frame::late())\r
- return disable_audio(foreground_->last_frame());\r
+ { \r
+ auto frame = foreground_->receive();\r
\r
+ if(frame == core::draw_frame::late())\r
+ return foreground_->last_frame();\r
+ \r
if(auto_play_delta_)\r
{\r
- auto frames_left = static_cast<int64_t>(foreground_->nb_frames()) - static_cast<int64_t>(++frame_number_) - static_cast<int64_t>(*auto_play_delta_);\r
+ auto frames_left = static_cast<int64_t>(foreground_->nb_frames()) - foreground_->frame_number() - static_cast<int64_t>(*auto_play_delta_);\r
if(frames_left < 1)\r
{\r
play();\r
- return receive(flags);\r
+ return receive(format_desc);\r
}\r
}\r
+\r
+ event_subject_ << monitor::event("time") % monitor::duration(foreground_->frame_number()/format_desc.fps)\r
+ % monitor::duration(static_cast<int64_t>(foreground_->nb_frames()) - static_cast<int64_t>(auto_play_delta_ ? *auto_play_delta_ : 0)/format_desc.fps)\r
+ << monitor::event("frame") % static_cast<int64_t>(foreground_->frame_number())\r
+ % static_cast<int64_t>((static_cast<int64_t>(foreground_->nb_frames()) - static_cast<int64_t>(auto_play_delta_ ? *auto_play_delta_ : 0)));\r
+\r
+ foreground_event_subject_ << monitor::event("type") % foreground_->name();\r
+ background_event_subject_ << monitor::event("type") % background_->name();\r
\r
return frame;\r
}\r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
stop();\r
- return core::basic_frame::empty();\r
+ return core::draw_frame::empty();\r
}\r
}\r
-\r
- boost::unique_future<std::wstring> call(bool foreground, const std::wstring& param)\r
- {\r
- return (foreground ? foreground_ : background_)->call(param);\r
- }\r
-\r
- bool empty() const\r
- {\r
- return background_ == core::frame_producer::empty() && foreground_ == core::frame_producer::empty();\r
- }\r
-\r
+ \r
boost::property_tree::wptree info() const\r
{\r
boost::property_tree::wptree info;\r
- info.add(L"status", is_paused_ ? L"paused" : (foreground_ == frame_producer::empty() ? L"stopped" : L"playing"));\r
- info.add(L"auto_delta", auto_play_delta_);\r
- info.add(L"frame-number", frame_number_);\r
+ info.add(L"auto_delta", (auto_play_delta_ ? boost::lexical_cast<std::wstring>(*auto_play_delta_) : L"null"));\r
+ info.add(L"frame-number", foreground_->frame_number());\r
\r
auto nb_frames = foreground_->nb_frames();\r
\r
info.add(L"nb_frames", nb_frames == std::numeric_limits<int64_t>::max() ? -1 : nb_frames);\r
- info.add(L"frames-left", nb_frames == std::numeric_limits<int64_t>::max() ? -1 : (foreground_->nb_frames() - frame_number_ - (auto_play_delta_ ? *auto_play_delta_ : 0)));\r
- info.add_child(L"foreground.producer", foreground_->info());\r
+ info.add(L"frames-left", nb_frames == std::numeric_limits<int64_t>::max() ? -1 : (foreground_->nb_frames() - foreground_->frame_number() - (auto_play_delta_ ? *auto_play_delta_ : 0)));\r
+ info.add_child(L"producer", foreground_->info());\r
info.add_child(L"background.producer", background_->info());\r
return info;\r
}\r
};\r
\r
-layer::layer() : impl_(new impl()){}\r
+layer::layer(int index) : impl_(new impl(index)){}\r
layer::layer(layer&& other) : impl_(std::move(other.impl_)){}\r
layer& layer::operator=(layer&& other)\r
{\r
- impl_ = std::move(other.impl_);\r
- return *this;\r
-}\r
-layer::layer(const layer& other) : impl_(new impl(*other.impl_)){}\r
-layer& layer::operator=(const layer& other)\r
-{\r
- layer temp(other);\r
- temp.swap(*this);\r
+ other.swap(*this);\r
return *this;\r
}\r
void layer::swap(layer& other)\r
{ \r
impl_.swap(other.impl_);\r
}\r
-void layer::load(const safe_ptr<frame_producer>& frame_producer, bool preview, const boost::optional<int32_t>& auto_play_delta){return impl_->load(frame_producer, preview, auto_play_delta);} \r
+void layer::load(spl::shared_ptr<frame_producer> frame_producer, bool preview, const boost::optional<int32_t>& auto_play_delta){return impl_->load(std::move(frame_producer), preview, auto_play_delta);} \r
void layer::play(){impl_->play();}\r
void layer::pause(){impl_->pause();}\r
void layer::stop(){impl_->stop();}\r
-bool layer::is_paused() const{return impl_->is_paused_;}\r
-int64_t layer::frame_number() const{return impl_->frame_number_;}\r
-safe_ptr<basic_frame> layer::receive(int flags) {return impl_->receive(flags);}\r
-safe_ptr<frame_producer> layer::foreground() const { return impl_->foreground_;}\r
-safe_ptr<frame_producer> layer::background() const { return impl_->background_;}\r
-bool layer::empty() const {return impl_->empty();}\r
-boost::unique_future<std::wstring> layer::call(bool foreground, const std::wstring& param){return impl_->call(foreground, param);}\r
+draw_frame layer::receive(const video_format_desc& format_desc) {return impl_->receive(format_desc);}\r
+spl::shared_ptr<frame_producer> layer::foreground() const { return impl_->foreground_;}\r
+spl::shared_ptr<frame_producer> layer::background() const { return impl_->background_;}\r
boost::property_tree::wptree layer::info() const{return impl_->info();}\r
+void layer::subscribe(const monitor::observable::observer_ptr& o) {impl_->event_subject_.subscribe(o);}\r
+void layer::unsubscribe(const monitor::observable::observer_ptr& o) {impl_->event_subject_.unsubscribe(o);}\r
}}
\ No newline at end of file
projects / casparcg / blobdiff