2.0.2: Improved log messages. In particular regarding GPU stall warning.

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

diff --git a/common/log/log.cpp b/common/log/log.cpp
index 802eb93492de3440298253e8a89100e49aa7fd4c..3446e5c34ac0f9ad5a118aae38fa7d6322ad47a4 100644 (file)
--- a/common/log/log.cpp
+++ b/common/log/log.cpp
@@ -110,11 +110,11 @@ void init()
 \r
        auto stream_sink = boost::make_shared<stream_sink_type>(stream_backend);\r
        \r
-#ifdef NDEBUG\r
-       stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= trace);\r
-#else\r
-       stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= trace);\r
-#endif\r
+//#ifdef NDEBUG\r
+//     stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);\r
+//#else\r
+//     stream_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);\r
+//#endif\r
 \r
        stream_sink->locked_backend()->set_formatter(&my_formatter);\r
 \r
@@ -143,11 +143,11 @@ void add_file_sink(const std::wstring& folder)
                \r
                file_sink->locked_backend()->set_formatter(&my_formatter);\r
 \r
-#ifdef NDEBUG\r
-               file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= trace);\r
-#else\r
-               file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= trace);\r
-#endif\r
+//#ifdef NDEBUG\r
+//             file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);\r
+//#else\r
+//             file_sink->set_filter(boost::log::filters::attr<severity_level>(boost::log::sources::aux::severity_attribute_name<wchar_t>::get()) >= debug);\r
+//#endif\r
                boost::log::wcore::get()->add_sink(file_sink);\r
 \r
                CASPAR_LOG(info) << L"Logging [info] or higher severity to " << folder << std::endl << std::endl;\r

diff --git a/core/mixer/gpu/fence.cpp b/core/mixer/gpu/fence.cpp
index 41e2d4cb10578c4b4cce6564bb492dbd81aa2b25..5de2a5894ec858e5bb9b1481f0aa87150223d54a 100644 (file)
--- a/core/mixer/gpu/fence.cpp
+++ b/core/mixer/gpu/fence.cpp
@@ -48,8 +48,20 @@ struct fence::implementation
                        }\r
                }\r
 \r
-               if(delay > 0)\r
-                       CASPAR_LOG(debug) << L"[fence] Performance warning. GPU was not ready during requested host read-back. Delayed by atleast: " << delay << L" ms.";\r
+               static tbb::atomic<bool> warned;\r
+               \r
+               if(delay > 2)\r
+               {\r
+                       if(!warned.fetch_and_store(true))\r
+                       {\r
+                               CASPAR_LOG(warning) << L"[fence] Performance warning. GPU was not ready during requested host read-back. Delayed by atleast: " << delay << L" ms. Further warnings are sent to trace log level."\r
+                                                                       << L" You can ignore this warning if you do not notice any problems with output video. This warning is caused by insufficent support or performance of your graphics card for OpenGL based memory transfers. "\r
+                                                                       << L" Please try to update your graphics drivers or update your graphics card, see recommendations on (www.casparcg.com)."\r
+                                                                       << L" Further help is available at (www.casparcg.com/forum).";\r
+                       }\r
+                       else\r
+                               CASPAR_LOG(trace) << L"[fence] Performance warning. GPU was not ready during requested host read-back. Delayed by atleast: " << delay << L" ms.";\r
+               }\r
        }\r
 };\r
        \r

diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp
index c8b32cd4a0fc9f8b3d03b6d9ef2827a3ae5706c3..ec661bcfa48a75958c7d76059c82a23705c996aa 100644 (file)
--- a/modules/ffmpeg/producer/input.cpp
+++ b/modules/ffmpeg/producer/input.cpp
@@ -217,12 +217,12 @@ private:
 \r
                                seek_frame(start_, flags);\r
                                graph_->add_tag("seek");                \r
-                               CASPAR_LOG(trace) << print() << " Looping.";                    \r
+                               CASPAR_LOG(debug) << print() << " Looping.";                    \r
                        }       \r
                        else\r
                        {\r
                                is_running_ = false;\r
-                               CASPAR_LOG(trace) << print() << " Stopping.";\r
+                               CASPAR_LOG(debug) << print() << " Stopping.";\r
                        }\r
                }\r
                else\r
@@ -272,7 +272,7 @@ private:
                if(ret == AVERROR(EIO))\r
                        CASPAR_LOG(trace) << print() << " Received EIO, assuming EOF. " << nb_frames_;\r
                if(ret == AVERROR_EOF)\r
-                       CASPAR_LOG(trace) << print() << " Received EOF. " << nb_frames_;\r
+                       CASPAR_LOG(debug) << print() << " Received EOF. " << nb_frames_;\r
 \r
                return ret == AVERROR_EOF || ret == AVERROR(EIO) || frame_number_ >= length_; // av_read_frame doesn't always correctly return AVERROR_EOF;\r
        }\r

diff --git a/protocol/amcp/AMCPProtocolStrategy.cpp b/protocol/amcp/AMCPProtocolStrategy.cpp
index fdd685875b85f6ac0df9eb63a105ad0220c5a8de..03b32196f6fea8bf36ff887e37d9f0d6c16c9146 100644 (file)
--- a/protocol/amcp/AMCPProtocolStrategy.cpp
+++ b/protocol/amcp/AMCPProtocolStrategy.cpp
@@ -168,7 +168,7 @@ AMCPCommandPtr AMCPProtocolStrategy::InterpretCommandString(const std::wstring&
        AMCPCommandPtr pCommand;\r
        MessageParserState state = New;\r
 \r
-       CASPAR_LOG(trace) << message;\r
+       CASPAR_LOG(info) << message;\r
 \r
        std::size_t tokensInMessage = TokenizeMessage(message, &tokens);\r
 \r

diff --git a/shell/main.cpp b/shell/main.cpp
index 97c9760b1420fa0ff102db8a7a8f8eb31bd00f42..4ce3e24de7fe7ec70dd51fc3df0965d4b6b3bd44 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -184,6 +184,8 @@ int main(int argc, wchar_t* argv[])
 \r
        // Install structured exception handler.\r
        caspar::win32_exception::install_handler();\r
+\r
+       caspar::log::set_log_level(L"debug");\r
                        \r
        // Increase time precision. This will increase accuracy of function like Sleep(1) from 10 ms to 1 ms.\r
        struct inc_prec\r