2.1.0: -graph: Refactored: Safer and faster.

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

diff --git a/common/diagnostics/graph.cpp b/common/diagnostics/graph.cpp
index a57cac1325b319fcb75ac36554c5ba9125df5b83..c65d469960ea6fd386738dd0f5cf2755435b91cb 100644 (file)
--- a/common/diagnostics/graph.cpp
+++ b/common/diagnostics/graph.cpp
@@ -35,12 +35,33 @@
 #include <boost/circular_buffer.hpp>\r
 #include <boost/range/algorithm_ext/erase.hpp>\r
 \r
+#include <tbb/concurrent_unordered_map.h>\r
+#include <tbb/atomic.h>\r
+\r
 #include <numeric>\r
-#include <map>\r
 #include <array>\r
 \r
 namespace caspar { namespace diagnostics {\r
                \r
+int color(float r, float g, float b, float a)\r
+{\r
+       int code = 0;\r
+       code |= static_cast<int>(r*255.0f+0.5f) << 24;\r
+       code |= static_cast<int>(g*255.0f+0.5f) << 16;\r
+       code |= static_cast<int>(b*255.0f+0.5f) <<  8;\r
+       code |= static_cast<int>(a*255.0f+0.5f) <<  0;\r
+       return code;\r
+}\r
+\r
+std::tuple<float, float, float, float> color(int code)\r
+{\r
+       float r = static_cast<float>((code >> 24) & 255)/255.0f;\r
+       float g = static_cast<float>((code >> 16) & 255)/255.0f;\r
+       float b = static_cast<float>((code >>  8) & 255)/255.0f;\r
+       float a = static_cast<float>((code >>  0) & 255)/255.0f;\r
+       return std::make_tuple(r, g, b, a);\r
+}\r
+\r
 struct drawable : public sf::Drawable\r
 {\r
        virtual ~drawable(){}\r
@@ -57,19 +78,12 @@ class context : public drawable
        executor executor_;\r
 public:                                        \r
 \r
-       template<typename Func>\r
-       static void begin_invoke(Func&& func, task_priority priority) // noexcept\r
-       {       \r
-               if(get_instance().executor_.size() < 128)\r
-                       get_instance().executor_.begin_invoke(std::forward<Func>(func), priority);      \r
-       }\r
-\r
        static void register_drawable(const std::shared_ptr<drawable>& drawable)\r
        {\r
                if(!drawable)\r
                        return;\r
 \r
-               begin_invoke([=]\r
+               get_instance().executor_.begin_invoke([=]\r
                {\r
                        get_instance().do_register_drawable(drawable);\r
                }, high_priority);\r
@@ -77,7 +91,7 @@ public:
 \r
        static void show(bool value)\r
        {\r
-               begin_invoke([=]\r
+               get_instance().executor_.begin_invoke([=]\r
                {       \r
                        get_instance().do_show(value);\r
                }, high_priority);\r
@@ -166,105 +180,55 @@ private:
        }\r
 };\r
 \r
-class guide : public drawable\r
-{\r
-       float value_;\r
-       color c_;\r
-public:\r
-       guide(color c = color(1.0f, 1.0f, 1.0f, 0.6f)) \r
-               : value_(0.0f)\r
-               , c_(c){}\r
-\r
-       guide(float value, color c = color(1.0f, 1.0f, 1.0f, 0.6f)) \r
-               : value_(value)\r
-               , c_(c){}\r
-                       \r
-       void set_color(color c) {c_ = c;}\r
-\r
-       void render(sf::RenderTarget&)\r
-       {               \r
-               glEnable(GL_LINE_STIPPLE);\r
-               glLineStipple(3, 0xAAAA);\r
-               glBegin(GL_LINE_STRIP); \r
-                       glColor4f(c_.red, c_.green, c_.blue+0.2f, c_.alpha);            \r
-                       glVertex3f(0.0f, (1.0f-value_) * 0.8f + 0.1f, 0.0f);            \r
-                       glVertex3f(1.0f, (1.0f-value_) * 0.8f + 0.1f, 0.0f);    \r
-               glEnd();\r
-               glDisable(GL_LINE_STIPPLE);\r
-       }\r
-};\r
-\r
 class line : public drawable\r
 {\r
-       boost::optional<diagnostics::guide> guide_;\r
        boost::circular_buffer<std::pair<double, bool>> line_data_;\r
 \r
-       boost::circular_buffer<double>  tick_data_;\r
-       bool                                                    tick_tag_;\r
-       color c_;\r
+       tbb::atomic<double>     tick_data_;\r
+       tbb::atomic<bool>       tick_tag_;\r
+       tbb::atomic<int>        color_;\r
 public:\r
        line(size_t res = 600)\r
                : line_data_(res)\r
-               , tick_data_(50)\r
-               , tick_tag_(false)\r
-               , c_(1.0f, 1.0f, 1.0f)\r
        {\r
+               tick_data_      = 0;\r
+               color_          = 0xFFFFFFFF;\r
+               tick_tag_       = false;\r
+\r
                line_data_.push_back(std::make_pair(-1.0f, false));\r
        }\r
        \r
-       void update(double value)\r
-       {\r
-               tick_data_.push_back(value);\r
-       }\r
-\r
-       void set(double value)\r
+       void set_value(double value)\r
        {\r
-               tick_data_.clear();\r
-               tick_data_.push_back(value);\r
+               tick_data_ = value;\r
        }\r
        \r
-       void tag()\r
+       void set_tag()\r
        {\r
                tick_tag_ = true;\r
        }\r
-\r
-       void guide(const guide& guide)\r
+               \r
+       void set_color(int color)\r
        {\r
-               guide_ = guide;\r
-               guide_->set_color(c_);\r
+               color_ = color;\r
        }\r
-       \r
-       void set_color(color c)\r
+\r
+       int get_color()\r
        {\r
-               c_ = c;\r
-               if(guide_)\r
-                       guide_->set_color(c_);\r
+               return color_;\r
        }\r
-\r
-       color get_color() const { return c_; }\r
-       \r
+               \r
        void render(sf::RenderTarget& target)\r
        {\r
                float dx = 1.0f/static_cast<float>(line_data_.capacity());\r
                float x = static_cast<float>(line_data_.capacity()-line_data_.size())*dx;\r
 \r
-               if(!tick_data_.empty())\r
-               {\r
-                       float sum = std::accumulate(tick_data_.begin(), tick_data_.end(), 0.0) + std::numeric_limits<float>::min();\r
-                       line_data_.push_back(std::make_pair(static_cast<float>(sum)/static_cast<float>(tick_data_.size()), tick_tag_));\r
-                       tick_data_.clear();\r
-               }\r
-               else if(!line_data_.empty())\r
-               {\r
-                       line_data_.push_back(std::make_pair(line_data_.back().first, tick_tag_));\r
-               }\r
-               tick_tag_ = false;\r
-\r
-               if(guide_)\r
-                       target.Draw(*guide_);\r
-               \r
+               line_data_.push_back(std::make_pair(tick_data_, tick_tag_));            \r
+               tick_tag_   = false;\r
+                               \r
                glBegin(GL_LINE_STRIP);\r
-               glColor4f(c_.red, c_.green, c_.blue, 0.8f);             \r
+               auto c = color(color_);\r
+               glColor4f(std::get<0>(c), std::get<1>(c), std::get<2>(c), 0.8f);                \r
                for(size_t n = 0; n < line_data_.size(); ++n)           \r
                        if(line_data_[n].first > -0.5)\r
                                glVertex3d(x+n*dx, std::max(0.05, std::min(0.95, (1.0f-line_data_[n].first)*0.8 + 0.1f)), 0.0);         \r
@@ -276,8 +240,7 @@ public:
                {\r
                        if(line_data_[n].second)\r
                        {\r
-                               glBegin(GL_LINE_STRIP);\r
-                               glColor4f(c_.red, c_.green, c_.blue, c_.alpha);                                 \r
+                               glBegin(GL_LINE_STRIP);                 \r
                                        glVertex3f(x+n*dx, 0.0f, 0.0f);                         \r
                                        glVertex3f(x+n*dx, 1.0f, 0.0f);         \r
                                glEnd();\r
@@ -289,44 +252,33 @@ public:
 \r
 struct graph::implementation : public drawable\r
 {\r
-       std::map<std::string, diagnostics::line> lines_;\r
-       std::string name_;\r
-       std::string text_;\r
-       \r
-       implementation(const std::string& name) \r
-               : name_(name)\r
-               , text_(name_){}\r
-       \r
-       void set_text(const std::string& value)\r
+       tbb::concurrent_unordered_map<std::string, diagnostics::line> lines_;\r
+       std::wstring text_;\r
+               \r
+       implementation()\r
        {\r
-               text_ = value;\r
        }\r
 \r
-       void update(const std::string& name, double value)\r
+       void set_text(const std::wstring& value)\r
        {\r
-               lines_[name].update(value);\r
+               text_ = value;\r
        }\r
 \r
-       void set(const std::string& name, double value)\r
+       void set_value(const std::string& name, double value)\r
        {\r
-               lines_[name].set(value);\r
+               lines_[name].set_value(value);\r
        }\r
 \r
-       void tag(const std::string& name)\r
+       void set_tag(const std::string& name)\r
        {\r
-               lines_[name].tag();\r
+               lines_[name].set_tag();\r
        }\r
 \r
-       void set_color(const std::string& name, color c)\r
+       void set_color(const std::string& name, int color)\r
        {\r
-               lines_[name].set_color(c);\r
+               lines_[name].set_color(color);\r
        }\r
-       \r
-       void guide(const std::string& name, double value)\r
-       {\r
-               lines_[name].guide(diagnostics::guide(value));  \r
-       }\r
-       \r
+               \r
 private:\r
        void render(sf::RenderTarget& target)\r
        {\r
@@ -347,7 +299,7 @@ private:
                                sf::String line_text(it->first, sf::Font::GetDefaultFont(), text_size);\r
                                line_text.SetPosition(x_offset, text_margin+text_offset/2);\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
+                               line_text.SetColor(sf::Color((c >> 24) & 255, (c >> 16) & 255, (c >> 8) & 255, (c >> 0) & 255));\r
                                target.Draw(line_text);\r
                                x_offset = line_text.GetRect().Right + text_margin*2;\r
                        }\r
@@ -367,8 +319,25 @@ private:
                        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
+                       glEnable(GL_LINE_STIPPLE);\r
+                       glLineStipple(3, 0xAAAA);\r
+                       glColor4f(0.8f, 0.8f, 0.8f, 1.0f);      \r
+                       glBegin(GL_LINE_STRIP);         \r
+                               glVertex3f(0.0f, (1.0f-0.5f) * 0.8f + 0.1f, 0.0f);              \r
+                               glVertex3f(1.0f, (1.0f-0.5f) * 0.8f + 0.1f, 0.0f);      \r
+                       glEnd();\r
+                       glBegin(GL_LINE_STRIP);         \r
+                               glVertex3f(0.0f, (1.0f-0.0f) * 0.8f + 0.1f, 0.0f);              \r
+                               glVertex3f(1.0f, (1.0f-0.0f) * 0.8f + 0.1f, 0.0f);      \r
+                       glEnd();\r
+                       glBegin(GL_LINE_STRIP);         \r
+                               glVertex3f(0.0f, (1.0f-1.0f) * 0.8f + 0.1f, 0.0f);              \r
+                               glVertex3f(1.0f, (1.0f-1.0f) * 0.8f + 0.1f, 0.0f);      \r
+                       glEnd();\r
+                       glDisable(GL_LINE_STIPPLE);\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
 \r
                        for(auto it = lines_.begin(); it != lines_.end(); ++it)         \r
                                target.Draw(it->second);\r
@@ -380,69 +349,14 @@ private:
        implementation& operator=(implementation&);\r
 };\r
        \r
-graph::graph() : impl_(new implementation(""))\r
+graph::graph() : impl_(new implementation())\r
 {\r
-\r
 }\r
 \r
-void graph::set_text(const std::string& value)\r
-{\r
-       auto p = impl_;\r
-       context::begin_invoke([=]\r
-       {       \r
-               p->set_text(value);\r
-       }, high_priority);\r
-}\r
-\r
-void graph::set_text(const std::wstring& value)\r
-{\r
-       auto p = impl_;\r
-       context::begin_invoke([=]\r
-       {       \r
-               set_text(u8(value));\r
-       }, high_priority);\r
-}\r
-\r
-void graph::update_value(const std::string& name, double value)\r
-{\r
-       auto p = impl_;\r
-       context::begin_invoke([=]\r
-       {       \r
-               p->update(name, value);\r
-       }, high_priority);\r
-}\r
-void graph::set_value(const std::string& name, double value)\r
-{      \r
-       auto p = impl_;\r
-       context::begin_invoke([=]\r
-       {       \r
-               p->set(name, value);\r
-       }, high_priority);      \r
-}\r
-void graph::set_color(const std::string& name, color c)\r
-{              \r
-       auto p = impl_;\r
-       context::begin_invoke([=]\r
-       {       \r
-               p->set_color(name, c);\r
-       }, high_priority);\r
-}\r
-void graph::add_tag(const std::string& name)\r
-{              \r
-       auto p = impl_;\r
-       context::begin_invoke([=]\r
-       {       \r
-               p->tag(name);\r
-       }, high_priority);\r
-}\r
-void graph::add_guide(const std::string& name, double value)\r
-{      \r
-       auto p = impl_;\r
-       context::begin_invoke([=]\r
-       {       \r
-               p->guide(name, value);\r
-       }, high_priority);\r
-}\r
+void graph::set_text(const std::wstring& value){impl_->set_text(value);}\r
+void graph::set_value(const std::string& name, double value){impl_->set_value(name, value);}\r
+void graph::set_color(const std::string& name, int color){impl_->set_color(name, color);}\r
+void graph::set_tag(const std::string& name){impl_->set_tag(name);}\r
 \r
 void register_graph(const safe_ptr<graph>& graph)\r
 {\r
@@ -466,7 +380,7 @@ void show_graphs(bool value)
 //             : name_(name)\r
 //             , ticks_(1024){}\r
 //     \r
-//     void update_value(float value)\r
+//     void set_value(float value)\r
 //     {\r
 //             ticks_.push_back();\r
 //             ticks_.back().value = value;\r
@@ -475,14 +389,14 @@ void show_graphs(bool value)
 //     void set_value(float value)\r
 //     {\r
 //             ticks_.clear();\r
-//             update_value(value);\r
+//             set_value(value);\r
 //     }\r
 //};\r
 //\r
 //line::line(){}\r
 //line::line(const std::wstring& name) : impl_(new implementation(name)){}\r
 //std::wstring line::print() const {return impl_->name_;}\r
-//void line::update_value(float value){impl_->update_value(value);}\r
+//void line::set_value(float value){impl_->set_value(value);}\r
 //void line::set_value(float value){impl_->set_value(value);}\r
 //boost::circular_buffer<data>& line::ticks() { return impl_->ticks_;}\r
 //\r
@@ -498,13 +412,13 @@ void show_graphs(bool value)
 //     implementation(const printer& parent_printer) \r
 //             : printer_(parent_printer){}\r
 //     \r
-//     void update_value(const std::wstring& name, float value)\r
+//     void set_value(const std::wstring& name, float value)\r
 //     {\r
 //             auto it = lines_.find(name);\r
 //             if(it == lines_.end())\r
 //                     it = lines_.insert(std::make_pair(name, line(name))).first;\r
 //\r
-//             it->second.update_value(value);\r
+//             it->second.set_value(value);\r
 //     }\r
 //\r
 //     void set_value(const std::wstring& name, float value)\r
@@ -539,7 +453,7 @@ void show_graphs(bool value)
 //     \r
 //graph::graph(const std::wstring& name) : impl_(new implementation(name)){}\r
 //graph::graph(const printer& parent_printer) : impl_(new implementation(parent_printer)){}\r
-//void graph::update_value(const std::wstring& name, float value){impl_->update_value(name, value);}\r
+//void graph::set_value(const std::wstring& name, float value){impl_->set_value(name, value);}\r
 //void graph::set_value(const std::wstring& name, float value){impl_->set_value(name, value);}\r
 //void graph::set_color(const std::wstring& name, color c){impl_->set_color(name, c);}\r
 //color graph::get_color() const {return impl_->get_color();}\r

diff --git a/common/diagnostics/graph.h b/common/diagnostics/graph.h
index f2dfa9d74707fb949fc1db5239971e735b095158..26113525d61385201d9f66472cba932740405b86 100644 (file)
--- a/common/diagnostics/graph.h
+++ b/common/diagnostics/graph.h
@@ -24,35 +24,22 @@
 #include "../memory/safe_ptr.h"\r
 \r
 #include <string>\r
+#include <tuple>\r
 \r
 namespace caspar { namespace diagnostics {\r
        \r
-struct color\r
-{\r
-       float red;\r
-       float green;\r
-       float blue;\r
-       float alpha;\r
-       \r
-       color(float r = 0.0f, float g = 0.0f, float b = 0.0f, float a = 1.0f)\r
-               : red(r)\r
-               , green(g)\r
-               , blue(b)\r
-               , alpha(a){}\r
-};\r
+int color(float r, float g, float b, float a = 1.0f);\r
+std::tuple<float, float, float, float> color(int code);\r
 \r
 class graph\r
 {\r
        friend void register_graph(const safe_ptr<graph>& graph);\r
 public:\r
        graph();\r
-       void set_text(const std::string& value);\r
        void set_text(const std::wstring& value);\r
-       void update_value(const std::string& name, double value);\r
        void set_value(const std::string& name, double value);\r
-       void set_color(const std::string& name, color c);\r
-       void add_tag(const std::string& name);\r
-       void add_guide(const std::string& name, double value);\r
+       void set_color(const std::string& name, int color);\r
+       void set_tag(const std::string& name);\r
 private:\r
        struct implementation;\r
        std::shared_ptr<implementation> impl_;\r

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 504898e927abe5ec075622bce8a788dfd31860f7..40dee621229c2254f6b2c4b50dd1607cff9de3de 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -227,7 +227,7 @@ public:
                                        }\r
                                }\r
                                                \r
-                               graph_->update_value("consume-time", consume_timer_.elapsed()*format_desc_.fps*0.5);\r
+                               graph_->set_value("consume-time", consume_timer_.elapsed()*format_desc_.fps*0.5);\r
                        }\r
                        catch(...)\r
                        {\r

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index 186eebb5e5d56a6c601706186925158fbb7084bc..cc0fb370261de7c54c3ef65238c6556b2f0d23ca 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -187,7 +187,7 @@ public:
 \r
                auto max = boost::range::max_element(result);\r
 \r
-               graph_->update_value("volume", static_cast<double>(std::abs(*max))/std::numeric_limits<int32_t>::max());\r
+               graph_->set_value("volume", static_cast<double>(std::abs(*max))/std::numeric_limits<int32_t>::max());\r
 \r
                return result;\r
        }\r

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index 6751375e648a5a79f941f95a50d9444fe4055593..227053f78b5eea42a614c786d99b9b985b116aae 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -110,7 +110,7 @@ public:
                                auto audio = audio_mixer_(format_desc_);\r
                                image.wait();\r
 \r
-                               graph_->update_value("mix-time", mix_timer_.elapsed()*format_desc_.fps*0.5);\r
+                               graph_->set_value("mix-time", mix_timer_.elapsed()*format_desc_.fps*0.5);\r
 \r
                                target_->send(std::make_pair(make_safe<read_frame>(ogl_, format_desc_.width, format_desc_.height, std::move(image.get()), std::move(audio)), packet.second));                                   \r
                        }\r

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 3381e1543ed9734313ad6b12b918f341eb749a12..3e69cb0979ebda0f2fef67a9d272b32ef7b983f0 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -96,7 +96,6 @@ public:
                , target_(target)\r
                , executor_(L"stage")\r
        {\r
-               graph_->add_guide("tick-time", 0.5f);   \r
                graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f));   \r
                graph_->set_color("produce-time", diagnostics::color(0.0f, 1.0f, 0.0f));\r
        }\r
@@ -147,7 +146,7 @@ public:
                                frames[layer.first] = frame1;\r
                        });\r
                        \r
-                       graph_->update_value("produce-time", produce_timer_.elapsed()*format_desc_.fps*0.5);\r
+                       graph_->set_value("produce-time", produce_timer_.elapsed()*format_desc_.fps*0.5);\r
                        \r
                        std::shared_ptr<void> ticket(nullptr, [self](void*)\r
                        {\r
@@ -158,7 +157,7 @@ public:
 \r
                        target_->send(std::make_pair(frames, ticket));\r
 \r
-                       graph_->update_value("tick-time", tick_timer_.elapsed()*format_desc_.fps*0.5);\r
+                       graph_->set_value("tick-time", tick_timer_.elapsed()*format_desc_.fps*0.5);\r
                        tick_timer_.restart();\r
                }\r
                catch(...)\r

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index b6cb00da8a260fb16ddd972e4a5b783fd4b2db21..cfd1c90d856f3dbf2cdbfd2492edfed217decc67 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -87,9 +87,7 @@ public:
        {\r
                executor_.set_capacity(1);\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_->add_guide("frame-time", 0.5f);  \r
                graph_->set_color("sync-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
                graph_->set_color("frame-time", diagnostics::color(0.5f, 1.0f, 0.2f));\r
                graph_->set_text(print());\r
@@ -194,7 +192,7 @@ public:
                        try\r
                        {       \r
                                display_frame(frame);                           \r
-                               graph_->update_value("tick-time", static_cast<float>(tick_timer_.elapsed()*format_desc_.fps*0.5));\r
+                               graph_->set_value("tick-time", static_cast<float>(tick_timer_.elapsed()*format_desc_.fps*0.5));\r
                                tick_timer_.restart();\r
                        }\r
                        catch(...)\r
@@ -211,7 +209,7 @@ public:
                sync_timer_.restart();\r
                unsigned long n_field = 0;\r
                blue_->wait_output_video_synch(UPD_FMT_FRAME, n_field);\r
-               graph_->update_value("sync-time", sync_timer_.elapsed()*format_desc_.fps*0.5);\r
+               graph_->set_value("sync-time", sync_timer_.elapsed()*format_desc_.fps*0.5);\r
                \r
                frame_timer_.restart();         \r
 \r
@@ -264,7 +262,7 @@ public:
 \r
                boost::range::rotate(reserved_frames_, std::begin(reserved_frames_)+1);\r
                \r
-               graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*format_desc_.fps*0.5));\r
+               graph_->set_value("frame-time", static_cast<float>(frame_timer_.elapsed()*format_desc_.fps*0.5));\r
        }\r
 \r
        void encode_hanc(BLUE_UINT32* hanc_data, void* audio_data, int audio_samples, int audio_nchannels)\r

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index b53578af2467e577bc072eae6f2de24f012e9a1f..c0c08702349701560c3b54074d4ef2108c5b7f1a 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -189,7 +189,6 @@ public:
                video_frame_buffer_.set_capacity(1);\r
                audio_frame_buffer_.set_capacity(1);\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("late-frame", diagnostics::color(0.6f, 0.3f, 0.3f));\r
                graph_->set_color("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f));\r
@@ -316,7 +315,7 @@ public:
                {\r
                        if(result == bmdOutputFrameDisplayedLate)\r
                        {\r
-                               graph_->add_tag("late-frame");\r
+                               graph_->set_tag("late-frame");\r
                                video_scheduled_ += format_desc_.duration;\r
                                audio_scheduled_ += reinterpret_cast<decklink_frame*>(completed_frame)->audio_data().size()/format_desc_.audio_channels;\r
                                //++video_scheduled_;\r
@@ -324,9 +323,9 @@ public:
                                //++audio_scheduled_;\r
                        }\r
                        else if(result == bmdOutputFrameDropped)\r
-                               graph_->add_tag("dropped-frame");\r
+                               graph_->set_tag("dropped-frame");\r
                        else if(result == bmdOutputFrameFlushed)\r
-                               graph_->add_tag("flushed-frame");\r
+                               graph_->set_tag("flushed-frame");\r
 \r
                        std::shared_ptr<core::read_frame> frame;        \r
                        video_frame_buffer_.pop(frame);                                 \r
@@ -334,7 +333,7 @@ public:
                        \r
                        unsigned long buffered;\r
                        output_->GetBufferedVideoFrameCount(&buffered);\r
-                       graph_->update_value("buffered-video", static_cast<double>(buffered)/format_desc_.fps);\r
+                       graph_->set_value("buffered-video", static_cast<double>(buffered)/format_desc_.fps);\r
                }\r
                catch(...)\r
                {\r
@@ -372,7 +371,7 @@ public:
 \r
                        unsigned long buffered;\r
                        output_->GetBufferedAudioSampleFrameCount(&buffered);\r
-                       graph_->update_value("buffered-audio", static_cast<double>(buffered)/(format_desc_.audio_cadence[0]*2));\r
+                       graph_->set_value("buffered-audio", static_cast<double>(buffered)/(format_desc_.audio_cadence[0]*2));\r
                }\r
                catch(...)\r
                {\r
@@ -405,7 +404,7 @@ public:
 \r
                video_scheduled_ += format_desc_.duration;\r
 \r
-               graph_->update_value("tick-time", tick_timer_.elapsed()*format_desc_.fps*0.5);\r
+               graph_->set_value("tick-time", tick_timer_.elapsed()*format_desc_.fps*0.5);\r
                tick_timer_.restart();\r
        }\r
 \r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index 3351c7a7fbb1f2501c40124f38ccd3a0c616bc6e..6dfacd69142ad834e039d90174808377d1cf0d24 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -116,7 +116,6 @@ public:
                flags_ = 0;\r
                frame_buffer_.set_capacity(2);\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("late-frame", diagnostics::color(0.6f, 0.3f, 0.3f));\r
                graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
@@ -176,7 +175,7 @@ public:
 \r
                try\r
                {\r
-                       graph_->update_value("tick-time", tick_timer_.elapsed()*format_desc_.fps*0.5);\r
+                       graph_->set_value("tick-time", tick_timer_.elapsed()*format_desc_.fps*0.5);\r
                        tick_timer_.restart();\r
 \r
                        frame_timer_.restart();\r
@@ -230,10 +229,10 @@ public:
                        for(auto frame = muxer_.poll(); frame; frame = muxer_.poll())\r
                        {\r
                                if(!frame_buffer_.try_push(make_safe_ptr(frame)))\r
-                                       graph_->add_tag("dropped-frame");\r
+                                       graph_->set_tag("dropped-frame");\r
                        }\r
 \r
-                       graph_->update_value("frame-time", frame_timer_.elapsed()*format_desc_.fps*0.5);\r
+                       graph_->set_value("frame-time", frame_timer_.elapsed()*format_desc_.fps*0.5);\r
 \r
                        graph_->set_value("output-buffer", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity()));      \r
                }\r
@@ -255,7 +254,7 @@ public:
 \r
                safe_ptr<core::basic_frame> frame = core::basic_frame::late();\r
                if(!frame_buffer_.try_pop(frame))\r
-                       graph_->add_tag("late-frame");\r
+                       graph_->set_tag("late-frame");\r
                graph_->set_value("output-buffer", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity()));      \r
                return frame;\r
        }\r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index b9918f7d269a5071a13d96ebd939fd27d17215e1..a38004743f2b71332cb7fcc034848c415b3458f0 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -100,7 +100,6 @@ public:
                // TODO: Ask stakeholders about case where file already exists.\r
                boost::filesystem::remove(boost::filesystem::path(env::media_folder() + filename)); // Delete the file if it exists\r
 \r
-               graph_->add_guide("frame-time", 0.5);\r
                graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f));\r
                graph_->set_color("write-time", diagnostics::color(0.5f, 0.5f, 0.1f));\r
                graph_->set_text(print());\r
@@ -368,7 +367,7 @@ public:
                        auto video = encode_video_frame(frame);\r
                        auto audio = encode_audio_frame(frame);\r
 \r
-                       graph_->update_value("frame-time", frame_timer_.elapsed()*format_desc_.fps*0.5);\r
+                       graph_->set_value("frame-time", frame_timer_.elapsed()*format_desc_.fps*0.5);\r
                        \r
                        file_write_executor_.begin_invoke([=]\r
                        {\r
@@ -379,7 +378,7 @@ public:
                                if(audio)\r
                                        av_write_frame(oc_.get(), audio.get());\r
 \r
-                               graph_->update_value("write-time", write_timer_.elapsed()*format_desc_.fps*0.5);\r
+                               graph_->set_value("write-time", write_timer_.elapsed()*format_desc_.fps*0.5);\r
                        });\r
                });\r
        }\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 27a5ef21d7588749b6d21b2611c1f502bb27652a..7a56709020c7f02a43a7b8fca0dfd3eead2ddbae 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -97,7 +97,6 @@ public:
                , last_frame_(core::basic_frame::empty())\r
                , frame_number_(0)\r
        {\r
-               graph_->add_guide("frame-time", 0.5);\r
                graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f));\r
                graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f));   \r
                diagnostics::register_graph(graph_);\r
