\r
class context : public drawable\r
{ \r
- sf::RenderWindow window_;\r
+ std::unique_ptr<sf::RenderWindow> window_;\r
\r
std::list<std::shared_ptr<drawable>> drawables_;\r
\r
get_instance().do_register_drawable(drawable);\r
});\r
}\r
- \r
+\r
+ static void show(bool value)\r
+ {\r
+ begin_invoke([=]\r
+ { \r
+ get_instance().do_show(value);\r
+ });\r
+ }\r
+ \r
private:\r
context() : executor_(L"diagnostics")\r
{\r
- executor_.begin_invoke([this]\r
- { \r
- SetThreadPriority(GetCurrentThread(), BELOW_NORMAL_PRIORITY_CLASS);\r
- window_.Create(sf::VideoMode(600, 1000), "CasparCG Diagnostics");\r
- window_.SetPosition(0, 0);\r
- window_.SetActive();\r
- glEnable(GL_BLEND);\r
- glEnable(GL_LINE_SMOOTH);\r
- glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);\r
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);\r
- tick();\r
- });\r
+ }\r
+\r
+ void do_show(bool value)\r
+ {\r
+ if(value)\r
+ {\r
+ if(!window_)\r
+ {\r
+ SetThreadPriority(GetCurrentThread(), BELOW_NORMAL_PRIORITY_CLASS);\r
+ window_.reset(new sf::RenderWindow(sf::VideoMode(600, 1000), "CasparCG Diagnostics"));\r
+ window_->SetPosition(0, 0);\r
+ window_->SetActive();\r
+ glEnable(GL_BLEND);\r
+ glEnable(GL_LINE_SMOOTH);\r
+ glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);\r
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);\r
+ tick();\r
+ }\r
+ }\r
+ else\r
+ window_.reset();\r
}\r
\r
void tick()\r
{\r
+ if(!window_)\r
+ return;\r
+\r
sf::Event e;\r
- while(window_.GetEvent(e)){} \r
+ while(window_->GetEvent(e)){} \r
glClear(GL_COLOR_BUFFER_BIT);\r
- window_.Draw(*this);\r
- window_.Display();\r
+ window_->Draw(*this);\r
+ window_->Display();\r
boost::this_thread::sleep(boost::posix_time::milliseconds(20));\r
executor_.begin_invoke([this]{tick();});\r
}\r
auto& drawable = *it;\r
if(!drawable.unique())\r
{\r
- drawable->SetScale(static_cast<float>(window_.GetWidth()), static_cast<float>(target_dy*window_.GetHeight()));\r
- float target_y = std::max(last_y, static_cast<float>(n * window_.GetHeight())*target_dy);\r
+ drawable->SetScale(static_cast<float>(window_->GetWidth()), static_cast<float>(target_dy*window_->GetHeight()));\r
+ float target_y = std::max(last_y, static_cast<float>(n * window_->GetHeight())*target_dy);\r
drawable->SetPosition(0.0f, target_y); \r
target.Draw(*drawable); \r
++it; \r
\r
void do_register_drawable(const std::shared_ptr<drawable>& drawable)\r
{\r
- drawables_.push_back(drawable);\r
+ if(std::find(drawables_.begin(), drawables_.end(), drawable) == drawables_.end())\r
+ drawables_.push_back(drawable);\r
}\r
\r
static context& get_instance()\r
boost::optional<diagnostics::guide> guide_;\r
boost::circular_buffer<std::pair<double, bool>> line_data_;\r
\r
- std::vector<double> tick_data_;\r
- bool tick_tag_;\r
+ boost::circular_buffer<double> tick_data_;\r
+ bool tick_tag_;\r
color c_;\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
std::map<std::string, diagnostics::line> lines_;\r
std::string name_;\r
std::string text_;\r
-\r
- int counter_;\r
-\r
+ \r
implementation(const std::string& name) \r
: name_(name)\r
- , text_(name)\r
- , counter_(0){}\r
+ , text_(name_){}\r
\r
- void update(const std::string& name, double value)\r
+ void set_text(const std::string& value)\r
{\r
- lines_[name].update(value);\r
+ text_ = value;\r
}\r
\r
- void update_text(const std::string& value)\r
+ void update(const std::string& name, double value)\r
{\r
- text_ = value;\r
+ lines_[name].update(value);\r
}\r
\r
void set(const std::string& name, double value)\r
implementation& operator=(implementation&);\r
};\r
\r
-graph::graph(const std::string& name) : impl_(env::properties().get("configuration.diagnostics.graphs", true) ? new implementation(name) : nullptr)\r
+graph::graph() : impl_(new implementation(""))\r
{\r
- if(impl_)\r
- context::register_drawable(impl_);\r
+\r
}\r
\r
-void graph::update_value(const std::string& name, double value)\r
+void graph::set_text(const std::string& value)\r
{\r
- if(impl_)\r
+ auto p = impl_;\r
+ context::begin_invoke([=]\r
{ \r
- auto p = impl_;\r
- context::begin_invoke([=]\r
- { \r
- p->update(name, value);\r
- });\r
- }\r
+ p->set_text(value);\r
+ });\r
}\r
\r
-void graph::update_text(const std::string& value)\r
+void graph::set_text(const std::wstring& value)\r
{\r
- if(impl_)\r
- { \r
- auto p = impl_;\r
- context::begin_invoke([=]\r
- { \r
- p->update_text(value);\r
- });\r
- }\r
+ set_text(narrow(value));\r
}\r
\r
-void graph::set_value(const std::string& name, double value)\r
+void graph::update_value(const std::string& name, double value)\r
{\r
- if(impl_)\r
- { \r
- auto p = impl_;\r
- context::begin_invoke([=]\r
- { \r
- p->set(name, value);\r
- });\r
- }\r
+ auto p = impl_;\r
+ context::begin_invoke([=]\r
+ { \r
+ p->update(name, value);\r
+ });\r
}\r
-void graph::set_color(const std::string& name, color c)\r
+void graph::set_value(const std::string& name, double value)\r
{ \r
- if(impl_)\r
- { \r
- auto p = impl_;\r
- context::begin_invoke([=]\r
- { \r
- p->set_color(name, c);\r
- });\r
- }\r
+ auto p = impl_;\r
+ context::begin_invoke([=]\r
+ { \r
+ p->set(name, value);\r
+ }); \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
+ });\r
}\r
void graph::add_tag(const std::string& name)\r
-{ \r
- if(impl_)\r
- { \r
- auto p = impl_;\r
- context::begin_invoke([=]\r
- { \r
- p->tag(name);\r
- });\r
- }\r
+{ \r
+ auto p = impl_;\r
+ context::begin_invoke([=]\r
+ { \r
+ p->tag(name);\r
+ });\r
}\r
void graph::add_guide(const std::string& name, double value)\r
{ \r
- if(impl_)\r
- { \r
- auto p = impl_;\r
- context::begin_invoke([=]\r
- { \r
- p->guide(name, value);\r
- });\r
- }\r
+ auto p = impl_;\r
+ context::begin_invoke([=]\r
+ { \r
+ p->guide(name, value);\r
+ });\r
+}\r
+\r
+void register_graph(const safe_ptr<graph>& graph)\r
+{\r
+ context::register_drawable(graph->impl_);\r
}\r
\r
-safe_ptr<graph> create_graph(const std::string& name)\r
+void show_graphs(bool value)\r
{\r
- return safe_ptr<graph>(new graph(name));\r
+ context::show(value);\r
}\r
\r
//namespace v2\r
\r
class graph\r
{\r
- friend safe_ptr<graph> create_graph(const std::string& name);\r
- graph(const std::string& name);\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 update_text(const std::string& 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
std::shared_ptr<implementation> impl_;\r
};\r
\r
-safe_ptr<graph> create_graph(const std::string& name);\r
- \r
+void register_graph(const safe_ptr<graph>& graph);\r
+void show_graphs(bool value);\r
+\r
//namespace v2\r
//{\r
// \r
public:\r
implementation(int index, const video_format_desc& format_desc, ogl_device& ogl) \r
: context_(index, ogl, format_desc)\r
- , diag_(diagnostics::create_graph(narrow(print())))\r
, output_(new caspar::core::output(context_, [this]{restart();}))\r
, mixer_(new caspar::core::mixer(context_))\r
, stage_(new caspar::core::stage(context_)) \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(1.0f, 1.0f, 0.9f));\r
+ diag_->set_text(print());\r
+ diagnostics::register_graph(diag_);\r
\r
CASPAR_LOG(info) << print() << " Successfully Initialized.";\r
context_.execution().begin_invoke([this]{tick();});\r
\r
const std::wstring model_name_;\r
\r
- std::shared_ptr<diagnostics::graph> graph_;\r
+ safe_ptr<diagnostics::graph> graph_;\r
boost::timer frame_timer_;\r
boost::timer tick_timer_;\r
boost::timer sync_timer_; \r
{\r
executor_.set_capacity(core::consumer_buffer_depth());\r
\r
- graph_ = diagnostics::create_graph(narrow(print()));\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("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
graph_->set_color("input-buffer", diagnostics::color(1.0f, 1.0f, 0.0f));\r
+ graph_->set_text(print());\r
+ diagnostics::register_graph(graph_);\r
\r
//Setting output Video mode\r
if(BLUE_FAIL(set_card_property(blue_, VIDEO_MODE, vid_fmt_))) \r
tbb::concurrent_bounded_queue<std::shared_ptr<core::read_frame>> video_frame_buffer_;\r
tbb::concurrent_bounded_queue<std::shared_ptr<core::read_frame>> audio_frame_buffer_;\r
\r
- std::shared_ptr<diagnostics::graph> graph_;\r
+ safe_ptr<diagnostics::graph> graph_;\r
boost::timer tick_timer_;\r
\r
public:\r
video_frame_buffer_.set_capacity(1);\r
audio_frame_buffer_.set_capacity(1);\r
\r
- graph_ = diagnostics::create_graph(narrow(print()));\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
graph_->set_color("flushed-frame", diagnostics::color(0.4f, 0.3f, 0.8f));\r
+ graph_->set_text(print());\r
+ diagnostics::register_graph(graph_);\r
\r
enable_video(get_display_mode(output_, format_desc_.format, bmdFormat8BitBGRA, bmdVideoOutputFlagDefault));\r
\r
\r
\r
/* File created by MIDL compiler version 7.00.0555 */\r
-/* at Thu Nov 10 08:57:13 2011\r
+/* at Thu Nov 10 16:28:32 2011\r
*/\r
/* Compiler settings for interop\DeckLinkAPI.idl:\r
Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r
\r
\r
/* File created by MIDL compiler version 7.00.0555 */\r
-/* at Thu Nov 10 08:57:13 2011\r
+/* at Thu Nov 10 16:28:32 2011\r
*/\r
/* Compiler settings for interop\DeckLinkAPI.idl:\r
Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r
const core::video_format_desc format_desc_;\r
const size_t device_index_;\r
\r
- std::shared_ptr<diagnostics::graph> graph_;\r
+ safe_ptr<diagnostics::graph> graph_;\r
boost::timer tick_timer_;\r
boost::timer frame_timer_;\r
\r
{\r
frame_buffer_.set_capacity(2);\r
\r
- graph_ = diagnostics::create_graph(narrow(print()));\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
graph_->set_color("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f));\r
graph_->set_color("output-buffer", diagnostics::color(0.0f, 1.0f, 0.0f));\r
+ graph_->set_text(print());\r
+ diagnostics::register_graph(graph_);\r
\r
auto display_mode = get_display_mode(input_, format_desc_.format, bmdFormat8BitYUV, bmdVideoInputFlagDefault);\r
\r
public:\r
explicit ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, const std::wstring& filter, bool loop, int start, size_t length) \r
: filename_(filename)\r
- , graph_(diagnostics::create_graph(""))\r
, frame_factory_(frame_factory) \r
, format_desc_(frame_factory->get_video_format_desc())\r
, input_(graph_, filename_, loop, start, length)\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
\r
for(int n = 0; n < 3; ++n)\r
frame_factory->create_frame(this, std::max<size_t>(2, video_decoder_.width()), std::max<size_t>(2, video_decoder_.height()));\r
graph_->add_tag("underflow"); \r
}\r
\r
- graph_->update_text(narrow(print()));\r
+ graph_->set_text(print());\r
\r
return frame;\r
}\r
\r
tbb::atomic<int> fps_;\r
\r
- std::shared_ptr<diagnostics::graph> graph_;\r
+ safe_ptr<diagnostics::graph> graph_;\r
\r
tbb::concurrent_bounded_queue<safe_ptr<core::basic_frame>> frame_buffer_;\r
\r
\r
fps_ = 0;\r
\r
- graph_ = diagnostics::create_graph(narrow(print()));\r
graph_->set_color("output-buffer-count", diagnostics::color(1.0f, 1.0f, 0.0f)); \r
graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); \r
+ graph_->set_text(print());\r
+ diagnostics::register_graph(graph_);\r
\r
frame_buffer_.set_capacity(frame_factory_->get_video_format_desc().fps > 30.0 ? 2 : 1);\r
\r
\r
graph_->set_value("output-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
- graph_->update_text(narrow(print()));\r
+ graph_->set_text(narrow(print()));\r
\r
render(renderer);\r
}\r
int preroll_count_;\r
public:\r
oal_consumer() \r
- : graph_(diagnostics::create_graph(narrow(print())))\r
- , container_(16)\r
+ : container_(16)\r
, preroll_count_(0)\r
{\r
if(core::consumer_buffer_depth() < 3)\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_text(print());\r
+ diagnostics::register_graph(graph_);\r
+\r
is_running_ = true;\r
input_.set_capacity(core::consumer_buffer_depth()-2);\r
}\r
, screen_height_(format_desc.height)\r
, square_width_(format_desc.square_width)\r
, square_height_(format_desc.square_height)\r
- , graph_(diagnostics::create_graph(narrow(print())))\r
, input_buffer_(core::consumer_buffer_depth()-1)\r
, 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
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("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f));\r
+ graph_->set_text(print());\r
+ diagnostics::register_graph(graph_);\r
\r
DISPLAY_DEVICE d_device = {sizeof(d_device), 0}; \r
std::vector<DISPLAY_DEVICE> displayDevices;\r
#include <common/env.h>\r
\r
#include <common/log/log.h>\r
+#include <common/diagnostics/graph.h>\r
\r
#include <core/producer/frame_producer.h>\r
#include <core/video_format.h>\r
_parameters.clear();\r
}\r
\r
+bool DiagnosticsCommand::DoExecute()\r
+{ \r
+ try\r
+ {\r
+ diagnostics::show_graphs(boost::lexical_cast<bool>(_parameters.at(0)));\r
+\r
+ SetReplyString(TEXT("202 DIAG OK\r\n"));\r
+\r
+ return true;\r
+ }\r
+ catch(...)\r
+ {\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ SetReplyString(TEXT("502 DIAG FAILED\r\n"));\r
+ return false;\r
+ }\r
+}\r
+\r
bool ParamCommand::DoExecute()\r
{ \r
//Perform loading of the clip\r
\r
namespace amcp {\r
\r
+class DiagnosticsCommand : public AMCPCommandBase<false, AddToQueue, 0>\r
+{\r
+ std::wstring print() const { return L"DiagnosticsCommand";}\r
+ bool DoExecute();\r
+};\r
+\r
class ParamCommand : public AMCPCommandBase<true, AddToQueue, 2>\r
{\r
std::wstring print() const { return L"ParamCommand";}\r
transform(s.begin(), s.end(), s.begin(), toupper);\r
\r
if (s == TEXT("MIXER")) return std::make_shared<MixerCommand>();\r
+ else if(s == TEXT("DIAG")) return std::make_shared<DiagnosticsCommand>();\r
else if(s == TEXT("PARAM")) return std::make_shared<ParamCommand>();\r
else if(s == TEXT("SWAP")) return std::make_shared<SwapCommand>();\r
else if(s == TEXT("LOAD")) return std::make_shared<LoadCommand>();\r
<?xml version="1.0" encoding="utf-8"?>\r
<configuration>\r
<paths>\r
- <media-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 1\server\media\</media-path>\r
- <log-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 1\server\log\</log-path>\r
- <data-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 1\server\data\</data-path>\r
- <template-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 1\server\templates\</template-path>\r
+ <media-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 2\server\media\</media-path>\r
+ <log-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 2\server\log\</log-path>\r
+ <data-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 2\server\data\</data-path>\r
+ <template-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 2\server\templates\</template-path>\r
</paths>\r
- <diagnostics>\r
- <graphs>true</graphs>\r
- </diagnostics>\r
<mixers>\r
<blend-modes>true</blend-modes>\r
</mixers>\r
</DataExecutionPrevention>\r
<TargetMachine>MachineX86</TargetMachine>\r
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>\r
- <LargeAddressAware>false</LargeAddressAware>\r
+ <LargeAddressAware>true</LargeAddressAware>\r
</Link>\r
<PostBuildEvent>\r
<Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"\r
#define CASPAR_MAYOR L"0"\r
#define CASPAR_MINOR L"2"\r
#define CASPAR_REV L"$WCREV$"\r
-#define CASPAR_TAG L"BETA 1"
\ No newline at end of file
+#define CASPAR_TAG L"BETA 2"\r