git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index c823a96bed5998c082328d9be745802af1cadd3b..2c01acd1db7d4c21885f24c27f954be7e3e30b36 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -101,26 +101,28 @@ public:
        {\r
                try\r
                {\r
+                       auto format_desc = get_video_format_desc();\r
+\r
                        boost::timer frame_timer;\r
 \r
                        // Produce\r
                        \r
-                       auto stage_frames = (*stage_)(format_desc_);\r
+                       auto stage_frames = (*stage_)(format_desc);\r
 \r
                        // Mix\r
                        \r
-                       auto mixed_frame  = (*mixer_)(std::move(stage_frames), format_desc_);\r
+                       auto mixed_frame  = (*mixer_)(std::move(stage_frames), format_desc);\r
 \r
                        // Consume\r
                        \r
                        frame_subject_ << mixed_frame;\r
                        \r
-                       (*output_)(std::move(mixed_frame), format_desc_);\r
+                       (*output_)(std::move(mixed_frame), format_desc);\r
                \r
-                       graph_->set_value("tick-time", frame_timer.elapsed()*format_desc_.fps*0.5);\r
+                       graph_->set_value("tick-time", frame_timer.elapsed()*format_desc.fps*0.5);\r
 \r
                        event_subject_ << monitor::event("debug/time") % frame_timer.elapsed();\r
-                       event_subject_ << monitor::event("format");\r
+                       event_subject_ << monitor::event("format")              % u8(format_desc.name);\r
                }\r
                catch(...)\r
                {\r
@@ -140,7 +142,7 @@ public:
                \r
        std::wstring print() const\r
        {\r
-               return L"video_channel[" + boost::lexical_cast<std::wstring>(index_) + L"|" +  format_desc_.name + L"]";\r
+               return L"video_channel[" + boost::lexical_cast<std::wstring>(index_) + L"|" +  get_video_format_desc().name + L"]";\r
        }\r
 \r
        boost::property_tree::wptree info() const\r