@@ -145,14 +144,14 @@ public:
                for(int n = 0; n < 16 && frame_buffer_.size() < 2; ++n)\r
                        try_decode_frame(flags);\r
                \r
-               graph_->update_value("frame-time", frame_timer_.elapsed()*format_desc_.fps*0.5);\r
+               graph_->set_value("frame-time", frame_timer_.elapsed()*format_desc_.fps*0.5);\r
                                \r
                if(frame_buffer_.empty() && input_.eof())\r
                        return last_frame();\r
 \r
                if(frame_buffer_.empty())\r
                {\r
-                       graph_->add_tag("underflow");   \r
+                       graph_->set_tag("underflow");   \r
                        return core::basic_frame::late();                       \r
                }\r
                \r

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index 9cea066339870327240b9b3792ee934fbade6f2f..6a70527f1fc5d1c84c73eced4d2c0875b747ed7a 100644 (file)
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -131,8 +131,8 @@ struct input::implementation : boost::noncopyable
                        buffer_cond_.notify_all();\r
                }\r
 \r
-               graph_->update_value("buffer-size", (static_cast<double>(buffer_size_)+0.001)/MAX_BUFFER_SIZE);\r
-               graph_->update_value("buffer-count", (static_cast<double>(buffer_.size()+0.001)/MAX_BUFFER_COUNT));\r
+               graph_->set_value("buffer-size", (static_cast<double>(buffer_size_)+0.001)/MAX_BUFFER_SIZE);\r
+               graph_->set_value("buffer-count", (static_cast<double>(buffer_.size()+0.001)/MAX_BUFFER_COUNT));\r
 \r
                return result;\r
        }\r
