virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/hlsenc: Option to set timeout for socket I/O operation

Browse Source 
Reviewed-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
Ravindra
2018-03-14 19:59:34 +08:00
committed by Steven Liu
parent b173e03536
commit 6010537956
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/muxers.texi
View File

@@ -964,6 +964,9 @@ publishing it repeatedly every after 30 segments i.e. every after 60s.
@item http_persistent @item http_persistent
Use persistent HTTP connections. Applicable only for HTTP output. Use persistent HTTP connections. Applicable only for HTTP output.
@item timeout
Set timeout for socket I/O operations. Applicable only for HTTP output.
@end table @end table
@anchor{ico} @anchor{ico}

5
libavformat/hlsenc.c
View File

@@ -224,6 +224,7 @@ typedef struct HLSContext {
int http_persistent; int http_persistent;
AVIOContext *m3u8_out; AVIOContext *m3u8_out;
AVIOContext *sub_m3u8_out; AVIOContext *sub_m3u8_out;
int64_t timeout;
} HLSContext; } HLSContext;
static int mkdir_p(const char *path) { static int mkdir_p(const char *path) {
@@ -305,7 +306,8 @@ static void set_http_options(AVFormatContext *s, AVDictionary **options, HLSCont
av_dict_set(options, "user_agent", c->user_agent, 0); av_dict_set(options, "user_agent", c->user_agent, 0);
if (c->http_persistent) if (c->http_persistent)
av_dict_set_int(options, "multiple_requests", 1, 0); av_dict_set_int(options, "multiple_requests", 1, 0);
if (c->timeout >= 0)
av_dict_set_int(options, "timeout", c->timeout, 0);
} }
static void write_codec_attr(AVStream *st, VariantStream *vs) { static void write_codec_attr(AVStream *st, VariantStream *vs) {
@@ -2792,6 +2794,7 @@ static const AVOption options[] = {
{"master_pl_name", "Create HLS master playlist with this name", OFFSET(master_pl_name), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, {"master_pl_name", "Create HLS master playlist with this name", OFFSET(master_pl_name), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E},
{"master_pl_publish_rate", "Publish master play list every after this many segment intervals", OFFSET(master_publish_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, UINT_MAX, E}, {"master_pl_publish_rate", "Publish master play list every after this many segment intervals", OFFSET(master_publish_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, UINT_MAX, E},
{"http_persistent", "Use persistent HTTP connections", OFFSET(http_persistent), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, {"http_persistent", "Use persistent HTTP connections", OFFSET(http_persistent), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E },
{"timeout", "set timeout for socket I/O operations", OFFSET(timeout), AV_OPT_TYPE_DURATION, { .i64 = -1 }, -1, INT_MAX, .flags = E },
{ NULL }, { NULL },
}; };