#include <boost/thread.hpp>\r
#include <boost/timer.hpp>\r
\r
-#include <tbb/spin_mutex.h>\r
-\r
#include <functional>\r
\r
+#include <tbb/spin_mutex.h>\r
+\r
namespace caspar {\r
\r
class bitmap\r
\r
struct template_host\r
{\r
- std::string video_mode;\r
+ std::string field_mode;\r
std::string filename;\r
size_t width;\r
size_t height;\r
try\r
{\r
template_host template_host;\r
- template_host.video_mode = xml_mapping.second.get("video-mode", narrow(desc.name));\r
+ template_host.field_mode = xml_mapping.second.get("video-mode", narrow(desc.name));\r
template_host.filename = xml_mapping.second.get("filename", "cg.fth");\r
template_host.width = xml_mapping.second.get("width", desc.width);\r
template_host.height = xml_mapping.second.get("height", desc.height);\r
catch(...){}\r
}\r
\r
- auto template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.video_mode == narrow(desc.name);});\r
+ auto template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.field_mode == narrow(desc.name);});\r
if(template_host_it == template_hosts.end())\r
- template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.video_mode == "";});\r
+ template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.field_mode == "";});\r
\r
if(template_host_it != template_hosts.end())\r
return *template_host_it;\r
, bmp_(width, height)\r
, width_(width)\r
, height_(height)\r
- {\r
+ { \r
graph_->add_guide("frame-time", 0.5f);\r
graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f));\r
graph_->add_guide("tick-time", 0.5);\r
- graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f)); \r
+ graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f));\r
graph_->set_color("param", diagnostics::color(1.0f, 0.5f, 0.0f)); \r
- graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); \r
+ graph_->set_color("skip-sync", diagnostics::color(0.8f, 0.3f, 0.2f)); \r
\r
if(FAILED(CComObject<caspar::flash::FlashAxContainer>::CreateInstance(&ax_)))\r
BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to create FlashAxContainer"));\r
void param(const std::wstring& param)\r
{ \r
if(!ax_->FlashCall(param))\r
- BOOST_THROW_EXCEPTION(invalid_operation() << msg_info("Flash function call failed.") << arg_name_info("param") << arg_value_info(narrow(param)));\r
+ CASPAR_LOG(warning) << print() << L" Flash call failed:" << param;//BOOST_THROW_EXCEPTION(invalid_operation() << msg_info("Flash function call failed.") << arg_name_info("param") << arg_value_info(narrow(param)));\r
graph_->add_tag("param");\r
}\r
\r
if(!has_underflow) \r
timer_.tick(frame_time); // This will block the thread.\r
else\r
- graph_->add_tag("underflow");\r
+ graph_->add_tag("skip-sync");\r
\r
frame_timer_.restart();\r
\r
\r
tbb::concurrent_bounded_queue<safe_ptr<core::basic_frame>> frame_buffer_;\r
\r
+ mutable tbb::spin_mutex last_frame_mutex_;\r
safe_ptr<core::basic_frame> last_frame_;\r
\r
com_context<flash_renderer> context_; \r
\r
- tbb::spin_mutex exception_mutex_;\r
- std::exception_ptr exception_;\r
-\r
int width_;\r
int height_;\r
public:\r
{ \r
if(!boost::filesystem::exists(filename))\r
BOOST_THROW_EXCEPTION(file_not_found() << boost::errinfo_file_name(narrow(filename))); \r
- \r
+\r
fps_ = 0;\r
\r
graph_ = diagnostics::create_graph([this]{return print();});\r
- graph_->set_color("buffer-count", diagnostics::color(0.4f, 0.8f, 0.8f));\r
- \r
- frame_buffer_.set_capacity(1);\r
+ graph_->set_color("output-buffer-count", diagnostics::color(1.0f, 1.0f, 0.0f)); \r
+ graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); \r
\r
- context_.reset([&]{return new flash_renderer(safe_ptr<diagnostics::graph>(graph_), frame_factory_, filename_, width_, height_);});\r
- while(frame_buffer_.try_push(core::basic_frame::empty())){} \r
- render(); \r
+ frame_buffer_.set_capacity(frame_factory_->get_video_format_desc().fps > 30.0 ? 2 : 1);\r
+\r
+ initialize(); \r
}\r
\r
~flash_producer()\r
// frame_producer\r
\r
virtual safe_ptr<core::basic_frame> receive(int)\r
- { \r
- { \r
- tbb::spin_mutex::scoped_lock lock(exception_mutex_);\r
- if(exception_ != nullptr)\r
- std::rethrow_exception(exception_);\r
- }\r
-\r
- graph_->set_value("buffer-count", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity()));\r
+ { \r
+ graph_->set_value("output-buffer-count", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity()));\r
\r
auto frame = core::basic_frame::late();\r
- if(frame_buffer_.try_pop(frame))\r
- last_frame_ = frame;\r
+ if(!frame_buffer_.try_pop(frame))\r
+ graph_->add_tag("underflow");\r
\r
return frame;\r
}\r
\r
virtual safe_ptr<core::basic_frame> last_frame() const\r
{\r
+ tbb::spin_mutex::scoped_lock lock(last_frame_mutex_);\r
return last_frame_;\r
} \r
\r
virtual void param(const std::wstring& param) \r
{ \r
- { \r
- tbb::spin_mutex::scoped_lock lock(exception_mutex_);\r
- if(exception_ != nullptr)\r
- std::rethrow_exception(exception_);\r
- }\r
-\r
context_.begin_invoke([=]\r
{\r
+ if(!context_)\r
+ initialize();\r
+\r
try\r
{\r
context_->param(param); \r
\r
- const auto& format_desc = frame_factory_->get_video_format_desc();\r
- if(abs(context_->fps() - format_desc.fps) > 2.0 && abs(context_->fps()/2.0 - format_desc.fps) > 2.0)\r
- CASPAR_LOG(warning) << print() << " Invalid frame-rate: " << context_->fps() << L". Should be either " << format_desc.fps << L" or " << format_desc.fps*2.0 << L".";\r
+ //const auto& format_desc = frame_factory_->get_video_format_desc();\r
+ //if(abs(context_->fps() - format_desc.fps) > 0.01 && abs(context_->fps()/2.0 - format_desc.fps) > 0.01)\r
+ // CASPAR_LOG(warning) << print() << " Invalid frame-rate: " << context_->fps() << L". Should be either " << format_desc.fps << L" or " << format_desc.fps*2.0 << L".";\r
}\r
catch(...)\r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
context_.reset(nullptr);\r
-\r
- tbb::spin_mutex::scoped_lock lock(exception_mutex_);\r
- exception_ = std::current_exception();\r
+ frame_buffer_.push(core::basic_frame::empty());\r
}\r
});\r
}\r
\r
virtual std::wstring print() const\r
{ \r
- return L"flash[" + boost::filesystem::wpath(filename_).filename() + L", " + boost::lexical_cast<std::wstring>(fps_) + L"]"; \r
+ return L"flash[" + boost::filesystem::wpath(filename_).filename() + L"|" + boost::lexical_cast<std::wstring>(fps_) + L"]"; \r
} \r
\r
// flash_producer\r
\r
- void render()\r
- { \r
+ void initialize()\r
+ {\r
+ context_.reset([&]{return new flash_renderer(safe_ptr<diagnostics::graph>(graph_), frame_factory_, filename_, width_, height_);});\r
+ while(frame_buffer_.try_push(core::basic_frame::empty())){} \r
+ render(context_.get());\r
+ }\r
+\r
+ safe_ptr<core::basic_frame> render_frame()\r
+ {\r
+ auto frame = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity()); \r
+ tbb::spin_mutex::scoped_lock lock(last_frame_mutex_);\r
+ last_frame_ = make_safe<core::basic_frame>(frame);\r
+ return frame;\r
+ }\r
+\r
+ void render(const flash_renderer* renderer)\r
+ { \r
context_.begin_invoke([=]\r
{\r
+ if(context_.get() != renderer) // Since initialize will start a new recursive call make sure the recursive calls are only for a specific instance.\r
+ return;\r
+\r
try\r
{ \r
const auto& format_desc = frame_factory_->get_video_format_desc();\r
\r
if(abs(context_->fps()/2.0 - format_desc.fps) < 2.0) // flash == 2 * format -> interlace\r
{\r
- auto frame1 = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
- auto frame2 = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
- frame_buffer_.push(core::basic_frame::interlace(frame1, frame2, format_desc.mode));\r
+ auto frame1 = render_frame();\r
+ auto frame2 = render_frame();\r
+ frame_buffer_.push(core::basic_frame::interlace(frame1, frame2, format_desc.field_mode));\r
}\r
else if(abs(context_->fps()- format_desc.fps/2.0) < 2.0) // format == 2 * flash -> duplicate\r
{\r
- auto frame = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
+ auto frame = render_frame();\r
frame_buffer_.push(frame);\r
frame_buffer_.push(frame);\r
}\r
else //if(abs(renderer_->fps() - format_desc_.fps) < 0.1) // format == flash -> simple\r
{\r
- auto frame = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
+ auto frame = render_frame();\r
frame_buffer_.push(frame);\r
}\r
\r
- graph_->set_value("buffer-count", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity())); \r
+ graph_->set_value("output-buffer-count", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity())); \r
fps_.fetch_and_store(static_cast<int>(context_->fps()*100.0));\r
\r
- render();\r
+ render(renderer);\r
}\r
catch(...)\r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
context_.reset(nullptr);\r
- \r
- tbb::spin_mutex::scoped_lock lock(exception_mutex_);\r
- exception_ = std::current_exception();\r
+ frame_buffer_.push(core::basic_frame::empty());\r
}\r
});\r
}\r
projects / casparcg / blobdiff