From bdbab4a351591304be07586fe55b8b9f01be28e3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 6 Sep 2015 20:03:46 +0200 Subject: [PATCH] avformat/http: exponentially delay reconnection to avoid flooding the server Reviewed-by: Zhang Rui Signed-off-by: Michael Niedermayer --- libavformat/http.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/http.c b/libavformat/http.c index aa60aefed9..126c7b3063 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -28,6 +28,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/opt.h" +#include "libavutil/time.h" #include "avformat.h" #include "http.h" @@ -107,6 +108,7 @@ typedef struct HTTPContext { int reconnect; int reconnect_at_eof; int reconnect_streamed; + int reconnect_delay; int listen; char *resource; int reply_code; @@ -1249,6 +1251,8 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size) || (read_ret == 0 && s->reconnect_at_eof && (!h->is_streamed || s->reconnect_streamed))) { int64_t target = h->is_streamed ? 0 : s->off; av_log(h, AV_LOG_INFO, "Will reconnect at %"PRId64" error=%s.\n", s->off, av_err2str(read_ret)); + av_usleep(1000U*1000*s->reconnect_delay); + s->reconnect_delay = 1 + 2*s->reconnect_delay; seek_ret = http_seek_internal(h, target, SEEK_SET, 1); if (seek_ret != target) { av_log(h, AV_LOG_ERROR, "Failed to reconnect at %"PRId64".\n", target); @@ -1256,7 +1260,8 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size) } read_ret = http_buf_read(h, buf, size); - } + } else + s->reconnect_delay = 0; return read_ret; }