aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/v4l2.c
diff options
context:
space:
mode:
authorOlivier Langlois <olivier@trillion01.com>2014-05-12 16:26:36 -0400
committerMichael Niedermayer <michaelni@gmx.at>2014-05-18 16:10:12 +0200
commit0a150670476bc8c38df7add4c59826bff73c204e (patch)
treed6c414f6c63a0fd329ee956895cce338b3f9ff08 /libavdevice/v4l2.c
parent6e8fe448154e1aa0928cb0d2e1aecb7255c751cc (diff)
downloadffmpeg-0a150670476bc8c38df7add4c59826bff73c204e.tar.gz
lavd: Use av_gettime_relative()
Whenever av_gettime() is used to measure relative period of time, av_gettime_relative() is prefered as it guarantee monotonic time on supported platforms. Since v4l2 is compiled only on Linux where av_gettime_relative() is monotonic, a small wrapper function av_gettime_monotonic() is used (should be inlined the compiler) to put emphasis on that fact. Signed-off-by: Olivier Langlois <olivier@trillion01.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2.c')
-rw-r--r--libavdevice/v4l2.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 4b3f6a8c73..bbd4892cde 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -427,10 +427,7 @@ static void mmap_release_buffer(void *opaque, uint8_t *data)
#if HAVE_CLOCK_GETTIME && defined(CLOCK_MONOTONIC)
static int64_t av_gettime_monotonic(void)
{
- struct timespec tv;
-
- clock_gettime(CLOCK_MONOTONIC, &tv);
- return (int64_t)tv.tv_sec * 1000000 + tv.tv_nsec / 1000;
+ return av_gettime_relative();
}
#endif