Creates a timer class

Author: fran6co

examples/protonect/CMakeLists.txt

@@ -16,6 +16,7 @@ IF(ENABLE_CXX11)
   CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
   IF(COMPILER_SUPPORTS_CXX11)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    SET(LIBFREENECT2_WITH_CXX11_SUPPORT 1)
   ELSEIF(COMPILER_SUPPORTS_CXX0X)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
   ELSE()
@@ -99,6 +100,7 @@ SET(SOURCES
   src/resource.cpp
   src/command_transaction.cpp
   src/registration.cpp
+  src/logging.cpp
   src/libfreenect2.cpp
 
   ${LIBFREENECT2_THREADING_SOURCE}

examples/protonect/include/libfreenect2/config.h.in

@@ -49,4 +49,6 @@
 
 #cmakedefine LIBFREENECT2_OPENCV_FOUND
 
+#cmakedefine LIBFREENECT2_WITH_CXX11_SUPPORT
+
 #endif // LIBFREENECT2_CONFIG_H

examples/protonect/include/libfreenect2/logging.h

@@ -0,0 +1,51 @@
+/*
+ * This file is part of the OpenKinect Project. http://www.openkinect.org
+ *
+ * Copyright (c) 2014 individual OpenKinect contributors. See the CONTRIB file
+ * for details.
+ *
+ * This code is licensed to you under the terms of the Apache License, version
+ * 2.0, or, at your option, the terms of the GNU General Public License,
+ * version 2.0. See the APACHE20 and GPL2 files for the text of the licenses,
+ * or the following URLs:
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * If you redistribute this file in source form, modified or unmodified, you
+ * may:
+ *   1) Leave this header intact and distribute it under the same terms,
+ *      accompanying it with the APACHE20 and GPL20 files, or
+ *   2) Delete the Apache 2.0 clause and accompany it with the GPL2 file, or
+ *   3) Delete the GPL v2 clause and accompany it with the APACHE20 file
+ * In all cases you must keep the copyright notice intact and include a copy
+ * of the CONTRIB file.
+ *
+ * Binary distributions must follow the binary distribution requirements of
+ * either License.
+ */
+
+#ifndef LOGGING_H_
+#define LOGGING_H_
+
+#include <libfreenect2/config.h>
+
+namespace libfreenect2
+{
+
+class TimerImpl;
+
+class Timer {
+ public:
+  Timer();
+  virtual ~Timer();
+
+  void start();
+  double stop();
+
+ private:
+  TimerImpl *impl_;
+};
+
+} /* namespace libfreenect2 */
+
+#endif /* LOGGING_H_ */

examples/protonect/include/libfreenect2/packet_processor.h

@@ -27,6 +27,8 @@
 #ifndef PACKET_PROCESSOR_H_
 #define PACKET_PROCESSOR_H_
 
+#include <libfreenect2/logging.h>
+
 namespace libfreenect2
 {
 

examples/protonect/src/cpu_depth_packet_processor.cpp

@@ -219,7 +219,7 @@ class CpuDepthPacketProcessorImpl
   double timing_acc;
   double timing_acc_n;
 
-  double timing_current_start;
+  Timer timer;
 
   bool enable_bilateral_filter, enable_edge_filter;
   DepthPacketProcessor::Parameters params;
@@ -235,7 +235,6 @@ class CpuDepthPacketProcessorImpl
 
     timing_acc = 0.0;
     timing_acc_n = 0.0;
-    timing_current_start = 0.0;
 
     enable_bilateral_filter = true;
     enable_edge_filter = true;
@@ -245,15 +244,12 @@ class CpuDepthPacketProcessorImpl
 
   void startTiming()
   {
-#ifdef LIBFREENECT2_OPENCV_FOUND
-    timing_current_start = cv::getTickCount();
-#endif
+    timer.start();
   }
 
   void stopTiming()
   {
-#ifdef LIBFREENECT2_OPENCV_FOUND
-    timing_acc += (cv::getTickCount() - timing_current_start) / cv::getTickFrequency();
+    timing_acc += timer.stop();
     timing_acc_n += 1.0;
 
     if(timing_acc_n >= 100.0)
@@ -263,7 +259,6 @@ class CpuDepthPacketProcessorImpl
       timing_acc = 0.0;
       timing_acc_n = 0.0;
     }
-#endif
   }
 
   void newIrFrame()

examples/protonect/src/logging.cpp

@@ -0,0 +1,95 @@
+/*
+ * This file is part of the OpenKinect Project. http://www.openkinect.org
+ *
+ * Copyright (c) 2015 individual OpenKinect contributors. See the CONTRIB file
+ * for details.
+ *
+ * This code is licensed to you under the terms of the Apache License, version
+ * 2.0, or, at your option, the terms of the GNU General Public License,
+ * version 2.0. See the APACHE20 and GPL2 files for the text of the licenses,
+ * or the following URLs:
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * If you redistribute this file in source form, modified or unmodified, you
+ * may:
+ *   1) Leave this header intact and distribute it under the same terms,
+ *      accompanying it with the APACHE20 and GPL20 files, or
+ *   2) Delete the Apache 2.0 clause and accompany it with the GPL2 file, or
+ *   3) Delete the GPL v2 clause and accompany it with the APACHE20 file
+ * In all cases you must keep the copyright notice intact and include a copy
+ * of the CONTRIB file.
+ *
+ * Binary distributions must follow the binary distribution requirements of
+ * either License.
+ */
+
+#include <libfreenect2/logging.h>
+
+#ifdef LIBFREENECT2_WITH_CXX11_SUPPORT
+#include <chrono>
+#endif
+
+#ifdef LIBFREENECT2_WITH_OPENGL_SUPPORT
+#include <GLFW/glfw3.h>
+#endif
+
+namespace libfreenect2 {
+
+#ifdef LIBFREENECT2_WITH_CXX11_SUPPORT
+class TimerImpl {
+ public:
+  void start() {
+    time_start = std::chrono::high_resolution_clock::now();
+  }
+
+  double stop() {
+    auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - time_start);
+
+    return duration.count()/1000.0;
+  }
+
+  std::chrono::time_point<std::chrono::high_resolution_clock> time_start;
+};
+#elif defined(LIBFREENECT2_WITH_OPENGL_SUPPORT)
+class TimerImpl {
+ public:
+  void start() {
+    time_start = glfwGetTime();
+  }
+
+  double stop() {
+    return glfwGetTime() - time_start;
+  }
+
+  double time_start;
+};
+#else
+class TimerImpl {
+ public:
+  void start() {
+  }
+
+  double stop() {
+    return 0;
+  }
+};
+#endif
+
+Timer::Timer() :
+    impl_(new TimerImpl()) {
+}
+
+Timer::~Timer() {
+  delete impl_;
+}
+
+void Timer::start() {
+  impl_->start();
+}
+
+double Timer::stop() {
+  return impl_->stop();
+}
+
+} /* namespace libfreenect2 */

