---
libavformat/rtmpproto.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index f0ef223f05..a18cc78eac 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -127,6 +127,7 @@ typedef struct RTMPContext {
int nb_streamid; ///< The next stream id to
return on createStream calls
double duration; ///< Duration of the stream in
seconds as returned by the server (only valid if non-zero)
int tcp_nodelay; ///< Use TCP_NODELAY to disable
Nagle's algorithm if set to 1
+ int rw_timeout; ///< timeout of socket I/O
operations
char username[50];
char password[50];
char auth_params[500];
@@ -2656,10 +2657,12 @@ static int rtmp_open(URLContext *s, const char *uri,
int flags, AVDictionary **o
port = RTMP_DEFAULT_PORT;
if (rt->listen)
ff_url_join(buf, sizeof(buf), "tcp", NULL, hostname, port,
- "?listen&listen_timeout=%d&tcp_nodelay=%d",
- rt->listen_timeout * 1000, rt->tcp_nodelay);
+ "?listen&listen_timeout=%d&timeout=%d&tcp_nodelay=%d",
+ rt->listen_timeout * 1000, rt->rw_timeout,
+ rt->tcp_nodelay);
else
- ff_url_join(buf, sizeof(buf), "tcp", NULL, hostname, port,
"?tcp_nodelay=%d", rt->tcp_nodelay);
+ ff_url_join(buf, sizeof(buf), "tcp", NULL, hostname, port,
+ "?tcp_nodelay=%d&timeout=%d", rt->tcp_nodelay,
rt->rw_timeout);
}
reconnect:
@@ -3120,6 +3123,7 @@ static const AVOption rtmp_options[] = {
{"listen", "Listen for incoming rtmp connections", OFFSET(listen),
AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC, "rtmp_listen" },
{"tcp_nodelay", "Use TCP_NODELAY to disable Nagle's algorithm",
OFFSET(tcp_nodelay), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC|ENC},
{"timeout", "Maximum timeout (in seconds) to wait for incoming
connections. -1 is infinite. Implies -rtmp_listen 1", OFFSET(listen_timeout),
AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC, "rtmp_listen" },
+ {"rw_timeout", "Maximum timeout (in microseconds) to wait for socket i/o.
-1 is infinite.", OFFSET(rw_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN,
INT_MAX, DEC|ENC },
{ NULL },
};
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
