Commit 0eec06ed authored by Olivier Langlois's avatar Olivier Langlois Committed by Michael Niedermayer

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: 's avatarOlivier Langlois <olivier@trillion01.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent a7320c15
...@@ -15,6 +15,9 @@ libavutil: 2012-10-22 ...@@ -15,6 +15,9 @@ libavutil: 2012-10-22
API changes, most recent first: API changes, most recent first:
2014-05-xx - xxxxxxx - lavu 52.84.100 - time.h
Add av_gettime_relative() av_gettime_relative_is_monotonic()
2014-05-xx - xxxxxxx - lavf 55.17.0 - avformat.h 2014-05-xx - xxxxxxx - lavf 55.17.0 - avformat.h
Add AVMFT_FLAG_BITEXACT flag. Muxers now use it instead of checking Add AVMFT_FLAG_BITEXACT flag. Muxers now use it instead of checking
CODEC_FLAG_BITEXACT on the first stream. CODEC_FLAG_BITEXACT on the first stream.
......
...@@ -53,6 +53,26 @@ int64_t av_gettime(void) ...@@ -53,6 +53,26 @@ int64_t av_gettime(void)
#endif #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) int av_usleep(unsigned usec)
{ {
#if HAVE_NANOSLEEP #if HAVE_NANOSLEEP
......
...@@ -28,6 +28,21 @@ ...@@ -28,6 +28,21 @@
*/ */
int64_t av_gettime(void); 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 * Sleep for a period of time. Although the duration is expressed in
* microseconds, the actual delay may be rounded to the precision of the * microseconds, the actual delay may be rounded to the precision of the
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 83 #define LIBAVUTIL_VERSION_MINOR 84
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment