Merge branch 'hotfix/fix-cpu-calculation' into dev-0.2

RidgeRun · Jul 17, 2019 · 3d4edf7 · 3d4edf7
2 parents dfcd55c + b075629
commit 3d4edf7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl required version of autoconf
 AC_PREREQ([2.53])
 
 dnl TODO: fill in your package name and package version here
-AC_INIT([gst-perf],[0.2.2])
+AC_INIT([gst-perf],[0.2.3])
 
 dnl required versions of gstreamer and plugins-base
 GST_REQUIRED=1.0.0

diff --git a/plugins/gstperf.c b/plugins/gstperf.c
@@ -349,13 +349,8 @@ gst_perf_reset (GstPerf * perf)
 {
   g_return_if_fail (perf);
 
-  perf->prev_timestamp = GST_CLOCK_TIME_NONE;
-
   perf->frame_count = 0;
   perf->byte_count = G_GUINT64_CONSTANT (0);
-
-  perf->prev_cpu_total = 0;
-  perf->prev_cpu_idle = 0;
 }
 
 static void
@@ -370,6 +365,10 @@ gst_perf_clear (GstPerf * perf)
 
   perf->bps = 0.0;
   perf->byte_count_total = G_GUINT64_CONSTANT (0);
+
+  perf->prev_timestamp = GST_CLOCK_TIME_NONE;
+  perf->prev_cpu_total = 0;
+  perf->prev_cpu_idle = 0;
 }
 
 static gboolean