aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorOlivier Langlois <olivier@trillion01.com>2014-05-12 16:26:37 -0400
committerMichael Niedermayer <michaelni@gmx.at>2014-05-17 15:28:03 +0200
commit0eec06ed8747923faa6a98e474f224d922dc487d (patch)
tree8de2dba09cd9bf5fe1028c0e382ff81b94d8724f /libavutil
parenta7320c1574d216d8f56af400ef3c6b523a366483 (diff)
downloadffmpeg-0eec06ed8747923faa6a98e474f224d922dc487d.tar.gz
lavu: add av_gettime_relative()
These functions are using the POSIX clock_gettime() function with the CLOCK_MONOTONIC clock id. If these are not present on the targeted platform, the new functions will fallback on using the original realtime functions av_gettime() and av_usleep(). Monotonic support can be added on other platforms with their equivalent native system API eventually if possible. Whenever time is requested to measure relative time, the monotonic clock, when available, is superior to the system realtime clock because it is not affected by discontinuous jumps in the system time In a future step, offering the flexibility to let the user choose between rt and monotonic clock for avdevices packets will be investigated. It is very easy to experience the issues that this patch attempt to address by rewinding back in the past the system time while ffmpeg is running. this is breaking the ffmpeg report printing (ffmepg.c:print_report()) and the the rate emulator functionality (-re) without the patch. Signed-off-by: Olivier Langlois <olivier@trillion01.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/time.c20
-rw-r--r--libavutil/time.h15
-rw-r--r--libavutil/version.h2
3 files changed, 36 insertions, 1 deletions
diff --git a/libavutil/time.c b/libavutil/time.c
index 5a00e7025d..ce4552e767 100644
--- a/libavutil/time.c
+++ b/libavutil/time.c
@@ -53,6 +53,26 @@ int64_t av_gettime(void)
#endif
}
+int64_t av_gettime_relative(void)
+{
+#if HAVE_CLOCK_GETTIME && defined(CLOCK_MONOTONIC)
+ struct timespec ts;
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+ return (int64_t)ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
+#else
+ return av_gettime();
+#endif
+}
+
+int av_gettime_relative_is_monotonic(void)
+{
+#if HAVE_CLOCK_GETTIME && defined(CLOCK_MONOTONIC)
+ return 1;
+#else
+ return 0;
+#endif
+}
+
int av_usleep(unsigned usec)
{
#if HAVE_NANOSLEEP
diff --git a/libavutil/time.h b/libavutil/time.h
index 90eb436949..910d28e85f 100644
--- a/libavutil/time.h
+++ b/libavutil/time.h
@@ -29,6 +29,21 @@
int64_t av_gettime(void);
/**
+ * Get the current time in microseconds since some unspecified starting point.
+ * On platforms that support it, the time comes from a monotonic clock
+ * This property makes this time source ideal for measuring relative time.
+ * If a monotonic clock is not available on the targeted platform, the
+ * implementation fallsback on using av_gettime().
+ */
+int64_t av_gettime_relative(void);
+
+/**
+ * Indicates with a boolean result if the av_gettime_relative() time source
+ * is monotonic.
+ */
+int av_gettime_relative_is_monotonic(void);
+
+/**
* Sleep for a period of time. Although the duration is expressed in
* microseconds, the actual delay may be rounded to the precision of the
* system timer.
diff --git a/libavutil/version.h b/libavutil/version.h
index 7140705319..365eb30a61 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -56,7 +56,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 52
-#define LIBAVUTIL_VERSION_MINOR 83
+#define LIBAVUTIL_VERSION_MINOR 84
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \