generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/http: exponentially delay reconnection to avoid flooding the server

Browse Source 
Reviewed-by: Zhang Rui <bbcallen@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-09-06 20:03:46 +02:00
parent 9bd68dea2b
commit bdbab4a351
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/http.c
View File

@ -28,6 +28,7 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/time.h"
#include "avformat.h" #include "avformat.h"
#include "http.h" #include "http.h"
@ -107,6 +108,7 @@ typedef struct HTTPContext {
int reconnect; int reconnect;
int reconnect_at_eof; int reconnect_at_eof;
int reconnect_streamed; int reconnect_streamed;
int reconnect_delay;
int listen; int listen;
char *resource; char *resource;
int reply_code; 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))) { || (read_ret == 0 && s->reconnect_at_eof && (!h->is_streamed || s->reconnect_streamed))) {
int64_t target = h->is_streamed ? 0 : s->off; 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_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); seek_ret = http_seek_internal(h, target, SEEK_SET, 1);
if (seek_ret != target) { if (seek_ret != target) {
av_log(h, AV_LOG_ERROR, "Failed to reconnect at %"PRId64".\n", 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); read_ret = http_buf_read(h, buf, size);
} } else
s->reconnect_delay = 0;
return read_ret; return read_ret;
} }