@@ -179,7 +179,7 @@ struct input::implementation : boost::noncopyable
                        if(loop_)\r
                        {\r
                                do_seek(start_);\r
-                               graph_->add_tag("seek");                \r
+                               graph_->set_tag("seek");                \r
                                CASPAR_LOG(trace) << print() << " Looping.";                    \r
                        }                                       \r
                }\r
@@ -205,8 +205,8 @@ struct input::implementation : boost::noncopyable
                        buffer_.try_push(packet);\r
                        buffer_size_ += packet->size;\r
                                \r
-                       graph_->update_value("buffer-size", (static_cast<double>(buffer_size_)+0.001)/MAX_BUFFER_SIZE);\r
-                       graph_->update_value("buffer-count", (static_cast<double>(buffer_.size()+0.001)/MAX_BUFFER_COUNT));\r
+                       graph_->set_value("buffer-size", (static_cast<double>(buffer_size_)+0.001)/MAX_BUFFER_SIZE);\r
+                       graph_->set_value("buffer-count", (static_cast<double>(buffer_.size()+0.001)/MAX_BUFFER_COUNT));\r
                }                       \r
        }\r
 \r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 9617f9233383809d20fd227008a7efe641557470..c709430448a7b5f4a1462c75dae240663873ddc5 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -172,9 +172,7 @@ public:
                , 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
