2.0. Updated graphs.

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

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index 2d323e1ca08cdb8f1a1a779945f2c81d8d048ff3..8abf2fbda41e15149c067f36b8af1e1518c47279 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -62,10 +62,10 @@ public:
                , stage_(new caspar::core::stage(context_))     \r
        {\r
                diag_->add_guide("produce-time", 0.5f); \r
-               diag_->set_color("produce-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
-               diag_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f));    \r
+               diag_->set_color("produce-time", diagnostics::color(0.0f, 1.0f, 0.0f));\r
+               diag_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f));    \r
                diag_->set_color("output-time", diagnostics::color(1.0f, 0.5f, 0.0f));\r
-               diag_->set_color("mix-time", diagnostics::color(0.0f, 1.0f, 0.0f));\r
+               diag_->set_color("mix-time", diagnostics::color(1.0f, 1.0f, 0.1f));\r
 \r
                CASPAR_LOG(info) << print() << " Successfully Initialized.";\r
                context_.execution().begin_invoke([this]{tick();});\r

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index 856aef4c553166bcff994aa6c5ea1066c0314e0f..a25ab8baf7793ca49a88b87a719f476bb9554c9f 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -81,7 +81,7 @@ public:
 \r
                graph_ = diagnostics::create_graph(narrow(print()));\r
                graph_->add_guide("tick-time", 0.5);\r
-               graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f));\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("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
                graph_->set_color("sync-time", diagnostics::color(0.5f, 1.0f, 0.2f));\r

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index b4c63c6552044f5b34117cc96049fb802b8bb57f..b3a9400e9a18d594f30fc0a088a331f731552f64 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -148,10 +148,10 @@ public:
 \r
                graph_ = diagnostics::create_graph(narrow(print()));\r
                graph_->add_guide("tick-time", 0.5);\r
-               graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f));\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
-               graph_->set_color("flushed-frame", diagnostics::color(0.3f, 0.3f, 0.6f));\r
+               graph_->set_color("flushed-frame", diagnostics::color(0.4f, 0.3f, 0.8f));\r
                \r
                enable_video(get_display_mode(output_, format_desc_.format, bmdFormat8BitBGRA, bmdVideoOutputFlagDefault));\r
                                \r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index a582fcd0bde5bddd7fef215abe2d0b884afbcb33..54c84152be7b6dd9da1cb8c9d036b2c19f53d17d 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -110,7 +110,7 @@ public:
                \r
                graph_ = diagnostics::create_graph(boost::bind(&decklink_producer::print, this));\r
                graph_->add_guide("tick-time", 0.5);\r
-               graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f));\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
                graph_->set_color("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f));\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index a8988ad753f2f3a37690d6d186fe3daee755a997..84863760efd79d0b9c705d1b79056312fb089809 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -98,8 +98,8 @@ public:
                , last_frame_(core::basic_frame::empty())\r
        {\r
                graph_->add_guide("frame-time", 0.5);\r
-               graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
-               graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f));           \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
                \r
                for(int n = 0; n < 32 && muxer_.empty(); ++n)\r
                        decode_frame(0);\r

diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp
index 327a39fa6e3cd2a8660393289b06b2c9b8d8826c..513d909e792628782b80e83817c0acf38feb915e 100644 (file)
--- a/modules/ffmpeg/producer/input.cpp
+++ b/modules/ffmpeg/producer/input.cpp
@@ -115,9 +115,9 @@ public:
                for(int n = 0; n < 16 && !full(); ++n)\r
                        read_next_packet();\r
                                                \r
-               graph_->set_color("seek", diagnostics::color(0.5f, 1.0f, 0.5f));        \r
-               graph_->set_color("buffer-count", diagnostics::color(0.2f, 0.8f, 1.0f));\r
-               graph_->set_color("buffer-size", diagnostics::color(0.2f, 0.4f, 1.0f)); \r
+               graph_->set_color("seek", diagnostics::color(1.0f, 0.5f, 0.0f));        \r
+               graph_->set_color("buffer-count", diagnostics::color(0.4f, 0.8f, 0.8f));\r
+               graph_->set_color("buffer-size", diagnostics::color(0.2f, 0.4f, 0.8f)); \r
 \r
                thread_ = boost::thread([this]{run();});\r
        }\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 5f0e81f689982933b7b8e3bac1e15c840664d6f3..41af75693f51643b1ec05da637bd54e96804e5b1 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -155,9 +155,9 @@ public:
                , height_(height)\r
        {\r
                graph_->add_guide("frame-time", 0.5f);\r
-               graph_->set_color("frame-time", diagnostics::color(0.8f, 0.3f, 0.4f));  \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.1f, 0.7f, 0.8f));\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("underflow", diagnostics::color(0.6f, 0.3f, 0.9f));                   \r
                \r
@@ -284,8 +284,8 @@ public:
                fps_ = 0;\r
 \r
                graph_ = diagnostics::create_graph([this]{return print();});\r
-               graph_->set_color("output-buffer", diagnostics::color(0.0f, 1.0f, 0.0f));\r
-               \r
+               graph_->set_color("buffer-count", diagnostics::color(0.4f, 0.8f, 0.8f));\r
+                               \r
                frame_buffer_.set_capacity(1);\r
                \r
                context_.reset([&]{return new flash_renderer(safe_ptr<diagnostics::graph>(graph_), frame_factory_, filename_, width_, height_);});\r
@@ -308,7 +308,7 @@ public:
                                std::rethrow_exception(exception_);\r
                }\r
 \r
-               graph_->set_value("output-buffer", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity()));\r
+               graph_->set_value("buffer-count", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity()));\r
 \r
                auto frame = core::basic_frame::late();\r
                if(frame_buffer_.try_pop(frame))\r
@@ -384,7 +384,7 @@ public:
                                        frame_buffer_.push(frame);\r
                                }\r
 \r
-                               graph_->set_value("output-buffer", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity()));      \r
+                               graph_->set_value("buffer-count", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity()));       \r
                                fps_.fetch_and_store(static_cast<int>(context_->fps()*100.0));\r
 \r
                                render();\r

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index 3f79039bac70714ee27c64219da8fdeb6fb901e3..867d06714d1360c96858719fe3013721831ff6dd 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -61,7 +61,7 @@ public:
                        BOOST_THROW_EXCEPTION(invalid_argument() << msg_info("audio-consumer does not support buffer-depth lower than 3."));\r
 \r
                graph_->add_guide("tick-time", 0.5);\r
-               graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f));\r
+               graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f));   \r
                is_running_ = true;\r
                input_.set_capacity(core::consumer_buffer_depth()-2);\r
        }\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 2c911b64c3ea596a06ea03dc84cef414412da59f..20d4ea53e32695fa56d8c345775fb06f98e18414 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -10,10 +10,10 @@
     <graphs>true</graphs>\r
   </diagnostics>\r
   <consumers>\r
-    <buffer-depth>6</buffer-depth>\r
+    <buffer-depth>3</buffer-depth>\r
   </consumers>\r
   <producers>\r
-    <buffer-depth>3</buffer-depth>\r
+    <buffer-depth>1</buffer-depth>\r
     <auto-transcode>true</auto-transcode>\r
     <template-hosts>\r
       <template-host>\r