Log thumbnail generation at trace and ffmpeg filter graph only if not generating...

diff --git a/core/thumbnail_generator.cpp b/core/thumbnail_generator.cpp
index 4a8614b5fe3c74ba9aaa02d753a32668c98f66c2..e3aaa1bb0d066f860b56aaf1581ae0bb7663a829 100644 (file)
--- a/core/thumbnail_generator.cpp
+++ b/core/thumbnail_generator.cpp
@@ -341,7 +341,7 @@ public:
                        try\r
                        {\r
                                boost::filesystem::last_write_time(png_file, boost::filesystem::last_write_time(file));\r
-                               CASPAR_LOG(debug) << L"Generated thumbnail for " << media_file;\r
+                               CASPAR_LOG(trace) << L"Generated thumbnail for " << media_file;\r
                        }\r
                        catch (...)\r
                        {\r

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 287288775b4cab5d240937177464dafc7c633db8..348c08f7781a987a49bde39d2de87fe162ce36c3 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -179,14 +179,14 @@ void disable_logging_for_thread()
                get_disable_logging_for_thread().reset(new bool); // bool value does not matter\r
 }\r
 \r
-bool is_logging_already_disabled_for_thread()\r
+bool is_logging_disabled_for_thread()\r
 {\r
        return get_disable_logging_for_thread().get() != nullptr;\r
 }\r
 \r
 std::shared_ptr<void> temporary_disable_logging_for_thread(bool disable)\r
 {\r
-       if (!disable || is_logging_already_disabled_for_thread())\r
+       if (!disable || is_logging_disabled_for_thread())\r
                return std::shared_ptr<void>();\r
 \r
        disable_logging_for_thread();\r

diff --git a/modules/ffmpeg/ffmpeg.h b/modules/ffmpeg/ffmpeg.h
index 4162b489e8e814dfacc7f74afed7d556491a7c29..cabf459e8cff81ce0c6dcf6e33161e5ad3a6ae46 100644 (file)
--- a/modules/ffmpeg/ffmpeg.h
+++ b/modules/ffmpeg/ffmpeg.h
@@ -37,6 +37,7 @@ void init(const safe_ptr<core::media_info_repository>& media_info_repo);
 void uninit();\r
 void disable_logging_for_thread();\r
 std::shared_ptr<void> temporary_disable_logging_for_thread(bool disable);\r
+bool is_logging_disabled_for_thread();\r
 \r
 std::wstring get_avcodec_version();\r
 std::wstring get_avformat_version();\r

diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp
index bd09d1cc16dd12000981596b45f0bddfc7924a80..a7a77809b2f609c8f51911d8fca48dcdc90d0d87 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.cpp
+++ b/modules/ffmpeg/producer/filter/filter.cpp
@@ -24,6 +24,7 @@
 #include "filter.h"\r
 \r
 #include "../../ffmpeg_error.h"\r
+#include "../../ffmpeg.h"\r
 \r
 #include <common/exception/exceptions.h>\r
 \r
@@ -152,11 +153,9 @@ struct filter::implementation
                video_graph_in_  = filt_vsrc;\r
                video_graph_out_ = filt_vsink;\r
                \r
-               CASPAR_LOG(info)\r
-                       <<      widen(std::string("\n") \r
-                               + avfilter_graph_dump(\r
-                                               video_graph_.get(), \r
-                                               nullptr));\r
+               if (!is_logging_disabled_for_thread())\r
+                       CASPAR_LOG(info) << widen(std::string("\n") + avfilter_graph_dump(\r
+                                       video_graph_.get(), nullptr));\r
        }\r
        \r
        void configure_filtergraph(\r