From: ronag Date: Tue, 16 Aug 2011 13:22:58 +0000 (+0000) Subject: 2.0. Updated graphs. X-Git-Tag: 2.0.1~140 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0b0991ee9118226b405a2529ebb4456691d18cb8;p=casparcg 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 2d323e1ca..8abf2fbda 100644 --- a/core/video_channel.cpp +++ b/core/video_channel.cpp @@ -62,10 +62,10 @@ public: , stage_(new caspar::core::stage(context_)) { diag_->add_guide("produce-time", 0.5f); - diag_->set_color("produce-time", diagnostics::color(1.0f, 0.0f, 0.0f)); - diag_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f)); + diag_->set_color("produce-time", diagnostics::color(0.0f, 1.0f, 0.0f)); + diag_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f)); diag_->set_color("output-time", diagnostics::color(1.0f, 0.5f, 0.0f)); - diag_->set_color("mix-time", diagnostics::color(0.0f, 1.0f, 0.0f)); + diag_->set_color("mix-time", diagnostics::color(1.0f, 1.0f, 0.1f)); CASPAR_LOG(info) << print() << " Successfully Initialized."; context_.execution().begin_invoke([this]{tick();}); diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp index 856aef4c5..a25ab8baf 100644 --- a/modules/bluefish/consumer/bluefish_consumer.cpp +++ b/modules/bluefish/consumer/bluefish_consumer.cpp @@ -81,7 +81,7 @@ public: graph_ = diagnostics::create_graph(narrow(print())); graph_->add_guide("tick-time", 0.5); - graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f)); + graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f)); graph_->add_guide("frame-time", 0.5f); graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f)); graph_->set_color("sync-time", diagnostics::color(0.5f, 1.0f, 0.2f)); diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp index b4c63c655..b3a9400e9 100644 --- a/modules/decklink/consumer/decklink_consumer.cpp +++ b/modules/decklink/consumer/decklink_consumer.cpp @@ -148,10 +148,10 @@ public: graph_ = diagnostics::create_graph(narrow(print())); graph_->add_guide("tick-time", 0.5); - graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f)); + 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.3f)); graph_->set_color("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f)); - graph_->set_color("flushed-frame", diagnostics::color(0.3f, 0.3f, 0.6f)); + graph_->set_color("flushed-frame", diagnostics::color(0.4f, 0.3f, 0.8f)); enable_video(get_display_mode(output_, format_desc_.format, bmdFormat8BitBGRA, bmdVideoOutputFlagDefault)); diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp index a582fcd0b..54c84152b 100644 --- a/modules/decklink/producer/decklink_producer.cpp +++ b/modules/decklink/producer/decklink_producer.cpp @@ -110,7 +110,7 @@ public: graph_ = diagnostics::create_graph(boost::bind(&decklink_producer::print, this)); graph_->add_guide("tick-time", 0.5); - graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f)); + 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.3f)); graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f)); graph_->set_color("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f)); diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp index a8988ad75..84863760e 100644 --- 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()) { graph_->add_guide("frame-time", 0.5); - graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f)); - graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); + graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f)); + graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); for(int n = 0; n < 32 && muxer_.empty(); ++n) decode_frame(0); diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp index 327a39fa6..513d909e7 100644 --- 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) read_next_packet(); - graph_->set_color("seek", diagnostics::color(0.5f, 1.0f, 0.5f)); - graph_->set_color("buffer-count", diagnostics::color(0.2f, 0.8f, 1.0f)); - graph_->set_color("buffer-size", diagnostics::color(0.2f, 0.4f, 1.0f)); + graph_->set_color("seek", diagnostics::color(1.0f, 0.5f, 0.0f)); + graph_->set_color("buffer-count", diagnostics::color(0.4f, 0.8f, 0.8f)); + graph_->set_color("buffer-size", diagnostics::color(0.2f, 0.4f, 0.8f)); thread_ = boost::thread([this]{run();}); } diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp index 5f0e81f68..41af75693 100644 --- a/modules/flash/producer/flash_producer.cpp +++ b/modules/flash/producer/flash_producer.cpp @@ -155,9 +155,9 @@ public: , height_(height) { graph_->add_guide("frame-time", 0.5f); - graph_->set_color("frame-time", diagnostics::color(0.8f, 0.3f, 0.4f)); + graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f)); graph_->add_guide("tick-time", 0.5); - graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f)); + graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f)); graph_->set_color("param", diagnostics::color(1.0f, 0.5f, 0.0f)); graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); @@ -284,8 +284,8 @@ public: fps_ = 0; graph_ = diagnostics::create_graph([this]{return print();}); - graph_->set_color("output-buffer", diagnostics::color(0.0f, 1.0f, 0.0f)); - + graph_->set_color("buffer-count", diagnostics::color(0.4f, 0.8f, 0.8f)); + frame_buffer_.set_capacity(1); context_.reset([&]{return new flash_renderer(safe_ptr(graph_), frame_factory_, filename_, width_, height_);}); @@ -308,7 +308,7 @@ public: std::rethrow_exception(exception_); } - graph_->set_value("output-buffer", static_cast(frame_buffer_.size())/static_cast(frame_buffer_.capacity())); + graph_->set_value("buffer-count", static_cast(frame_buffer_.size())/static_cast(frame_buffer_.capacity())); auto frame = core::basic_frame::late(); if(frame_buffer_.try_pop(frame)) @@ -384,7 +384,7 @@ public: frame_buffer_.push(frame); } - graph_->set_value("output-buffer", static_cast(frame_buffer_.size())/static_cast(frame_buffer_.capacity())); + graph_->set_value("buffer-count", static_cast(frame_buffer_.size())/static_cast(frame_buffer_.capacity())); fps_.fetch_and_store(static_cast(context_->fps()*100.0)); render(); diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp index 3f79039ba..867d06714 100644 --- 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.")); graph_->add_guide("tick-time", 0.5); - graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f)); + graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f)); is_running_ = true; input_.set_capacity(core::consumer_buffer_depth()-2); } diff --git a/shell/casparcg.config b/shell/casparcg.config index 2c911b64c..20d4ea53e 100644 --- a/shell/casparcg.config +++ b/shell/casparcg.config @@ -10,10 +10,10 @@ true - 6 + 3 - 3 + 1 true