2.0.0.2: Fixed mixer frame-time reporting.

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

diff --git a/mixer/frame_mixer_device.cpp b/mixer/frame_mixer_device.cpp
index 8e26865bbf047c16a2e20b13c7a691826dfde901..f7f5a7f813ac4da259157c4d1066d5bcb4410ecd 100644 (file)
--- a/mixer/frame_mixer_device.cpp
+++ b/mixer/frame_mixer_device.cpp
@@ -147,12 +147,15 @@ public:
        {                       \r
                executor_.begin_invoke([=]\r
                {                       \r
-                       diag_->update_value("frame-time", static_cast<float>(perf_timer_.elapsed()/format_desc_.interval*0.5));\r
                        perf_timer_.reset();\r
 \r
-                       auto image = mix_image(frames);\r
+                       auto image_future = mix_image(frames);\r
                        auto audio = mix_audio(frames);\r
-                       output_(make_safe<const gpu_read_frame>(std::move(image.get()), std::move(audio)));\r
+                       auto image = image_future.get();\r
+\r
+                       diag_->update_value("frame-time", static_cast<float>(perf_timer_.elapsed()/format_desc_.interval*0.5));\r
+\r
+                       output_(make_safe<const gpu_read_frame>(std::move(image), std::move(audio)));\r
 \r
                        diag_->update_value("tick-time", static_cast<float>(wait_perf_timer_.elapsed()/format_desc_.interval*0.5));\r
                        wait_perf_timer_.reset();\r

diff --git a/shell/caspar.config b/shell/caspar.config
index b818721c3e22e76007386a6895fabc5d11548256..13c5e13408509558a963a36248c088e7e63648dd 100644 (file)
--- a/shell/caspar.config
+++ b/shell/caspar.config
@@ -14,17 +14,17 @@
     <channel>\r
       <videomode>1080i5000</videomode>\r
       <consumers>\r
-        <!--decklink>\r
+        <decklink>\r
           <device>1</device>\r
           <embedded-audio>true</embedded-audio>\r
           <internal-key>false</internal-key>\r
-        </decklink-->\r
-        <ogl>\r
+        </decklink>\r
+        <!--ogl>\r
           <device>1</device>\r
           <stretch>uniform</stretch>\r
           <windowed>true</windowed>\r
         </ogl>\r
-        <audio/>\r
+        <audio/-->\r
         <!--<bluefish>\r
           <device>1</device>\r
           <embedded-audio>false</embedded-audio>\r