408 commits

Author	SHA1	Message	Date
winlin	d24aef50ba	for #369, support RTMP 302 api at protocol level.	2016-01-08 18:17:37 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	9d22d09646	show signature of server.	2016-01-04 17:28:18 +08:00
winlin	f516636448	refine code for hooks and http core.	2015-12-29 18:33:02 +08:00
winlin	49308dddfb	update 2015 to 2016	2015-12-23 11:41:41 +08:00
winlin	eec2c34b5c	refine publisher.	2015-12-01 10:42:13 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	7db7d43aea	Merge branch '2.0release' into develop	2015-11-09 15:25:55 +08:00
winlin	18b50d961f	support query server by id.	2015-11-09 15:19:50 +08:00
winlin	aca9fe805c	Merge branch '2.0release' into develop	2015-11-09 14:51:47 +08:00
winlin	d916c53702	refine the api server.	2015-11-09 14:51:41 +08:00
winlin	fe27e76492	support schema	2015-10-26 18:34:55 +08:00
winlin	2bae6e09d3	for #502, snapshot 1 image per 1 seconds, choose best from 5 images.	2015-10-20 14:10:14 +08:00
winlin	1aa4502d5f	for snapshot, choose the best to link to the [stream]-best.png	2015-10-20 13:38:03 +08:00
winlin	33a282e576	support snapshot by http hooks for #152.	2015-10-20 12:30:57 +08:00
winlin	3ab0ccaa27	Merge branch '2.0release' into develop	2015-09-23 18:23:17 +08:00
winlin	7cdcf41d26	refine the api server	2015-09-23 18:23:09 +08:00
winlin	4e88262512	merge from srs2 to check cpus.	2015-09-23 15:11:33 +08:00
winlin	cfe2082353	fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192	2015-09-23 15:09:59 +08:00
winlin	b78781707e	update the srs player	2015-09-17 18:07:02 +08:00
winlin	5073a6fa08	merge from srs2	2015-09-17 18:06:03 +08:00
没——问题	e8680527c3	allow domain * ... 在使用时，srs_player可能和所在页面部署在不同的域名下。 所以在此处添加跨域许可。	2015-09-17 12:09:29 +08:00
没——问题	c548ab5019	function set_srs_player_url(url, params) ... 在实际环境中，player.swf 等静态资源 和页面可能部署到不同的域名或路径下。 所以在此处提供设置 srs_player.swf 的url的方法。	2015-09-17 11:44:45 +08:00
winlin	b25c45c643	refine srs player, support set the bufferTimeMax.	2015-08-24 07:55:30 +08:00
winlin	dd21eee7f0	srs player show current time and url	2015-08-20 18:33:33 +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	170ad05148	add gfps and nb_packets	2015-08-19 15:31:19 +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	ae37fa8f3e	use send_min_interval for stream control. 2.0.183	2015-08-14 11:13:40 +08:00
winlin	31d2de3f23	fix #435, add pageUrl for HTTP callback on_play.	2015-07-21 10:50:57 +08:00
winlin	be342178c0	fix ingest flv tool, support non monotonically timestamp.	2015-07-13 22:09:01 +08:00
winlin	93a1d097dc	update jwplayer to support play HTTP flv.	2015-05-23 19:22:37 +08:00
winlin	ac13817aae	update donation	2015-05-08 07:04:31 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	dbcd7d883b	add script check_hls_backup.sh to research hls.	2015-04-23 16:58:00 +08:00
winlin	23b978c0bb	merge from github	2015-04-20 11:28:46 +08:00
winlin	8fbc6526bb	for #383, refine code to support mix correct algorithm.	2015-04-15 16:17:52 +08:00
winlin	0000c945ea	refine the proxy api server.	2015-04-10 16:07:45 +08:00
winlin	fe1886aa08	add proxy for hls	2015-04-10 15:50:12 +08:00
winlin	e3c6e52547	enhanced on_hls_notify, support HTTP GET when reap ts.	2015-04-10 12:01:45 +08:00
winlin	bd77f995bf	ignore the unknown flv tag.	2015-04-09 12:35:17 +08:00
winlin	64b065e450	for hls callback, add duration of ts.	2015-04-03 13:46:44 +08:00
winlin	c49bc0628e	support on_hls for http hooks. 2.0.152.	2015-03-31 17:42:12 +08:00
winlin	97442c56b6	enhance hls in floor mode.	2015-03-31 17:03:14 +08:00
winlin	76c1957260	enhance hls, increase piece one by one.	2015-03-31 16:58:20 +08:00