\r
namespace caspar { namespace core { \r
\r
-struct transition_producer : public frame_producer\r
+class transition_producer : public frame_producer\r
{ \r
- spl::shared_ptr<monitor::subject> event_subject_;\r
+ monitor::basic_subject event_subject_;\r
const field_mode mode_;\r
int current_frame_;\r
\r
const transition_info info_;\r
+\r
+ spl::shared_ptr<draw_frame> last_frame_;\r
\r
spl::shared_ptr<frame_producer> dest_producer_;\r
spl::shared_ptr<frame_producer> source_producer_;\r
-\r
- spl::shared_ptr<draw_frame> last_frame_;\r
\r
+public:\r
explicit transition_producer(const field_mode& mode, const spl::shared_ptr<frame_producer>& dest, const transition_info& info) \r
: mode_(mode)\r
, current_frame_(0)\r
, info_(info)\r
+ , last_frame_(draw_frame::empty())\r
, dest_producer_(dest)\r
, source_producer_(frame_producer::empty())\r
- , last_frame_(draw_frame::empty())\r
{\r
dest->subscribe(event_subject_);\r
}\r
\r
// frame_producer\r
-\r
- virtual spl::shared_ptr<frame_producer> get_following_producer() const override\r
- {\r
- return dest_producer_;\r
- }\r
- \r
- virtual void set_leading_producer(const spl::shared_ptr<frame_producer>& producer) override\r
+ \r
+ virtual void leading_producer(const spl::shared_ptr<frame_producer>& producer) override\r
{\r
source_producer_ = producer;\r
}\r
\r
virtual spl::shared_ptr<draw_frame> receive(int flags) override\r
{\r
- if(++current_frame_ >= info_.duration)\r
- return draw_frame::eof();\r
+ if(current_frame_ >= info_.duration)\r
+ return dest_producer_->receive(flags);\r
\r
- *event_subject_ << monitor::event("transition/frame") % current_frame_ % info_.duration\r
+ ++current_frame_;\r
+\r
+ event_subject_ << monitor::event("transition/frame") % current_frame_ % info_.duration\r
<< monitor::event("transition/type") % [&]() -> std::string\r
{\r
switch(info_.type.value())\r
return compose(dest, source);\r
}\r
\r
- virtual spl::shared_ptr<core::draw_frame> last_frame() const override\r
+ virtual spl::shared_ptr<draw_frame> last_frame() const override\r
{\r
- return last_frame_;\r
+ return dest_producer_->last_frame();\r
}\r
-\r
+ \r
virtual uint32_t nb_frames() const override\r
{\r
- return get_following_producer()->nb_frames();\r
+ return dest_producer_->nb_frames();\r
}\r
\r
virtual std::wstring print() const override\r
\r
boost::property_tree::wptree info() const override\r
{\r
- boost::property_tree::wptree info;\r
- info.add(L"type", L"transition-producer");\r
- info.add_child(L"source.producer", source_producer_->info());\r
- info.add_child(L"destination.producer", dest_producer_->info());\r
- return info;\r
+ return dest_producer_->info();\r
}\r
\r
// transition_producer\r
\r
// For interlaced transitions. Seperate fields into seperate frames which are transitioned accordingly.\r
\r
- src_frame->get_frame_transform().volume = 1.0-delta2;\r
+ src_frame->frame_transform().audio_transform.volume = 1.0-delta2;\r
auto s_frame1 = spl::make_shared<draw_frame>(src_frame);\r
auto s_frame2 = spl::make_shared<draw_frame>(src_frame);\r
\r
- dest_frame->get_frame_transform().volume = delta2;\r
+ dest_frame->frame_transform().audio_transform.volume = delta2;\r
auto d_frame1 = spl::make_shared<draw_frame>(dest_frame);\r
auto d_frame2 = spl::make_shared<draw_frame>(dest_frame);\r
\r
if(info_.type == transition_type::mix)\r
{\r
- d_frame1->get_frame_transform().opacity = delta1; \r
- d_frame1->get_frame_transform().is_mix = true;\r
- d_frame2->get_frame_transform().opacity = delta2;\r
- d_frame2->get_frame_transform().is_mix = true;\r
-\r
- s_frame1->get_frame_transform().opacity = 1.0-delta1; \r
- s_frame1->get_frame_transform().is_mix = true;\r
- s_frame2->get_frame_transform().opacity = 1.0-delta2; \r
- s_frame2->get_frame_transform().is_mix = true;\r
+ d_frame1->frame_transform().image_transform.opacity = delta1; \r
+ d_frame1->frame_transform().image_transform.is_mix = true;\r
+ d_frame2->frame_transform().image_transform.opacity = delta2;\r
+ d_frame2->frame_transform().image_transform.is_mix = true;\r
+\r
+ s_frame1->frame_transform().image_transform.opacity = 1.0-delta1; \r
+ s_frame1->frame_transform().image_transform.is_mix = true;\r
+ s_frame2->frame_transform().image_transform.opacity = 1.0-delta2; \r
+ s_frame2->frame_transform().image_transform.is_mix = true;\r
}\r
if(info_.type == transition_type::slide)\r
{\r
- d_frame1->get_frame_transform().fill_translation[0] = (-1.0+delta1)*dir; \r
- d_frame2->get_frame_transform().fill_translation[0] = (-1.0+delta2)*dir; \r
+ d_frame1->frame_transform().image_transform.fill_translation[0] = (-1.0+delta1)*dir; \r
+ d_frame2->frame_transform().image_transform.fill_translation[0] = (-1.0+delta2)*dir; \r
}\r
else if(info_.type == transition_type::push)\r
{\r
- d_frame1->get_frame_transform().fill_translation[0] = (-1.0+delta1)*dir;\r
- d_frame2->get_frame_transform().fill_translation[0] = (-1.0+delta2)*dir;\r
+ d_frame1->frame_transform().image_transform.fill_translation[0] = (-1.0+delta1)*dir;\r
+ d_frame2->frame_transform().image_transform.fill_translation[0] = (-1.0+delta2)*dir;\r
\r
- s_frame1->get_frame_transform().fill_translation[0] = (0.0+delta1)*dir; \r
- s_frame2->get_frame_transform().fill_translation[0] = (0.0+delta2)*dir; \r
+ s_frame1->frame_transform().image_transform.fill_translation[0] = (0.0+delta1)*dir; \r
+ s_frame2->frame_transform().image_transform.fill_translation[0] = (0.0+delta2)*dir; \r
}\r
else if(info_.type == transition_type::wipe) \r
{\r
- d_frame1->get_frame_transform().clip_scale[0] = delta1; \r
- d_frame2->get_frame_transform().clip_scale[0] = delta2; \r
+ d_frame1->frame_transform().image_transform.clip_scale[0] = delta1; \r
+ d_frame2->frame_transform().image_transform.clip_scale[0] = delta2; \r
}\r
\r
- const auto s_frame = s_frame1->get_frame_transform() == s_frame2->get_frame_transform() ? s_frame2 : draw_frame::interlace(s_frame1, s_frame2, mode_);\r
- const auto d_frame = d_frame1->get_frame_transform() == d_frame2->get_frame_transform() ? d_frame2 : draw_frame::interlace(d_frame1, d_frame2, mode_);\r
+ const auto s_frame = s_frame1->frame_transform() == s_frame2->frame_transform() ? s_frame2 : draw_frame::interlace(s_frame1, s_frame2, mode_);\r
+ const auto d_frame = d_frame1->frame_transform() == d_frame2->frame_transform() ? d_frame2 : draw_frame::interlace(d_frame1, d_frame2, mode_);\r
\r
- last_frame_ = draw_frame::over(s_frame2, d_frame2);\r
-\r
return draw_frame::over(s_frame, d_frame);\r
}\r
\r
virtual void subscribe(const monitor::observable::observer_ptr& o) override \r
{\r
- return event_subject_->subscribe(o);\r
+ event_subject_.subscribe(o);\r
}\r
\r
virtual void unsubscribe(const monitor::observable::observer_ptr& o) override \r
{\r
- return event_subject_->unsubscribe(o);\r
+ event_subject_.unsubscribe(o);\r
}\r
};\r
\r
projects / casparcg / blobdiff