X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fflash%2Fproducer%2Fflash_producer.cpp;h=a93e70f08784c6e5efc6f081e67b715a30bc0e8a;hb=d93b25248f6fe26069350a512f29327ce59fd95b;hp=036b818f5b5c17ee3748204b791fcaf256c2dc11;hpb=dfb3fe93b4e4e735ed973be93811c5697e4e150c;p=casparcg diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp index 036b818f5..a93e70f08 100644 --- a/modules/flash/producer/flash_producer.cpp +++ b/modules/flash/producer/flash_producer.cpp @@ -47,7 +47,9 @@ #include -namespace caspar { +#include + +namespace caspar { namespace flash { class bitmap { @@ -83,10 +85,48 @@ private: std::shared_ptr bmp_; }; +struct template_host +{ + std::string field_mode; + std::string filename; + size_t width; + size_t height; +}; + +template_host get_template_host(const core::video_format_desc& desc) +{ + std::vector template_hosts; + BOOST_FOREACH(auto& xml_mapping, env::properties().get_child("configuration.producers.template-hosts")) + { + try + { + template_host template_host; + template_host.field_mode = xml_mapping.second.get("video-mode", narrow(desc.name)); + template_host.filename = xml_mapping.second.get("filename", "cg.fth"); + template_host.width = xml_mapping.second.get("width", desc.width); + template_host.height = xml_mapping.second.get("height", desc.height); + template_hosts.push_back(template_host); + } + catch(...){} + } + + auto template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.field_mode == narrow(desc.name);}); + if(template_host_it == template_hosts.end()) + template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.field_mode == "";}); + + if(template_host_it != template_hosts.end()) + return *template_host_it; + + template_host template_host; + template_host.filename = "cg.fth"; + template_host.width = desc.width; + template_host.height = desc.height; + return template_host; +} + class flash_renderer { const std::wstring filename_; - core::video_format_desc format_desc_; const std::shared_ptr frame_factory_; @@ -99,23 +139,27 @@ class flash_renderer boost::timer tick_timer_; high_prec_timer timer_; + + const size_t width_; + const size_t height_; public: - flash_renderer(const safe_ptr& graph, const std::shared_ptr& frame_factory, const std::wstring& filename) + flash_renderer(const safe_ptr& graph, const std::shared_ptr& frame_factory, const std::wstring& filename, int width, int height) : graph_(graph) , filename_(filename) - , format_desc_(frame_factory->get_video_format_desc()) , frame_factory_(frame_factory) , ax_(nullptr) , head_(core::basic_frame::empty()) - , bmp_(format_desc_.width, format_desc_.height) - { + , bmp_(width, height) + , width_(width) + , height_(height) + { graph_->add_guide("frame-time", 0.5f); - graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f)); + graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f)); graph_->add_guide("tick-time", 0.5); - graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f)); + graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f)); graph_->set_color("param", diagnostics::color(1.0f, 0.5f, 0.0f)); - graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); + graph_->set_color("skip-sync", diagnostics::color(0.8f, 0.3f, 0.2f)); if(FAILED(CComObject::CreateInstance(&ax_))) BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to create FlashAxContainer")); @@ -138,9 +182,10 @@ public: if(FAILED(spFlash->put_ScaleMode(2))) //Exact fit. Scale without respect to the aspect ratio. BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to Set Scale Mode")); - ax_->SetFormat(format_desc_); + ax_->SetSize(width_, height_); CASPAR_LOG(info) << print() << L" Thread started."; + CASPAR_LOG(info) << print() << L" Successfully initialized with template-host: " << filename << L" width: " << width_ << L" height: " << height_ << L"."; } ~flash_renderer() @@ -156,21 +201,12 @@ public: void param(const std::wstring& param) { if(!ax_->FlashCall(param)) - CASPAR_LOG(warning) << print() << " Flash function call failed. Param: " << param << "."; + 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))); graph_->add_tag("param"); - - if(abs(ax_->GetFPS() - format_desc_.fps) > 0.01 && abs(ax_->GetFPS()/2.0 - format_desc_.fps) > 0.01) - CASPAR_LOG(warning) << print() << " Invalid frame-rate: " << ax_->GetFPS() << L". Should be either " << format_desc_.fps << L" or " << format_desc_.fps*2.0 << L"."; } safe_ptr render_frame(bool has_underflow) { - if(format_desc_ != frame_factory_->get_video_format_desc()) - { - format_desc_ = frame_factory_->get_video_format_desc(); - ax_->SetFormat(format_desc_); - } - float frame_time = 1.0f/ax_->GetFPS(); graph_->update_value("tick-time", static_cast(tick_timer_.elapsed()/frame_time)*0.5f); @@ -182,18 +218,18 @@ public: if(!has_underflow) timer_.tick(frame_time); // This will block the thread. else - graph_->add_tag("underflow"); + graph_->add_tag("skip-sync"); frame_timer_.restart(); ax_->Tick(); if(ax_->InvalidRect()) { - fast_memclr(bmp_.data(), format_desc_.size); + fast_memclr(bmp_.data(), width_*height_*4); ax_->DrawControl(bmp_); - auto frame = frame_factory_->create_frame(this, format_desc_.width, format_desc_.height); - fast_memcpy(frame->image_data().begin(), bmp_.data(), format_desc_.size); + auto frame = frame_factory_->create_frame(this, width_, height_); + fast_memcpy(frame->image_data().begin(), bmp_.data(), width_*height_*4); frame->commit(); head_ = frame; } @@ -202,6 +238,11 @@ public: return head_; } + bool is_empty() const + { + return ax_->IsEmpty(); + } + double fps() const { return ax_->GetFPS(); @@ -223,23 +264,33 @@ struct flash_producer : public core::frame_producer std::shared_ptr graph_; tbb::concurrent_bounded_queue> frame_buffer_; + + mutable tbb::spin_mutex last_frame_mutex_; + safe_ptr last_frame_; - com_context context_; + com_context context_; + + int width_; + int height_; public: - flash_producer(const safe_ptr& frame_factory, const std::wstring& filename) + flash_producer(const safe_ptr& frame_factory, const std::wstring& filename, size_t width, size_t height) : filename_(filename) , frame_factory_(frame_factory) , context_(L"flash_producer") + , last_frame_(core::basic_frame::empty()) + , width_(width > 0 ? width : frame_factory->get_video_format_desc().width) + , height_(height > 0 ? height : frame_factory->get_video_format_desc().height) { if(!boost::filesystem::exists(filename)) BOOST_THROW_EXCEPTION(file_not_found() << boost::errinfo_file_name(narrow(filename))); - + fps_ = 0; - graph_ = diagnostics::create_graph([this]{return print();}); - graph_->set_color("output-buffer", diagnostics::color(0.0f, 1.0f, 0.0f)); + graph_ = diagnostics::create_graph(narrow(print())); + graph_->set_color("output-buffer-count", diagnostics::color(1.0f, 1.0f, 0.0f)); + graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); - frame_buffer_.set_capacity(2); + frame_buffer_.set_capacity(frame_factory_->get_video_format_desc().fps > 30.0 ? 2 : 1); initialize(); } @@ -251,14 +302,22 @@ public: // frame_producer - virtual safe_ptr receive() + virtual safe_ptr receive(int) { - graph_->set_value("output-buffer", static_cast(frame_buffer_.size())/static_cast(frame_buffer_.capacity())); + graph_->set_value("output-buffer-count", static_cast(frame_buffer_.size())/static_cast(frame_buffer_.capacity())); auto frame = core::basic_frame::late(); - frame_buffer_.try_pop(frame); + if(!frame_buffer_.try_pop(frame) && context_) + graph_->add_tag("underflow"); + return frame; } + + virtual safe_ptr last_frame() const + { + tbb::spin_mutex::scoped_lock lock(last_frame_mutex_); + return last_frame_; + } virtual void param(const std::wstring& param) { @@ -270,6 +329,10 @@ public: try { context_->param(param); + + //const auto& format_desc = frame_factory_->get_video_format_desc(); + //if(abs(context_->fps() - format_desc.fps) > 0.01 && abs(context_->fps()/2.0 - format_desc.fps) > 0.01) + // CASPAR_LOG(warning) << print() << " Invalid frame-rate: " << context_->fps() << L". Should be either " << format_desc.fps << L" or " << format_desc.fps*2.0 << L"."; } catch(...) { @@ -282,19 +345,26 @@ public: virtual std::wstring print() const { - return L"flash[" + boost::filesystem::wpath(filename_).filename() + L", " + - boost::lexical_cast(fps_) + L"]"; + return L"flash[" + boost::filesystem::wpath(filename_).filename() + L"|" + boost::lexical_cast(fps_) + L"]"; } // flash_producer void initialize() { - context_.reset([&]{return new flash_renderer(safe_ptr(graph_), frame_factory_, filename_);}); + context_.reset([&]{return new flash_renderer(safe_ptr(graph_), frame_factory_, filename_, width_, height_);}); while(frame_buffer_.try_push(core::basic_frame::empty())){} render(context_.get()); } + safe_ptr render_frame() + { + auto frame = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity()); + tbb::spin_mutex::scoped_lock lock(last_frame_mutex_); + last_frame_ = make_safe(frame); + return frame; + } + void render(const flash_renderer* renderer) { context_.begin_invoke([=] @@ -306,26 +376,33 @@ public: { const auto& format_desc = frame_factory_->get_video_format_desc(); - if(abs(context_->fps()/2.0 - format_desc.fps) < 0.01) // flash == 2 * format -> interlace + if(abs(context_->fps()/2.0 - format_desc.fps) < 2.0) // flash == 2 * format -> interlace { - auto frame1 = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity()); - auto frame2 = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity()); - frame_buffer_.push(core::basic_frame::interlace(frame1, frame2, format_desc.mode)); + auto frame1 = render_frame(); + auto frame2 = render_frame(); + frame_buffer_.push(core::basic_frame::interlace(frame1, frame2, format_desc.field_mode)); } - else if(abs(context_->fps()- format_desc.fps/2.0) < 0.01) // format == 2 * flash -> duplicate + else if(abs(context_->fps()- format_desc.fps/2.0) < 2.0) // format == 2 * flash -> duplicate { - auto frame = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity()); + auto frame = render_frame(); frame_buffer_.push(frame); frame_buffer_.push(frame); } else //if(abs(renderer_->fps() - format_desc_.fps) < 0.1) // format == flash -> simple { - auto frame = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity()); + auto frame = render_frame(); frame_buffer_.push(frame); } - graph_->set_value("output-buffer", static_cast(frame_buffer_.size())/static_cast(frame_buffer_.capacity())); - fps_.fetch_and_store(static_cast(context_->fps()*100.0)); + if(context_->is_empty()) + { + context_.reset(nullptr); + return; + } + + graph_->set_value("output-buffer-count", static_cast(frame_buffer_.size())/static_cast(frame_buffer_.capacity())); + fps_.fetch_and_store(static_cast(context_->fps()*100.0)); + graph_->update_text(narrow(print())); render(renderer); } @@ -339,14 +416,14 @@ public: } }; -safe_ptr create_flash_producer(const safe_ptr& frame_factory, const std::vector& params) +safe_ptr create_producer(const safe_ptr& frame_factory, const std::vector& params) { - std::wstring filename = env::template_folder() + L"\\" + params[0]; + auto template_host = get_template_host(frame_factory->get_video_format_desc()); - return make_safe(frame_factory, filename); + return make_safe(frame_factory, env::template_folder() + L"\\" + widen(template_host.filename), template_host.width, template_host.height); } -std::wstring find_flash_template(const std::wstring& template_name) +std::wstring find_template(const std::wstring& template_name) { if(boost::filesystem::exists(template_name + L".ft")) return template_name + L".ft"; @@ -357,4 +434,4 @@ std::wstring find_flash_template(const std::wstring& template_name) return L""; } -} \ No newline at end of file +}} \ No newline at end of file