{\r
std::map<std::string, diagnostics::line> lines_;\r
std::string name_;\r
+ float height_scale_;\r
\r
- implementation(const std::string& name) : name_(name){}\r
+ implementation(const std::string& name) \r
+ : name_(name)\r
+ , height_scale_(0){}\r
\r
void update(const std::string& name, float value)\r
{\r
private:\r
void render(sf::RenderTarget& target)\r
{\r
- const size_t text_size = 15;\r
- const size_t text_margin = 2;\r
- const size_t text_offset = text_size+text_margin*2;\r
-\r
- sf::String text(name_.c_str(), sf::Font::GetDefaultFont(), text_size);\r
- text.SetStyle(sf::String::Italic);\r
- text.Move(text_margin, text_margin);\r
- \r
glPushMatrix();\r
- glScaled(1.0f/GetScale().x, 1.0f/GetScale().y, 1.0f);\r
- target.Draw(text);\r
- float x_offset = text.GetPosition().x + text.GetRect().Right + text_margin*4;\r
- for(auto it = lines_.begin(); it != lines_.end(); ++it)\r
- { \r
- sf::String line_text(it->first, sf::Font::GetDefaultFont(), text_size);\r
- line_text.SetPosition(x_offset, text_margin);\r
- auto c = it->second.get_color();\r
- line_text.SetColor(sf::Color(c.red*255.0f, c.green*255.0f, c.blue*255.0f, c.alpha*255.0f));\r
- target.Draw(line_text);\r
- x_offset = line_text.GetRect().Right + text_margin*2;\r
- }\r
-\r
- glDisable(GL_TEXTURE_2D);\r
- glPopMatrix();\r
+ glScaled(1.0f, height_scale_, 1.0f);\r
+ height_scale_ = std::min(1.0f, height_scale_+0.1f);\r
\r
- glBegin(GL_QUADS);\r
- glColor4f(1.0f, 1.0f, 1.0f, 0.2f); \r
- glVertex2f(1.0f, 0.99f);\r
- glVertex2f(0.0f, 0.99f);\r
- glVertex2f(0.0f, 0.01f); \r
- glVertex2f(1.0f, 0.01f); \r
- glEnd();\r
+ const size_t text_size = 15;\r
+ const size_t text_margin = 2;\r
+ const size_t text_offset = text_size+text_margin*2;\r
\r
- glPushMatrix();\r
- glTranslated(0.0f, text_offset/GetScale().y, 1.0f);\r
- glScaled(1.0f, 1.0-text_offset/GetScale().y, 1.0f);\r
+ sf::String text(name_.c_str(), sf::Font::GetDefaultFont(), text_size);\r
+ text.SetStyle(sf::String::Italic);\r
+ text.Move(text_margin, text_margin);\r
+ \r
+ glPushMatrix();\r
+ glScaled(1.0f/GetScale().x, 1.0f/GetScale().y, 1.0f);\r
+ target.Draw(text);\r
+ float x_offset = text.GetPosition().x + text.GetRect().Right + text_margin*4;\r
+ for(auto it = lines_.begin(); it != lines_.end(); ++it)\r
+ { \r
+ sf::String line_text(it->first, sf::Font::GetDefaultFont(), text_size);\r
+ line_text.SetPosition(x_offset, text_margin);\r
+ auto c = it->second.get_color();\r
+ line_text.SetColor(sf::Color(c.red*255.0f, c.green*255.0f, c.blue*255.0f, c.alpha*255.0f));\r
+ target.Draw(line_text);\r
+ x_offset = line_text.GetRect().Right + text_margin*2;\r
+ }\r
+\r
+ glDisable(GL_TEXTURE_2D);\r
+ glPopMatrix();\r
+\r
+ glBegin(GL_QUADS);\r
+ glColor4f(1.0f, 1.0f, 1.0f, 0.2f); \r
+ glVertex2f(1.0f, 0.99f);\r
+ glVertex2f(0.0f, 0.99f);\r
+ glVertex2f(0.0f, 0.01f); \r
+ glVertex2f(1.0f, 0.01f); \r
+ glEnd();\r
+\r
+ glPushMatrix();\r
+ glTranslated(0.0f, text_offset/GetScale().y, 1.0f);\r
+ glScaled(1.0f, 1.0-text_offset/GetScale().y, 1.0f);\r
\r
- target.Draw(diagnostics::guide(1.0f, color(1.0f, 1.0f, 1.0f, 0.6f)));\r
- target.Draw(diagnostics::guide(0.0f, color(1.0f, 1.0f, 1.0f, 0.6f)));\r
+ target.Draw(diagnostics::guide(1.0f, color(1.0f, 1.0f, 1.0f, 0.6f)));\r
+ target.Draw(diagnostics::guide(0.0f, color(1.0f, 1.0f, 1.0f, 0.6f)));\r
\r
- for(auto it = lines_.begin(); it != lines_.end(); ++it) \r
- target.Draw(it->second);\r
+ for(auto it = lines_.begin(); it != lines_.end(); ++it) \r
+ target.Draw(it->second);\r
\r
- glPopMatrix();\r
+ glPopMatrix();\r
\r
+ glPopMatrix();\r
}\r
\r
implementation(implementation&);\r
\r
#include "transition_producer.h"\r
\r
+#include <common/diagnostics/graph.h>\r
+#include <common/utility/timer.h>\r
#include <core/video_format.h>\r
\r
#include <mixer/frame/draw_frame.h>\r
\r
std::shared_ptr<frame_factory> frame_factory_;\r
\r
+ safe_ptr<diagnostics::graph> graph_;\r
+ timer perf_timer_;\r
+\r
implementation(const safe_ptr<frame_producer>& dest, const transition_info& info) \r
: current_frame_(0)\r
, info_(info)\r
, dest_producer_(dest)\r
- , source_producer_(frame_producer::empty()){}\r
+ , source_producer_(frame_producer::empty())\r
+ , graph_(diagnostics::create_graph(narrow(print())))\r
+ {\r
+ graph_->guide("frame-time", 0.5);\r
+ graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
+ graph_->set_color("frames-left", diagnostics::color(0.0f, 1.0f, 0.0f));\r
+ }\r
\r
void initialize(const safe_ptr<frame_factory>& frame_factory)\r
{\r
{\r
source_producer_ = producer;\r
}\r
- \r
+\r
safe_ptr<draw_frame> receive()\r
+ {\r
+ perf_timer_.reset();\r
+ auto frame = do_receive();\r
+ graph_->update("frame-time", static_cast<float>(perf_timer_.elapsed()/frame_factory_->get_video_format_desc().interval*0.5));\r
+ graph_->update("frames-left", static_cast<float>(info_.duration-current_frame_)/static_cast<float>(info_.duration));\r
+ return frame;\r
+ }\r
+ \r
+ safe_ptr<draw_frame> do_receive()\r
{\r
if(current_frame_++ >= info_.duration)\r
return draw_frame::eof();\r
\r
std::wstring print() const\r
{\r
- return L"transition[" + (source_producer_->print()) + L" -> " + (dest_producer_->print()) + L"]";\r
+ return L"transition[-> " + (dest_producer_->print()) + L"]";\r
}\r
};\r
\r
{\r
graph_->guide("frame-time", 0.5f); \r
graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
- graph_->set_color("frame-wait", diagnostics::color(0.1f, 0.7f, 0.8f));\r
+ graph_->set_color("output-wait", diagnostics::color(0.1f, 0.7f, 0.8f));\r
graph_->set_color("output-buffer", diagnostics::color( 0.0f, 1.0f, 0.0f)); \r
executor_.start();\r
executor_.set_capacity(2);\r
\r
wait_perf_timer_.reset();\r
output_(make_safe<const read_frame>(std::move(image.get()), std::move(audio)));\r
- graph_->update("frame-wait", static_cast<float>(wait_perf_timer_.elapsed()/format_desc_.interval*0.5));\r
+ graph_->update("output-wait", static_cast<float>(wait_perf_timer_.elapsed()/format_desc_.interval*0.5));\r
});\r
graph_->update("output-buffer", static_cast<float>(executor_.size())/static_cast<float>(executor_.capacity()));\r
}\r
projects / casparcg / commitdiff