> On 2 Mar 2018, at 14:56, rpata...@akamai.com wrote:
>
> From: Ravindra Patagar <rpata...@akamai.com>
>
> Signed-off-by: Ravindra <rpata...@akamai.com>
> ---
> doc/muxers.texi | 3 +++
> libavformat/hlsenc.c | 5 ++++-
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/doc/muxers.texi b/doc/muxers.texi
> index c156ec0..e41f8c6 100644
> --- a/doc/muxers.texi
> +++ b/doc/muxers.texi
> @@ -964,6 +964,9 @@ publishing it repeatedly every after 30 segments i.e.
> every after 60s.
> @item http_persistent
> Use persistent HTTP connections. Applicable only for HTTP output.
>
> +@item timeout
> +Set timeout (in microseconds) for socket I/O operations. Applicable only for
> HTTP output.
> +
> @end table
>
> @anchor{ico}
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index 08fe0aa..e69985a 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -224,6 +224,7 @@ typedef struct HLSContext {
> int http_persistent;
> AVIOContext *m3u8_out;
> AVIOContext *sub_m3u8_out;
> + int timeout;
> } HLSContext;
>
> 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);
> if (c->http_persistent)
> 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) {
> @@ -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_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 },
> + {"timeout", "set timeout (in microseconds) for socket I/O operations",
> OFFSET(timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = E },
> { NULL },
> };
>
> --
> 1.9.1
>
LGTM
Thanks
Steven
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
