From f78bc96b7c1c74caf99a7139cf81ce1110404965 Mon Sep 17 00:00:00 2001 From: Olivier Langlois Date: Tue, 6 May 2014 17:16:51 -0400 Subject: [PATCH] lavf: 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. Signed-off-by: Olivier Langlois Signed-off-by: Michael Niedermayer --- libavformat/avio.c | 4 ++-- libavformat/network.c | 4 ++-- libavformat/sapenc.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 4edaaa6215..0a2a0a9aab 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -312,8 +312,8 @@ static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, } else { if (h->rw_timeout) { if (!wait_since) - wait_since = av_gettime(); - else if (av_gettime() > wait_since + h->rw_timeout) + wait_since = av_gettime_relative(); + else if (av_gettime_relative() > wait_since + h->rw_timeout) return AVERROR(EIO); } av_usleep(1000); diff --git a/libavformat/network.c b/libavformat/network.c index 5e574e3bbe..9f02ec6c51 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -163,8 +163,8 @@ int ff_network_wait_fd_timeout(int fd, int write, int64_t timeout, AVIOInterrupt return ret; if (timeout > 0) { if (!wait_start) - wait_start = av_gettime(); - else if (av_gettime() - wait_start > timeout) + wait_start = av_gettime_relative(); + else if (av_gettime_relative() - wait_start > timeout) return AVERROR(ETIMEDOUT); } } diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c index 738e8b8f91..2564698e7b 100644 --- a/libavformat/sapenc.c +++ b/libavformat/sapenc.c @@ -245,7 +245,7 @@ static int sap_write_packet(AVFormatContext *s, AVPacket *pkt) { AVFormatContext *rtpctx; struct SAPState *sap = s->priv_data; - int64_t now = av_gettime(); + int64_t now = av_gettime_relative(); if (!sap->last_time || now - sap->last_time > 5000000) { int ret = ffurl_write(sap->ann_fd, sap->ann, sap->ann_size);