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

[casparcg] / shell / main.cpp

diff --git a/shell/main.cpp b/shell/main.cpp
index e5766290891cc3b8e03417873998cb12d08712c8..4ce3e24de7fe7ec70dd51fc3df0965d4b6b3bd44 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -17,15 +17,16 @@
 *    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
 *\r
 */\r
-#include "resource.h"\r
-\r
-#include "server.h"\r
 \r
 // tbbmalloc_proxy: \r
 // Replace the standard memory allocation routines in Microsoft* C/C++ RTL \r
 // (malloc/free, global new/delete, etc.) with the TBB memory allocator. \r
 #include <tbb/tbbmalloc_proxy.h>\r
 \r
+#include "resource.h"\r
+\r
+#include "server.h"\r
+\r
 #ifdef _DEBUG\r
        #define _CRTDBG_MAP_ALLOC\r
        #include <stdlib.h>\r
@@ -58,6 +59,7 @@
 \r
 #include <core/mixer/gpu/ogl_device.h>\r
 \r
+#include <tbb/task_scheduler_init.h>\r
 #include <tbb/task_scheduler_observer.h>\r
 \r
 #include <boost/property_tree/detail/file_parser_error.hpp>\r
@@ -120,39 +122,43 @@ void print_info()
        CASPAR_LOG(info) << L"on " << caspar::get_win_product_name() << L" " << caspar::get_win_sp_version();\r
        CASPAR_LOG(info) << caspar::get_cpu_info();\r
        CASPAR_LOG(info) << caspar::get_system_product_name();\r
-       CASPAR_LOG(info) << L"Flash " << caspar::get_flash_version();\r
-       CASPAR_LOG(info) << L"Flash-Template-Host " << caspar::get_cg_version();\r
-       CASPAR_LOG(info) << L"FreeImage " << caspar::get_image_version();\r
+       CASPAR_LOG(info) << L"Flash " << caspar::flash::get_version();\r
+       CASPAR_LOG(info) << L"Flash-Template-Host " << caspar::flash::get_cg_version();\r
+       CASPAR_LOG(info) << L"FreeImage " << caspar::image::get_version();\r
        \r
-       CASPAR_LOG(info) << L"Decklink " << caspar::get_decklink_version();\r
-       auto deck = caspar::get_decklink_device_list();\r
+       CASPAR_LOG(info) << L"Decklink " << caspar::decklink::get_version();\r
+       auto deck = caspar::decklink::get_device_list();\r
        std::for_each(deck.begin(), deck.end(), [](const std::wstring& device)\r
        {\r
                CASPAR_LOG(info) << device;\r
        });\r
                \r
-       auto blue = caspar::get_bluefish_device_list();\r
+       auto blue = caspar::bluefish::get_device_list();\r
        std::for_each(blue.begin(), blue.end(), [](const std::wstring& device)\r
        {\r
                CASPAR_LOG(info) << device;\r
        });\r
        \r
-       CASPAR_LOG(info) << L"FFMPEG-avcodec "  << caspar::get_avcodec_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avformat " << caspar::get_avformat_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avfilter " << caspar::get_avfilter_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avutil " << caspar::get_avutil_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-swscale "  << caspar::get_swscale_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avcodec "  << caspar::ffmpeg::get_avcodec_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avformat " << caspar::ffmpeg::get_avformat_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avfilter " << caspar::ffmpeg::get_avfilter_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avutil "   << caspar::ffmpeg::get_avutil_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-swscale "  << caspar::ffmpeg::get_swscale_version();\r
        CASPAR_LOG(info) << L"OpenGL " << caspar::core::ogl_device::get_version() << "\n\n";\r
 }\r
 \r
 LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)\r
 {\r
-       CASPAR_LOG(fatal) << L"#######################\n UNHANDLED EXCEPTION: \n" \r
-               << L"Adress:" << info->ExceptionRecord->ExceptionAddress << L"\n"\r
-               << L"Code:" << info->ExceptionRecord->ExceptionCode << L"\n"\r
-               << L"Flag:" << info->ExceptionRecord->ExceptionFlags << L"\n"\r
-               << L"Info:" << info->ExceptionRecord->ExceptionInformation << L"\n"\r
-               << L"Continuing execution. \n#######################";\r
+       try\r
+       {\r
+               CASPAR_LOG(fatal) << L"#######################\n UNHANDLED EXCEPTION: \n" \r
+                       << L"Adress:" << info->ExceptionRecord->ExceptionAddress << L"\n"\r
+                       << L"Code:" << info->ExceptionRecord->ExceptionCode << L"\n"\r
+                       << L"Flag:" << info->ExceptionRecord->ExceptionFlags << L"\n"\r
+                       << L"Info:" << info->ExceptionRecord->ExceptionInformation << L"\n"\r
+                       << L"Continuing execution. \n#######################";\r
+       }\r
+       catch(...){}\r
 \r
     return EXCEPTION_CONTINUE_EXECUTION;\r
 }\r
@@ -164,9 +170,7 @@ int main(int argc, wchar_t* argv[])
        SetUnhandledExceptionFilter(UserUnhandledExceptionFilter);\r
 \r
        CASPAR_LOG(info) << L"Type \"q\" to close application";\r
-\r
-       CASPAR_LOG(info) << L"THIS IS AN ALPHA BUILD";\r
-\r
+       \r
        // Set debug mode.\r
        #ifdef _DEBUG\r
                _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF | _CRTDBG_CHECK_ALWAYS_DF );\r
@@ -180,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
@@ -198,6 +204,8 @@ int main(int argc, wchar_t* argv[])
                        caspar::win32_exception::install_handler();\r
                }\r
        } tbb_thread_installer;\r
+\r
+       tbb::task_scheduler_init init;\r
        \r
        try \r
        {\r
@@ -275,7 +283,7 @@ int main(int argc, wchar_t* argv[])
                                        n++;\r
                                }\r
 \r
-                               wcmd = L"MIXER 1 VIDEO GRID " + boost::lexical_cast<std::wstring>(n);\r
+                               wcmd = L"MIXER 1 GRID " + boost::lexical_cast<std::wstring>(n);\r
 \r
                                for(int i = 1; i <= num; ++i)\r
                                        wcmd += L"\r\nPLAY 1-" + boost::lexical_cast<std::wstring>(i) + L" " + file + L" LOOP";// + L" SLIDE 100 LOOP";\r