2.0. timer: Replaced QPC with timeGetTime, QPC might have problems with Turbo Boost...

[casparcg] / common / utility / timer.h

diff --git a/common/utility/timer.h b/common/utility/timer.h
index 2f49c02df8b9474eee50018958654ec9b7e3629a..ce399327572e9190ef87d6dfbe27e56523bb2adc 100644 (file)
--- a/common/utility/timer.h
+++ b/common/utility/timer.h
@@ -19,57 +19,37 @@
 */\r
 #pragma once\r
 \r
+#define NOMINMAX\r
+\r
 #include <windows.h>\r
+#include <Mmsystem.h>\r
 \r
 namespace caspar {\r
        \r
-class timer\r
-{\r
-public:\r
-       timer() : time_(timeGetTime()){}\r
-\r
-       double elapsed()\r
-       {\r
-               return static_cast<double>(timeGetTime() - time_)/1000.0;\r
-       }\r
-       \r
-       void reset()\r
-       {\r
-               time_ = timeGetTime();\r
-       }\r
-       \r
-private:       \r
-       DWORD time_;\r
-};\r
-\r
 class high_prec_timer\r
 {\r
 public:\r
        high_prec_timer()\r
+               : time_(0)\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
+               auto t = ::timeGetTime();\r
 \r
-               if (time_.QuadPart != 0)\r
+               if (time_ != 0)\r
                {\r
-                       int ticks_to_wait = static_cast<int>(static_cast<double>(freq_.QuadPart) * interval);\r
-                       int done = 0;\r
+                       auto ticks_to_wait = static_cast<DWORD>(interval*1000.0);\r
+                       bool 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
+                               auto ticks_passed = t - time_;\r
+                               auto ticks_left   = ticks_to_wait - ticks_passed;\r
 \r
-                               if (t.QuadPart < time_.QuadPart)    // time wrap\r
+                               if (t < time_)    // time wrap\r
                                        done = 1;\r
                                if (ticks_passed >= ticks_to_wait)\r
                                        done = 1;\r
@@ -82,12 +62,14 @@ public:
                                        // 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
+                                       if (ticks_left > 2)\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
+                               t = ::timeGetTime();\r
                        }\r
                        while (!done);            \r
                }\r
@@ -95,8 +77,7 @@ public:
                time_ = t;\r
        }               \r
 private:       \r
-       LARGE_INTEGER freq_;\r
-       LARGE_INTEGER time_;\r
+       DWORD time_;\r
 };\r
 \r
 \r