@@ -221,7 +219,7 @@ public:
 \r
                if(!ax_->FlashCall(param, result))\r
                        CASPAR_LOG(warning) << print() << L" Flash call failed:" << param;//BOOST_THROW_EXCEPTION(invalid_operation() << wmsg_info("Flash function call failed.") << arg_name_info("param") << arg_value_info(u8(param)));\r
-               graph_->add_tag("param");\r
+               graph_->set_tag("param");\r
 \r
                return result;\r
        }\r
@@ -230,7 +228,7 @@ public:
        {\r
                float frame_time = 1.0f/ax_->GetFPS();\r
 \r
-               graph_->update_value("tick-time", (tick_timer_.elapsed()/frame_time)*0.5f);\r
+               graph_->set_value("tick-time", (tick_timer_.elapsed()/frame_time)*0.5f);\r
                tick_timer_.restart();\r
 \r
                if(ax_->IsEmpty())\r
@@ -239,7 +237,7 @@ public:
                if(!has_underflow)                      \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
@@ -259,7 +257,7 @@ public:
                        head_ = frame;\r
                }               \r
                                \r
-               graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()/frame_time)*0.5f);\r
+               graph_->set_value("frame-time", static_cast<float>(frame_timer_.elapsed()/frame_time)*0.5f);\r
                return head_;\r
        }\r
 \r
