X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fhtml%2Fproducer%2Fhtml_producer.cpp;h=78ca18fc7be036b8bfd073925316ea79aa108ef1;hb=0b5b222f19eaa060db90dbe3d2dce1b8d43b816f;hp=30d8ed06fb651da7009bff13328bd30c791e3ac0;hpb=0e98938d29a783f099b1b5bfdf7f8cf65a93d9af;p=casparcg diff --git a/modules/html/producer/html_producer.cpp b/modules/html/producer/html_producer.cpp index 30d8ed06f..78ca18fc7 100644 --- a/modules/html/producer/html_producer.cpp +++ b/modules/html/producer/html_producer.cpp @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -116,7 +117,7 @@ public: { graph_->set_color("browser-tick-time", diagnostics::color(0.1f, 1.0f, 0.1f)); graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f)); - graph_->set_color("late-frame", diagnostics::color(0.6f, 0.3f, 0.9f)); + graph_->set_color("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f)); graph_->set_text(print()); diagnostics::register_graph(graph_); @@ -205,13 +206,12 @@ private: paint_timer_.restart(); CASPAR_ASSERT(CefCurrentlyOn(TID_UI)); - boost::timer copy_timer; core::pixel_format_desc pixel_desc; pixel_desc.format = core::pixel_format::bgra; pixel_desc.planes.push_back( core::pixel_format_desc::plane(width, height, 4)); auto frame = frame_factory_->create_frame(this, pixel_desc, core::audio_channel_layout::invalid()); - A_memcpy(frame.image_data().begin(), buffer, width * height * 4); + fast_memcpy(frame.image_data().begin(), buffer, width * height * 4); lock(frames_mutex_, [&] { @@ -225,10 +225,6 @@ private: graph_->set_tag(diagnostics::tag_severity::WARNING, "dropped-frame"); } }); - graph_->set_value("copy-time", copy_timer.elapsed() - * format_desc_.fps - * format_desc_.field_count - * 0.5); } void OnAfterCreated(CefRefPtr browser) override @@ -310,6 +306,7 @@ private: browser_->SendProcessMessage( CefProcessId::PID_RENDERER, CefProcessMessage::Create(TICK_MESSAGE_NAME)); + graph_->set_value("tick-time", tick_timer_.elapsed() * format_desc_.fps * format_desc_.field_count @@ -401,8 +398,6 @@ private: } else { - graph_->set_tag(diagnostics::tag_severity::INFO, "late-frame"); - if (format_desc_.field_mode != core::field_mode::progressive) lock(last_frame_mutex_, [&] {