examples/protonect/src/opencl_depth_packet_processor.cpp

@@ -83,7 +83,7 @@ class OpenCLDepthPacketProcessorImpl
   double timing_acc;
   double timing_acc_n;
 
-  double timing_current_start;
+  Timer timer;
 
   Frame *ir_frame, *depth_frame;
 
@@ -151,7 +151,6 @@ class OpenCLDepthPacketProcessorImpl
 
     timing_acc = 0.0;
     timing_acc_n = 0.0;
-    timing_current_start = 0.0;
     image_size = 512 * 424;
 
     deviceInitialized = initDevice(deviceId);
@@ -544,15 +543,12 @@ class OpenCLDepthPacketProcessorImpl
 
   void startTiming()
   {
-#ifdef LIBFREENECT2_OPENCV_FOUND
-    timing_current_start = cv::getTickCount();
-#endif
+    timer.start();
   }
 
   void stopTiming()
   {
-#ifdef LIBFREENECT2_OPENCV_FOUND
-    timing_acc += (cv::getTickCount() - timing_current_start) / cv::getTickFrequency();
+    timing_acc += timer.stop();
     timing_acc_n += 1.0;
 
     if(timing_acc_n >= 100.0)
@@ -562,7 +558,6 @@ class OpenCLDepthPacketProcessorImpl
       timing_acc = 0.0;
       timing_acc_n = 0.0;
     }
-#endif
   }
 
   void newIrFrame()

examples/protonect/src/opengl_depth_packet_processor.cpp

@@ -370,7 +370,7 @@ struct OpenGLDepthPacketProcessorImpl : public WithOpenGLBindings
   double timing_acc;
   double timing_acc_n;
 
-  double timing_current_start;
+  Timer timer;
 
   bool do_debug;
 
@@ -392,7 +392,6 @@ struct OpenGLDepthPacketProcessorImpl : public WithOpenGLBindings
     params_need_update(true),
     timing_acc(0),
     timing_acc_n(0),
-    timing_current_start(0),
     do_debug(debug)
   {
   }
@@ -447,12 +446,12 @@ struct OpenGLDepthPacketProcessorImpl : public WithOpenGLBindings
 
   void startTiming()
   {
-    timing_current_start = glfwGetTime();
+    timer.start();
   }
 
   void stopTiming()
   {
-    timing_acc += (glfwGetTime() - timing_current_start);
+    timing_acc += timer.stop();
     timing_acc_n += 1.0;
 
     if(timing_acc_n >= 100.0)

examples/protonect/src/turbo_jpeg_rgb_packet_processor.cpp

@@ -45,7 +45,7 @@ class TurboJpegRgbPacketProcessorImpl
   double timing_acc;
   double timing_acc_n;
 
-  double timing_current_start;
+  Timer timer;
 
   TurboJpegRgbPacketProcessorImpl()
   {
@@ -59,7 +59,6 @@ class TurboJpegRgbPacketProcessorImpl
 
     timing_acc = 0.0;
     timing_acc_n = 0.0;
-    timing_current_start = 0.0;
   }
 
   ~TurboJpegRgbPacketProcessorImpl()
@@ -80,15 +79,12 @@ class TurboJpegRgbPacketProcessorImpl
 
   void startTiming()
   {
-#ifdef LIBFREENECT2_OPENCV_FOUND
-    timing_current_start = cv::getTickCount();
-#endif
+    timer.start();
   }
 
   void stopTiming()
   {
-#ifdef LIBFREENECT2_OPENCV_FOUND
-    timing_acc += (cv::getTickCount() - timing_current_start) / cv::getTickFrequency();
+    timing_acc += timer.stop();
     timing_acc_n += 1.0;
 
     if(timing_acc_n >= 100.0)
@@ -98,7 +94,6 @@ class TurboJpegRgbPacketProcessorImpl
       timing_acc = 0.0;
       timing_acc_n = 0.0;
     }
-#endif
   }
 };