157 commits

Author	SHA1	Message	Date
winlin	78aa518ecc	merge srs2	2016-09-27 11:00:13 +08:00
winlin	b19702f669	update srs player	2016-09-27 10:58:04 +08:00
winlin	499fc07db1	refine the hls m3u8 refresh interval.	2016-08-02 16:52:23 +08:00
winlin	5fa500646e	update srs player version	2016-08-02 16:37:52 +08:00
winlin	ec57e2170d	refine hls m3u8 refresh interval and buffer time	2016-08-02 16:31:59 +08:00
winlin	c746753c6a	update player, add pst(player startup time)	2016-04-22 13:33:29 +08:00
winlin	2e75c9f45f	add more buffer	2016-04-19 18:15:47 +08:00
winlin	9312d77c20	default not to preview the stream for publisher.	2016-04-12 11:32:13 +08:00
winlin	6b5c880ff9	refine player to support status change.	2016-03-22 18:35:44 +08:00
winlin	4841435b14	fix default http port bug.	2016-03-19 22:45:39 +08:00
winlin	a2d235f015	refresh js cache.	2016-03-19 22:14:56 +08:00
winlin	d7a28059ed	remove jwplayer and osmf	2016-03-19 22:09:36 +08:00
winlin	d9f1ced732	change srs player to 1.28	2016-03-19 22:00:22 +08:00
winlin	77167f3331	refine srs player for hls, extract a HlsNetStream.	2016-03-19 21:54:46 +08:00
winlin	2492562d25	use xpsid X-Playback-Session-Id to more useful.	2016-03-19 19:48:01 +08:00
winlin	b2bd63e833	refine srs player to play hls.	2016-03-19 19:11:31 +08:00
winlin	46a31f4884	support play hls	2016-03-19 16:35:13 +08:00
winlin	69ec66ee36	refine js for player.	2016-03-19 11:08:25 +08:00
winlin	0a2e00f8c5	dump logs	2016-03-19 10:18:11 +08:00
winlin	9ab5039b36	extract iplayer for srs-player.	2016-03-19 10:06:08 +08:00
winlin	10ce961a00	update version for bwtc	2016-03-14 10:23:20 +08:00
winlin	b3c13f2550	refine the bwtc, to compatible with bms4.	2016-03-12 20:53:37 +08:00
winlin	a3038b1274	fix the rtmp url parse bug.	2016-03-10 12:16:51 +08:00
winlin	82aa9d120c	for #5114, display metadata.	2016-03-07 16:02:37 +08:00
winlin	0cd15068de	set default buffer time to 0.5 for srs player.	2016-01-18 18:02:56 +08:00
winlin	d24aef50ba	for #369, support RTMP 302 api at protocol level.	2016-01-08 18:17:37 +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	fe27e76492	support schema	2015-10-26 18:34:55 +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	93a1d097dc	update jwplayer to support play HTTP flv.	2015-05-23 19:22:37 +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	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	10297fab51	fix #257, support 0.1s+ latency. 2.0.70	2014-12-12 21:51:06 +08:00
winlin	e11fa383ca	udpate the srs_bwt.	2014-11-25 11:09:28 +08:00
winlin	02778dba4c	udpate the srs_bwt.	2014-11-25 11:05:45 +08:00
winlin	a2af051840	udpate the srs_bwt.	2014-11-25 10:59:38 +08:00
winlin	e7ccbce472	update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32.	2014-11-25 10:41:55 +08:00