rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time

Samuel Pitoiset committed 14 years ago

Commit 8517e9c1 parent 9477c032 files · +4 −1Browse files

Unified · Split

2 files

doc/protocols.texi +3 −0
libavformat/rtmpproto.c +1 −1

doc/protocols.texi+3−0

@@ -198,6 +198,9 @@ Additionally, the following parameters can be set via command line options · 197 unmodified lines
198	198	Name of application to connect on the RTMP server. This option
199	199	overrides the parameter specified in the URI.
200	200
	201	+@item rtmp_buffer
	202	+Set the client buffer time in milliseconds. The default is 3000.
	203	+
201	204	@item rtmp_conn
202	205	Extra arbitrary AMF connection parameters, parsed from a string,
203	206	e.g. like @code{B:1 S:authMe O:1 NN:code:1.23 NS:flag:ok O:0}.

libavformat/rtmpproto.c+1−1

@@ -1219,7 +1219,6 @@ static int rtmp_open(URLContext s, const char uri, int flags) · 1218 unmodified lines
1219	1219	rt->bytes_read = 0;
1220	1220	rt->last_bytes_read = 0;
1221	1221	rt->server_bw = 2500000;
1222		− rt->client_buffer_time = 3000;
1223	1222
1224	1223	av_log(s, AV_LOG_DEBUG, "Proto = %s, path = %s, app = %s, fname = %s\n",
1225	1224	proto, path, rt->app, rt->playpath);
@@ -1366,6 +1365,7 @@ static int rtmp_write(URLContext s, const uint8_t buf, int size) · 140 unmodified lines
1366	1365
1367	1366	static const AVOption rtmp_options[] = {
1368	1367	{"rtmp_app", "Name of application to connect to on the RTMP server", OFFSET(app), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC\|ENC},
	1368	+ {"rtmp_buffer", "Set buffer time in milliseconds. The default is 3000.", OFFSET(client_buffer_time), AV_OPT_TYPE_INT, {3000}, 0, INT_MAX, DEC\|ENC},
1369	1369	{"rtmp_conn", "Append arbitrary AMF data to the Connect message", OFFSET(conn), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC\|ENC},
1370	1370	{"rtmp_flashver", "Version of the Flash plugin used to run the SWF player.", OFFSET(flashver), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC\|ENC},
1371	1371	{"rtmp_live", "Specify that the media is a live stream.", OFFSET(live), AV_OPT_TYPE_INT, {-2}, INT_MIN, INT_MAX, DEC, "rtmp_live"},