X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fproducer%2Flayer.cpp;h=7aebe0cf4354fb919236cf945aae170d1fc631a9;hb=606051ad4fd051a1e9aca7ae4a3b405ee9e09209;hp=8037a13aaf38ed92ce167b039b04a10b8926c270;hpb=ea8464a9cf2170370e88539a92136920cdffce29;p=casparcg

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 8037a13aa..7aebe0cf4 100644
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -25,6 +25,7 @@
 
 #include "frame_producer.h"
 
+#include "../video_format.h"
 #include "../frame/draw_frame.h"
 #include "../frame/frame_transform.h"
 
@@ -35,36 +36,45 @@ namespace caspar { namespace core {
 
 struct layer::impl
 {				
-	spl::shared_ptr<frame_producer>	foreground_;
-	spl::shared_ptr<frame_producer>	background_;
-	int64_t						frame_number_;
-	boost::optional<int32_t>	auto_play_delta_;
-	bool						is_paused_;
+	monitor::basic_subject				event_subject_;
+	monitor::basic_subject				foreground_event_subject_;
+	monitor::basic_subject				background_event_subject_;
+	spl::shared_ptr<frame_producer>		foreground_;
+	spl::shared_ptr<frame_producer>		background_;
+	boost::optional<int32_t>			auto_play_delta_;
 
 public:
-	impl() 
-		: foreground_(frame_producer::empty())
+	impl(int index) 
+		: event_subject_(monitor::path("layer") % index)
+		, foreground_event_subject_("")
+		, background_event_subject_("background")
+		, foreground_(frame_producer::empty())
 		, background_(frame_producer::empty())
-		, frame_number_(0)
-		, is_paused_(false)
 	{
-	}
-	
-	void pause()
-	{
-		is_paused_ = true;
+		foreground_event_subject_.subscribe(event_subject_);
+		background_event_subject_.subscribe(event_subject_);
 	}
 
-	void resume()
+	void pause()
 	{
-		is_paused_ = false;
+		foreground_->paused(true);
 	}
-
-	void load(spl::shared_ptr<frame_producer> producer, const boost::optional<int32_t>& auto_play_delta)
+	
+	void load(spl::shared_ptr<frame_producer> producer, bool preview, const boost::optional<int32_t>& auto_play_delta)
 	{		
-		background_		 = std::move(producer);
+		background_->unsubscribe(background_event_subject_);
+		background_ = std::move(producer);
+		background_->subscribe(background_event_subject_);
+
 		auto_play_delta_ = auto_play_delta;
 
+		if(preview)
+		{
+			play();
+			foreground_->receive();
+			foreground_->paused(true);
+		}
+
 		if(auto_play_delta_ && foreground_ == frame_producer::empty())
 			play();
 	}
@@ -73,47 +83,57 @@ public:
 	{			
 		if(background_ != frame_producer::empty())
 		{
-			background_->set_leading_producer(foreground_);
-			foreground_		= background_;
-			background_		= frame_producer::empty();
-			frame_number_	= 0;
+			background_->leading_producer(foreground_);
+
+			background_->unsubscribe(background_event_subject_);
+			foreground_->unsubscribe(foreground_event_subject_);
+
+			foreground_ = std::move(background_);
+			background_ = std::move(frame_producer::empty());
+			
+			foreground_->subscribe(foreground_event_subject_);
+
 			auto_play_delta_.reset();
 		}
 
-		resume();
+		foreground_->paused(false);
 	}
 	
 	void stop()
 	{
-		foreground_		= frame_producer::empty();
-		frame_number_	= 0;
-		auto_play_delta_.reset();
+		foreground_->unsubscribe(foreground_event_subject_);
 
-		pause();
+		foreground_ = std::move(frame_producer::empty());
+
+		auto_play_delta_.reset();
 	}
 		
-	spl::shared_ptr<draw_frame> receive(frame_producer::flags flags)
+	draw_frame receive(const video_format_desc& format_desc)
 	{		
 		try
-		{
-			if(is_paused_)
-				return draw_frame::silence(foreground_->last_frame());
-		
-			auto frame = receive_and_follow(foreground_, flags.value());
-			if(frame == core::draw_frame::late())
-				return draw_frame::silence(foreground_->last_frame());
-			
-			++frame_number_;
+		{		
+			auto frame = foreground_->receive();
 
+			if(frame == core::draw_frame::late())
+				return foreground_->last_frame();
+						
 			if(auto_play_delta_)
 			{
-				auto frames_left = static_cast<int64_t>(foreground_->nb_frames()) - frame_number_ - static_cast<int64_t>(*auto_play_delta_);
+				auto frames_left = static_cast<int64_t>(foreground_->nb_frames()) - foreground_->frame_number() - static_cast<int64_t>(*auto_play_delta_);
 				if(frames_left < 1)
 				{
 					play();
-					return receive(flags);
+					return receive(format_desc);
 				}
 			}
+
+			event_subject_	<< monitor::event("time")	% monitor::duration(foreground_->frame_number()/format_desc.fps)
+														% monitor::duration(static_cast<int64_t>(foreground_->nb_frames()) - static_cast<int64_t>(auto_play_delta_ ? *auto_play_delta_ : 0)/format_desc.fps)
+							<< monitor::event("frame")	% static_cast<int64_t>(foreground_->frame_number())
+														% static_cast<int64_t>((static_cast<int64_t>(foreground_->nb_frames()) - static_cast<int64_t>(auto_play_delta_ ? *auto_play_delta_ : 0)));
+
+			foreground_event_subject_ << monitor::event("type") % foreground_->name();
+			background_event_subject_ << monitor::event("type") % background_->name();
 				
 			return frame;
 		}
@@ -128,24 +148,22 @@ public:
 	boost::property_tree::wptree info() const
 	{
 		boost::property_tree::wptree info;
-		info.add(L"status",		is_paused_ ? L"paused" : (foreground_ == frame_producer::empty() ? L"stopped" : L"playing"));
 		info.add(L"auto_delta",	(auto_play_delta_ ? boost::lexical_cast<std::wstring>(*auto_play_delta_) : L"null"));
-		info.add(L"frame-number", frame_number_);
+		info.add(L"frame-number", foreground_->frame_number());
 
 		auto nb_frames = foreground_->nb_frames();
 
 		info.add(L"nb_frames",	 nb_frames == std::numeric_limits<int64_t>::max() ? -1 : nb_frames);
-		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)));
-		info.add_child(L"foreground.producer", foreground_->info());
+		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)));
+		info.add_child(L"producer", foreground_->info());
 		info.add_child(L"background.producer", background_->info());
 		return info;
 	}
 };
 
