#include "layer.h"\r
\r
#include "frame_producer.h"\r
-#include "frame/basic_frame.h"\r
\r
-#include <boost/property_tree/ptree.hpp>\r
+#include "../frame/draw_frame.h"\r
+#include "../frame/frame_transform.h"\r
+\r
+#include <boost/optional.hpp>\r
+#include <boost/thread/future.hpp>\r
\r
namespace caspar { namespace core {\r
- \r
-struct layer::implementation\r
+\r
+struct layer::impl\r
{ \r
safe_ptr<frame_producer> foreground_;\r
safe_ptr<frame_producer> background_;\r
int64_t frame_number_;\r
- int auto_play_delta_;\r
+ boost::optional<int32_t> auto_play_delta_;\r
bool is_paused_;\r
\r
public:\r
- implementation() \r
+ impl() \r
: foreground_(frame_producer::empty())\r
, background_(frame_producer::empty())\r
, frame_number_(0)\r
- , auto_play_delta_(-1)\r
, is_paused_(false)\r
{\r
}\r
is_paused_ = false;\r
}\r
\r
- void load(const safe_ptr<frame_producer>& producer, bool preview, int auto_play_delta)\r
+ void load(const safe_ptr<frame_producer>& producer, bool preview, const boost::optional<int32_t>& auto_play_delta)\r
{ \r
background_ = producer;\r
auto_play_delta_ = auto_play_delta;\r
\r
+ if(auto_play_delta_ && foreground_ == frame_producer::empty())\r
+ play();\r
+\r
if(preview) // Play the first frame and pause.\r
{ \r
play();\r
- receive();\r
+ receive(frame_producer::flags::none);\r
pause();\r
}\r
}\r
foreground_ = background_;\r
background_ = frame_producer::empty();\r
frame_number_ = 0;\r
- auto_play_delta_ = -1; \r
+ auto_play_delta_.reset();\r
}\r
\r
is_paused_ = false;\r
foreground_ = frame_producer::empty();\r
background_ = background_;\r
frame_number_ = 0;\r
- auto_play_delta_ = -1;\r
+ auto_play_delta_.reset();\r
\r
is_paused_ = true;\r
}\r
\r
- safe_ptr<basic_frame> receive()\r
+ safe_ptr<draw_frame> receive(int flags)\r
{ \r
try\r
{\r
if(is_paused_)\r
- return disable_audio(foreground_->last_frame());\r
+ return draw_frame::silence(foreground_->last_frame());\r
\r
- auto frame = receive_and_follow(foreground_, frame_producer::NO_HINT);\r
- if(frame == core::basic_frame::late())\r
- return foreground_->last_frame();\r
+ auto frame = receive_and_follow(foreground_, flags);\r
+ if(frame == core::draw_frame::late())\r
+ return draw_frame::silence(foreground_->last_frame());\r
\r
- auto frames_left = foreground_->nb_frames() - (++frame_number_) - auto_play_delta_;\r
- if(auto_play_delta_ > -1 && frames_left < 1)\r
+ if(auto_play_delta_)\r
{\r
- play();\r
- return receive();\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
+ if(frames_left < 1)\r
+ {\r
+ play();\r
+ return receive(flags);\r
+ }\r
}\r
\r
return frame;\r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
stop();\r
- return core::basic_frame::empty();\r
+ return core::draw_frame::empty();\r
}\r
}\r
\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"auto_delta", (auto_play_delta_ ? boost::lexical_cast<std::wstring>(*auto_play_delta_) : L"null"));\r
info.add(L"frame-number", 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_));\r
- info.add_child(L"foreground", foreground_->info());\r
- info.add_child(L"background", background_->info());\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_child(L"background.producer", background_->info());\r
return info;\r
}\r
};\r
\r
-layer::layer() : impl_(new implementation()){}\r
+layer::layer() : impl_(new impl()){}\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 implementation(*other.impl_)){}\r
+layer::layer(const layer& other) : impl_(new impl(*other.impl_)){}\r
layer& layer::operator=(const layer& other)\r
{\r
layer temp(other);\r
{ \r
impl_.swap(other.impl_);\r
}\r
-void layer::load(const safe_ptr<frame_producer>& frame_producer, bool preview, int auto_play_delta){return impl_->load(frame_producer, preview, auto_play_delta);} \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::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() {return impl_->receive();}\r
+safe_ptr<draw_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