2.0.2: ogl_consumer: Updated graphs, added tick-timer, and made frame-timer measure...

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1645 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index fd1f4ac14f80bf448355b8728d20557e6c2d7613..17812425d30fdf24ea1331752ad6202fa2b9fa14 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -115,6 +115,7 @@ struct ogl_consumer : boost::noncopyable
        \r
        safe_ptr<diagnostics::graph>    graph_;\r
        boost::timer                                    perf_timer_;\r
+       boost::timer                                    tick_timer_;\r
 \r
        tbb::concurrent_bounded_queue<safe_ptr<core::read_frame>>       frame_buffer_;\r
 \r
@@ -136,9 +137,10 @@ public:
                , filter_(format_desc.field_mode == core::field_mode::progressive || !config.auto_deinterlace ? L"" : L"YADIF=0:-1", boost::assign::list_of(PIX_FMT_BGRA))\r
        {               \r
                frame_buffer_.set_capacity(2);\r
-\r
-               graph_->add_guide("frame-time", 0.5);\r
-               graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
+               \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("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f));\r
                graph_->set_color("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f));\r
                graph_->set_text(print());\r
                diagnostics::register_graph(graph_);\r
@@ -233,7 +235,6 @@ public:
                        {                       \r
                                try\r
                                {\r
-                                       perf_timer_.restart();\r
 \r
                                        sf::Event e;            \r
                                        while(window_.GetEvent(e))\r
@@ -244,11 +245,15 @@ public:
                        \r
                                        safe_ptr<core::read_frame> frame;\r
                                        frame_buffer_.pop(frame);\r
+                                       \r
+                                       perf_timer_.restart();\r
                                        render(frame);\r
+                                       graph_->update_value("frame-time", perf_timer_.elapsed()*format_desc_.fps*0.5); \r
 \r
                                        window_.Display();\r
-\r
-                                       graph_->update_value("frame-time", static_cast<float>(perf_timer_.elapsed()*format_desc_.fps*0.5));     \r
+                                       \r
+                                       graph_->update_value("tick-time", tick_timer_.elapsed()*format_desc_.fps*0.5);  \r
+                                       tick_timer_.restart();\r
                                }\r
                                catch(...)\r
                                {\r