-layer::layer() : impl_(new impl()){}
-layer::layer(const layer& other) : impl_(new impl(*other.impl_)){}
+layer::layer(int index) : impl_(new impl(index)){}
 layer::layer(layer&& other) : impl_(std::move(other.impl_)){}
-layer& layer::operator=(layer other)
+layer& layer::operator=(layer&& other)
 {
 	other.swap(*this);
 	return *this;
@@ -154,12 +172,14 @@ void layer::swap(layer& other)
 {	
 	impl_.swap(other.impl_);
 }
-void layer::load(spl::shared_ptr<frame_producer> frame_producer, const boost::optional<int32_t>& auto_play_delta){return impl_->load(std::move(frame_producer), auto_play_delta);}	
+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);}	
 void layer::play(){impl_->play();}
 void layer::pause(){impl_->pause();}
 void layer::stop(){impl_->stop();}
-spl::shared_ptr<draw_frame> layer::receive(frame_producer::flags flags) {return impl_->receive(flags);}
+draw_frame layer::receive(const video_format_desc& format_desc) {return impl_->receive(format_desc);}
 spl::shared_ptr<frame_producer> layer::foreground() const { return impl_->foreground_;}
 spl::shared_ptr<frame_producer> layer::background() const { return impl_->background_;}
 boost::property_tree::wptree layer::info() const{return impl_->info();}
+void layer::subscribe(const monitor::observable::observer_ptr& o) {impl_->event_subject_.subscribe(o);}
+void layer::unsubscribe(const monitor::observable::observer_ptr& o) {impl_->event_subject_.unsubscribe(o);}
 }}
\ No newline at end of file