\r
#include <core/producer/frame/basic_frame.h>\r
#include <core/producer/frame/frame_factory.h>\r
+#include <core/producer/frame/pixel_format.h>\r
#include <core/mixer/write_frame.h>\r
\r
#include <common/env.h>\r
-#include <common/concurrency/com_context.h>\r
+#include <common/concurrency/executor.h>\r
+#include <common/concurrency/lock.h>\r
#include <common/diagnostics/graph.h>\r
-#include <common/memory/memcpy.h>\r
-#include <common/memory/memclr.h>\r
-#include <common/utility/timer.h>\r
+#include <common/prec_timer.h>\r
\r
#include <boost/filesystem.hpp>\r
#include <boost/property_tree/ptree.hpp>\r
#include <boost/timer.hpp>\r
#include <boost/algorithm/string.hpp>\r
\r
-#include <functional>\r
-\r
#include <tbb/spin_mutex.h>\r
\r
+#include <asmlib.h>\r
+\r
+#include <functional>\r
+\r
namespace caspar { namespace flash {\r
\r
class bitmap\r
{\r
public:\r
- bitmap(size_t width, size_t height)\r
+ bitmap(int width, int height)\r
: bmp_data_(nullptr)\r
, hdc_(CreateCompatibleDC(0), DeleteDC)\r
{ \r
memset(&info, 0, sizeof(BITMAPINFO));\r
info.bmiHeader.biBitCount = 32;\r
info.bmiHeader.biCompression = BI_RGB;\r
- info.bmiHeader.biHeight = -height;\r
+ info.bmiHeader.biHeight = static_cast<LONG>(-height);\r
info.bmiHeader.biPlanes = 1;\r
info.bmiHeader.biSize = sizeof(BITMAPINFO);\r
- info.bmiHeader.biWidth = width;\r
+ info.bmiHeader.biWidth = static_cast<LONG>(width);\r
\r
bmp_.reset(CreateDIBSection(static_cast<HDC>(hdc_.get()), &info, DIB_RGB_COLORS, reinterpret_cast<void**>(&bmp_data_), 0, 0), DeleteObject);\r
SelectObject(static_cast<HDC>(hdc_.get()), bmp_.get()); \r
{\r
std::wstring video_mode;\r
std::wstring filename;\r
- size_t width;\r
- size_t height;\r
+ int width;\r
+ int height;\r
};\r
\r
template_host get_template_host(const core::video_format_desc& desc)\r
template_host template_host;\r
template_host.filename = L"cg.fth";\r
\r
- for(auto it = boost::filesystem2::wdirectory_iterator(env::template_folder()); it != boost::filesystem2::wdirectory_iterator(); ++it)\r
+ for(auto it = boost::filesystem::directory_iterator(env::template_folder()); it != boost::filesystem::directory_iterator(); ++it)\r
{\r
- if(boost::iequals(it->path().extension(), L"." + desc.name))\r
+ if(boost::iequals(it->path().extension().wstring(), L"." + desc.name))\r
{\r
- template_host.filename = it->filename();\r
+ template_host.filename = it->path().filename().wstring();\r
break;\r
}\r
}\r
\r
class flash_renderer\r
{ \r
+ struct com_init\r
+ {\r
+ HRESULT result_;\r
+\r
+ com_init()\r
+ : result_(CoInitialize(nullptr))\r
+ {\r
+ if(FAILED(result_))\r
+ BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Failed to initialize com-context for flash-player"));\r
+ }\r
+\r
+ ~com_init()\r
+ {\r
+ if(SUCCEEDED(result_))\r
+ ::CoUninitialize();\r
+ }\r
+ } com_init_;\r
+\r
const std::wstring filename_;\r
\r
const std::shared_ptr<core::frame_factory> frame_factory_;\r
boost::timer frame_timer_;\r
boost::timer tick_timer_;\r
\r
- high_prec_timer timer_;\r
+ prec_timer timer_;\r
\r
- const size_t width_;\r
- const size_t height_;\r
+ const int width_;\r
+ const int height_;\r
\r
public:\r
flash_renderer(const safe_ptr<diagnostics::graph>& graph, const std::shared_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, int width, int height) \r
, width_(width)\r
, height_(height)\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("param", diagnostics::color(1.0f, 0.5f, 0.0f)); \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
+ BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(print() + L" Failed to create FlashAxContainer"));\r
\r
- ax_->set_print([this]{return L"flash_renderer";});\r
+ ax_->set_print([this]{return print();});\r
\r
if(FAILED(ax_->CreateAxControl()))\r
- BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to Create FlashAxControl"));\r
+ BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(print() + L" Failed to Create FlashAxControl"));\r
\r
CComPtr<IShockwaveFlash> spFlash;\r
if(FAILED(ax_->QueryControl(&spFlash)))\r
- BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to Query FlashAxControl"));\r
+ BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(print() + L" Failed to Query FlashAxControl"));\r
\r
if(FAILED(spFlash->put_Playing(true)) )\r
- BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to start playing Flash"));\r
+ BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(print() + L" Failed to start playing Flash"));\r
\r
if(FAILED(spFlash->put_Movie(CComBSTR(filename.c_str()))))\r
- BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to Load Template Host"));\r
+ BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(print() + L" Failed to Load Template Host"));\r
\r
if(FAILED(spFlash->put_ScaleMode(2))) //Exact fit. Scale without respect to the aspect ratio.\r
- BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to Set Scale Mode"));\r
+ BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(print() + L" Failed to Set Scale Mode"));\r
\r
ax_->SetSize(width_, height_); \r
+ render_frame(false);\r
\r
- CASPAR_LOG(info) << print() << L" Successfully initialized with template-host: " << filename << L" width: " << width_ << L" height: " << height_ << L".";\r
+ CASPAR_LOG(info) << print() << L" Initialized.";\r
}\r
\r
~flash_renderer()\r
ax_->DestroyAxControl();\r
ax_->Release();\r
}\r
+ graph_->set_value("tick-time", 0.0f);\r
+ graph_->set_value("frame-time", 0.0f);\r
CASPAR_LOG(info) << print() << L" Uninitialized.";\r
}\r
\r
{ \r
std::wstring result;\r
\r
+ CASPAR_LOG(trace) << print() << " Call: " << param;\r
+\r
if(!ax_->FlashCall(param, result))\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
+ graph_->set_tag("param");\r
\r
return result;\r
}\r
\r
- safe_ptr<core::basic_frame> render_frame(bool has_underflow)\r
+ safe_ptr<core::basic_frame> render_frame(bool sync)\r
{\r
float frame_time = 1.0f/ax_->GetFPS();\r
\r
- graph_->update_value("tick-time", static_cast<float>(tick_timer_.elapsed()/frame_time)*0.5f);\r
+ graph_->set_value("tick-time", static_cast<float>(tick_timer_.elapsed()/frame_time)*0.5f);\r
tick_timer_.restart();\r
\r
if(ax_->IsEmpty())\r
return core::basic_frame::empty(); \r
\r
- if(!has_underflow) \r
+ if(sync) \r
timer_.tick(frame_time); // This will block the thread.\r
else\r
- graph_->add_tag("skip-sync");\r
+ graph_->set_tag("skip-sync");\r
\r
frame_timer_.restart();\r
\r
ax_->Tick();\r
if(ax_->InvalidRect())\r
{ \r
- fast_memclr(bmp_.data(), width_*height_*4);\r
+ A_memset(bmp_.data(), 0, width_*height_*4);\r
ax_->DrawControl(bmp_);\r
\r
core::pixel_format_desc desc;\r
desc.planes.push_back(core::pixel_format_desc::plane(width_, height_, 4));\r
auto frame = frame_factory_->create_frame(this, desc);\r
\r
- fast_memcpy(frame->image_data().begin(), bmp_.data(), width_*height_*4);\r
+ A_memcpy(frame->image_data().begin(), bmp_.data(), width_*height_*4);\r
frame->commit();\r
head_ = frame;\r
} \r
- \r
- graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()/frame_time)*0.5f);\r
+ \r
+ MSG msg;\r
+ while(PeekMessage(&msg, NULL, NULL, NULL, PM_REMOVE)) // DO NOT REMOVE THE MESSAGE DISPATCH LOOP. Without this some stuff doesn't work! \r
+ {\r
+ if(msg.message == WM_TIMER && msg.wParam == 3 && msg.lParam == 0) // We tick this inside FlashAxContainer\r
+ continue;\r
+ \r
+ TranslateMessage(&msg);\r
+ DispatchMessage(&msg); \r
+ }\r
+ \r
+ graph_->set_value("frame-time", static_cast<float>(frame_timer_.elapsed()/frame_time)*0.5f);\r
return head_;\r
}\r
\r
\r
std::wstring print()\r
{\r
- return L"flash[" + boost::filesystem::wpath(filename_).filename() + L"]"; \r
+ return L"flash-player[" + boost::filesystem::wpath(filename_).filename().wstring() \r
+ + L"|" + boost::lexical_cast<std::wstring>(width_)\r
+ + L"x" + boost::lexical_cast<std::wstring>(height_)\r
+ + L"]"; \r
}\r
};\r
\r
{ \r
const std::wstring filename_; \r
const safe_ptr<core::frame_factory> frame_factory_;\r
+ const int width_;\r
+ const int height_;\r
+ const int buffer_size_;\r
\r
tbb::atomic<int> fps_;\r
+ tbb::atomic<bool> sync_;\r
\r
- safe_ptr<diagnostics::graph> graph_;\r
-\r
- tbb::concurrent_bounded_queue<safe_ptr<core::basic_frame>> frame_buffer_;\r
+ safe_ptr<diagnostics::graph> graph_;\r
\r
+ std::queue<safe_ptr<core::basic_frame>> frame_buffer_;\r
+ tbb::concurrent_bounded_queue<safe_ptr<core::basic_frame>> output_buffer_;\r
+ \r
mutable tbb::spin_mutex last_frame_mutex_;\r
safe_ptr<core::basic_frame> last_frame_;\r
\r
- int width_;\r
- int height_;\r
-\r
- com_context<flash_renderer> context_; \r
+ std::unique_ptr<flash_renderer> renderer_;\r
\r
+ executor executor_; \r
public:\r
- flash_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, size_t width, size_t height) \r
+ flash_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, int width, int height) \r
: filename_(filename) \r
, frame_factory_(frame_factory)\r
, last_frame_(core::basic_frame::empty())\r
, width_(width > 0 ? width : frame_factory->get_video_format_desc().width)\r
, height_(height > 0 ? height : frame_factory->get_video_format_desc().height)\r
- , context_(L"flash_producer")\r
+ , buffer_size_(env::properties().get(L"configuration.flash.buffer-depth", frame_factory_->get_video_format_desc().fps > 30.0 ? 3 : 2))\r
+ , executor_(L"flash_producer")\r
{ \r
- if(!boost::filesystem::exists(filename))\r
- BOOST_THROW_EXCEPTION(file_not_found() << boost::errinfo_file_name(narrow(filename))); \r
-\r
+ sync_ = true;\r
fps_ = 0;\r
-\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
+ graph_->set_color("buffer-size", diagnostics::color(1.0f, 1.0f, 0.0f));\r
+ graph_->set_color("late-frame", diagnostics::color(0.6f, 0.3f, 0.9f));\r
graph_->set_text(print());\r
diagnostics::register_graph(graph_);\r
- \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
{\r
- frame_buffer_.clear();\r
+ executor_.invoke([this]\r
+ {\r
+ renderer_.reset();\r
+ }, high_priority);\r
}\r
\r
// frame_producer\r
\r
virtual safe_ptr<core::basic_frame> receive(int) override\r
- { \r
- graph_->set_value("output-buffer-count", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity()));\r
-\r
+ { \r
auto frame = core::basic_frame::late();\r
- if(!frame_buffer_.try_pop(frame) && context_)\r
- graph_->add_tag("underflow");\r
+ \r
+ graph_->set_value("buffer-size", static_cast<float>(output_buffer_.size())/static_cast<float>(buffer_size_));\r
+ sync_ = output_buffer_.size() == buffer_size_;\r
\r
+ if(output_buffer_.try_pop(frame)) \r
+ next();\r
+ else\r
+ graph_->set_tag("late-frame");\r
+ \r
return frame;\r
}\r
\r
virtual safe_ptr<core::basic_frame> last_frame() const override\r
{\r
- tbb::spin_mutex::scoped_lock lock(last_frame_mutex_);\r
- return last_frame_;\r
+ return lock(last_frame_mutex_, [this]\r
+ {\r
+ return last_frame_;\r
+ });\r
} \r
\r
virtual boost::unique_future<std::wstring> call(const std::wstring& param) override\r
{ \r
- return context_.begin_invoke([=]() -> std::wstring\r
- {\r
- if(!context_)\r
- initialize();\r
-\r
+ return executor_.begin_invoke([this, param]() -> std::wstring\r
+ { \r
try\r
{\r
- return context_->call(param); \r
+ if(!renderer_)\r
+ {\r
+ renderer_.reset(new flash_renderer(graph_, frame_factory_, filename_, width_, height_));\r
+\r
+ while(output_buffer_.size() < buffer_size_)\r
+ output_buffer_.push(core::basic_frame::empty());\r
+ }\r
+\r
+ return renderer_->call(param); \r
\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
catch(...)\r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
- context_.reset(nullptr);\r
- frame_buffer_.push(core::basic_frame::empty());\r
+ renderer_.reset(nullptr);\r
}\r
\r
return L"";\r
\r
virtual std::wstring print() const override\r
{ \r
- return L"flash[" + boost::filesystem::wpath(filename_).filename() + L"|" + boost::lexical_cast<std::wstring>(fps_) + L"]"; \r
+ return L"flash[" + boost::filesystem::path(filename_).wstring() + L"|" + boost::lexical_cast<std::wstring>(fps_) + L"]"; \r
} \r
\r
virtual boost::property_tree::wptree info() const override\r
}\r
\r
// flash_producer\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
+ void next()\r
+ { \r
+ executor_.begin_invoke([this]\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
+ if(!renderer_)\r
+ frame_buffer_.push(core::basic_frame::empty());\r
\r
- if(abs(context_->fps()/2.0 - format_desc.fps) < 2.0) // flash == 2 * format -> interlace\r
+ if(frame_buffer_.empty())\r
+ {\r
+ auto format_desc = frame_factory_->get_video_format_desc();\r
+ \r
+ if(abs(renderer_->fps()/2.0 - format_desc.fps) < 2.0) // flash == 2 * format -> interlace\r
{\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
+ else if(abs(renderer_->fps() - format_desc.fps/2.0) < 2.0) // format == 2 * flash -> duplicate\r
{\r
auto frame = render_frame();\r
frame_buffer_.push(frame);\r
auto frame = render_frame();\r
frame_buffer_.push(frame);\r
}\r
+ \r
+ fps_.fetch_and_store(static_cast<int>(renderer_->fps()*100.0)); \r
+ graph_->set_text(print());\r
+ \r
+ if(renderer_->is_empty()) \r
+ renderer_.reset();\r
+ }\r
\r
- if(context_->is_empty())\r
- {\r
- context_.reset(nullptr);\r
- return;\r
- }\r
-\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
- graph_->set_text(narrow(print()));\r
+ output_buffer_.push(std::move(frame_buffer_.front()));\r
+ frame_buffer_.pop();\r
+ });\r
+ }\r
\r
- render(renderer);\r
- }\r
- catch(...)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- context_.reset(nullptr);\r
- frame_buffer_.push(core::basic_frame::empty());\r
- }\r
+ safe_ptr<core::basic_frame> render_frame()\r
+ { \r
+ auto frame = renderer_->render_frame(sync_);\r
+ lock(last_frame_mutex_, [&]\r
+ {\r
+ last_frame_ = frame;\r
});\r
+ return frame;\r
}\r
};\r
\r
{\r
auto template_host = get_template_host(frame_factory->get_video_format_desc());\r
\r
- return create_producer_destroy_proxy(make_safe<flash_producer>(frame_factory, env::template_folder() + L"\\" + template_host.filename, template_host.width, template_host.height));\r
+ auto filename = env::template_folder() + L"\\" + template_host.filename;\r
+ \r
+ if(!boost::filesystem::exists(filename))\r
+ BOOST_THROW_EXCEPTION(file_not_found() << boost::errinfo_file_name(u8(filename))); \r
+\r
+ return create_producer_destroy_proxy(\r
+ create_producer_print_proxy(\r
+ make_safe<flash_producer>(frame_factory, filename, template_host.width, template_host.height)));\r
}\r
\r
std::wstring find_template(const std::wstring& template_name)\r
projects / casparcg / blobdiff