3484 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	baa70d4ddd	add nb_streams for vhost	2015-08-22 22:51:59 +08:00
winlin	7a2836ae2a	Merge branch '2.0release' into develop	2015-08-22 19:49:39 +08:00
winlin	6e5143449e	HTTP API support JSONP by specifies the query string callback=xxx.	2015-08-22 18:18:18 +08:00
winlin	22485ce5e9	Merge branch '2.0release' into develop	2015-08-22 13:57:45 +08:00
winlin	aeebddb269	for #442, add more information for client for api.	2015-08-22 13:57:34 +08:00
winlin	94641c812b	fix #442, support kickoff client.	2015-08-22 13:36:15 +08:00
winlin	b37797b13a	for #442, add publish connection in stream.publish api	2015-08-22 13:03:10 +08:00
winlin	529803ed04	refine code for api.	2015-08-22 12:38:14 +08:00
winlin	1962449770	Merge branch '2.0release' into develop	2015-08-22 11:09:11 +08:00
winlin	6b6d951298	add api /api/v1/features	2015-08-22 11:08:56 +08:00
winlin	4763f205a2	add kbps for vhost and stream	2015-08-22 09:49:38 +08:00
winlin	0a4d78383c	Merge branch '2.0release' into develop	2015-08-21 17:15:42 +08:00
winlin	20a8818a8e	refine the error response.	2015-08-21 17:15:32 +08:00
winlin	2edcf1d4ff	support query specified vhost	2015-08-21 17:00:52 +08:00
winlin	66a26bdce8	move json from app to protocol	2015-08-21 16:20:19 +08:00
winlin	a7589b9ad3	refine code for api, add clients and parse_rest_id	2015-08-21 16:12:48 +08:00
winlin	ab4620870d	refine the stat api, support query specified stream.	2015-08-21 15:51:20 +08:00
winlin	32a484164a	Merge branch '2.0release' into develop	2015-08-21 15:22:46 +08:00
winlin	c75f05c88b	fix the log cid display error, merge the publish recv thread log to publish connection.	2015-08-21 15:22:40 +08:00
winlin	9528243b81	Merge branch '2.0release' into develop	2015-08-21 13:43:40 +08:00
winlin	3c402cb908	refine the tcp nodelay, effect connected connections.	2015-08-21 13:43:33 +08:00
winlin	71aacebcbc	Merge branch '2.0release' into develop	2015-08-21 12:08:35 +08:00
winlin	c31a546eec	support vhost for http flv.	2015-08-21 12:08:25 +08:00
winlin	0afe4963bc	Merge branch '2.0release' into develop	2015-08-20 18:33:47 +08:00
winlin	dd21eee7f0	srs player show current time and url	2015-08-20 18:33:33 +08:00
winlin	ce8f446494	Merge branch '2.0release' into develop	2015-08-20 18:13:17 +08:00
winlin	dfecfb65b1	support fluency and stream empty count	2015-08-20 18:13:07 +08:00
winlin	fcd2d3d445	refine code for link generation from rtmp url.	2015-08-20 16:18:32 +08:00
winlin	fe87bf1b61	support generate link page for rtmp url	2015-08-20 16:11:17 +08:00
winlin	018af55d65	refine the demo pages, move scripts after body.	2015-08-20 15:19:43 +08:00
winlin	77765b463a	Merge branch '2.0release' into develop	2015-08-20 14:20:58 +08:00
winlin	575a698820	fix #380, srs-librtmp send sequence header when sps or pps changed.	2015-08-20 14:20:49 +08:00
winlin	f10e399991	Merge branch '2.0release' into develop	2015-08-19 19:02:40 +08:00
winlin	ec87dd9cd6	refine code for srs rtmp dump	2015-08-19 19:02:33 +08:00
winlin	785a5907a8	set the default get_publish_normal_timeout to 5s	2015-08-19 16:27:22 +08:00
winlin	0bbfc5526a	set the default get_publish_normal_timeout to 5s	2015-08-19 16:22:52 +08:00
winlin	7273c33c35	support publish_1stpkt_timeout and publish_normal_timeout	2015-08-19 16:16:05 +08:00
winlin	170ad05148	add gfps and nb_packets	2015-08-19 15:31:19 +08:00
winlin	a5dd3a8e7b	Merge branch '2.0release' into develop	2015-08-19 15:14:35 +08:00
winlin	e7714cd445	add packets interval in ms to set the right send_min_interval	2015-08-19 15:14:26 +08:00
winlin	de48b477ae	drop the metadata when drop sequence header	2015-08-19 14:23:12 +08:00
winlin	22491b0c99	merge from 2.0	2015-08-19 14:21:12 +08:00
winlin	f691dddc1a	drop metadata when drop sequence header. support PCUC 0x1a	2015-08-19 14:20:31 +08:00
winlin	2cf526ffc7	close #454, support obs restart publish. 2.0.184	2015-08-18 17:43:01 +08:00
winlin	0cb7ddfe8c	Merge branch '2.0release' into develop	2015-08-18 14:09:05 +08:00
winlin	ccc4c05da9	fix #229, support vs2010 for srslibrtmp.	2015-08-18 14:08:54 +08:00
winlin	f53b2556bb	Merge branch '2.0release' into develop	2015-08-17 16:34:21 +08:00
winlin	01be68fe58	refine code, donot remove the detail when hls disabled.	2015-08-17 16:34:11 +08:00
winlin	53351cd645	Merge branch '2.0release' into develop	2015-08-14 15:51:15 +08:00
winlin	afd05f71c3	refine code, use size cache for performance issue.	2015-08-14 15:51:02 +08:00