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

diff --git a/common/utility/timer.h b/common/utility/timer.h
index 574391682d057b98d3ea59b3d66a07268721583e..9c702426cf9049fe2d7b15546d7bdca8b1dd0462 100644 (file)
--- a/common/utility/timer.h
+++ b/common/utility/timer.h
@@ -23,4 +23,62 @@ private:
        DWORD time_;\r
 };\r
 \r
+class high_prec_timer\r
+{\r
+public:\r
+       high_prec_timer()\r
+       {\r
+               QueryPerformanceFrequency(&freq_);\r
+               QueryPerformanceCounter(&time_);\r
+       }\r
+\r
+       // Author: Ryan M. Geiss\r
+       // http://www.geisswerks.com/ryan/FAQS/timing.html\r
+       void tick(double interval)\r
+       {       \r
+               LARGE_INTEGER t;\r
+               QueryPerformanceCounter(&t);\r
+\r
+               if (time_.QuadPart != 0)\r
+               {\r
+                       int ticks_to_wait = static_cast<int>(static_cast<double>(freq_.QuadPart) * interval);\r
+                       int done = 0;\r
+                       do\r
+                       {\r
+                               QueryPerformanceCounter(&t);\r
+                               \r
+                               int ticks_passed = static_cast<int>(static_cast<__int64>(t.QuadPart) - static_cast<__int64>(time_.QuadPart));\r
+                               int ticks_left = ticks_to_wait - ticks_passed;\r
+\r
+                               if (t.QuadPart < time_.QuadPart)    // time wrap\r
+                                       done = 1;\r
+                               if (ticks_passed >= ticks_to_wait)\r
+                                       done = 1;\r
+                               \r
+                               if (!done)\r
+                               {\r
+                                       // if > 0.002s left, do Sleep(1), which will actually sleep some \r
+                                       //   steady amount, probably 1-2 ms,\r
+                                       //   and do so in a nice way (cpu meter drops; laptop battery spared).\r
+                                       // otherwise, do a few Sleep(0)'s, which just give up the timeslice,\r
+                                       //   but don't really save cpu or battery, but do pass a tiny\r
+                                       //   amount of time.\r
+                                       if (ticks_left > static_cast<int>((freq_.QuadPart*2)/1000))\r
+                                               Sleep(1);\r
+                                       else                        \r
+                                               for (int i = 0; i < 10; ++i) \r
+                                                       Sleep(0);  // causes thread to give up its timeslice\r
+                               }\r
+                       }\r
+                       while (!done);            \r
+               }\r
+\r
+               time_ = t;\r
+       }               \r
+private:       \r
+       LARGE_INTEGER freq_;\r
+       LARGE_INTEGER time_;\r
+};\r
+\r
+\r
 }
\ No newline at end of file

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 6cfc5cffe688afee89f6e4787162cb2d0cc2f5f7..bbc97195ae7065b53109ed33ccb82ba2785b7ce6 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -72,6 +72,8 @@ class flash_renderer
        \r
        safe_ptr<diagnostics::graph> graph_;\r
        timer perf_timer_;\r
+\r
+       high_prec_timer timer_;\r
        \r
 public:\r
        flash_renderer(const safe_ptr<diagnostics::graph>& graph, const std::shared_ptr<core::frame_factory>& frame_factory, const std::wstring& filename) \r
@@ -171,10 +173,12 @@ private:
 \r
        safe_ptr<core::basic_frame> render_simple_frame(bool underflow)\r
        {\r
+               double frame_time = 1.0/ax_->GetFPS();\r
+\r
                if(underflow)\r
                        graph_->add_tag("underflow");\r
-\r
-               double frame_time = 1.0/ax_->GetFPS();\r
+               else\r
+                       timer_.tick(frame_time);\r
 \r
                perf_timer_.reset();\r
                ax_->Tick();\r