@@ -335,7 +333,7 @@ public:
 \r
                auto frame = core::basic_frame::late();\r
                if(!frame_buffer_.try_pop(frame) && context_)\r
-                       graph_->add_tag("underflow");\r
+                       graph_->set_tag("underflow");\r
 \r
                return frame;\r
        }\r

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index f158b9aca4ae241e9e03323232ffc8957080af30..bb4c90982e6a7148064d5f3266af9d494733da0e 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -62,7 +62,6 @@ public:
                : container_(16)\r
                , channel_index_(-1)\r
        {\r
-               graph_->add_guide("tick-time", 0.5);\r
                graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f));   \r
                diagnostics::register_graph(graph_);\r
 \r
@@ -132,7 +131,7 @@ public:
                data.Samples = container_.back().data();\r
                data.NbSamples = container_.back().size();      \r
                \r
-               graph_->update_value("tick-time", perf_timer_.elapsed()*format_desc_.fps*0.5);          \r
+               graph_->set_value("tick-time", perf_timer_.elapsed()*format_desc_.fps*0.5);             \r
                perf_timer_.restart();\r
 \r
                return is_running_;\r

diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index d282beff1c5072b30c7800e70788675a7896ea8e..bc6997474b4357a58dcf0c2c15ab53b8a814ba9c 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -144,7 +144,6 @@ public:
        {               \r
                frame_buffer_.set_capacity(2);\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
@@ -257,11 +256,11 @@ public:
                                        \r
                                        perf_timer_.restart();\r
                                        render(frame);\r
-                                       graph_->update_value("frame-time", perf_timer_.elapsed()*format_desc_.fps*0.5); \r
+                                       graph_->set_value("frame-time", perf_timer_.elapsed()*format_desc_.fps*0.5);    \r
 \r
                                        window_.Display();\r
                                        \r
-                                       graph_->update_value("tick-time", tick_timer_.elapsed()*format_desc_.fps*0.5);  \r
+                                       graph_->set_value("tick-time", tick_timer_.elapsed()*format_desc_.fps*0.5);     \r
                                        tick_timer_.restart();\r
                                }\r
                                catch(...)\r
@@ -364,7 +363,7 @@ public:
        bool send(const safe_ptr<core::read_frame>& frame)\r
        {\r
                if(!frame_buffer_.try_push(frame))\r
-                       graph_->add_tag("dropped-frame");\r
+                       graph_->set_tag("dropped-frame");\r
                return is_running_;\r
        }\r
                \r