125 commits

Author	SHA1	Message	Date
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
winlin	3d97048c3a	fix bug #217, add reuse conn to play different player.	2014-11-22 19:15:40 +08:00
winlin	fb906f0afc	revert the player for bug #185.	2014-10-25 17:15:33 +08:00
winlin	6a3418cd45	fix #185, AMF0 support 0x0B the date type codec. 2.0.5.	2014-10-25 17:12:56 +08:00
winlin	5c4398f4a9	refine bandwidth check/test, flash publish test is ok.	2014-07-13 20:25:36 +08:00
winlin	cc62d254f0	add librtmp bandwidth check/test client.	2014-07-13 16:10:06 +08:00
winlin	019b25ea30	add MIT license to bandwidth check/test as/js library.	2014-07-13 10:05:30 +08:00
winlin	3a1b3dd142	fix bandwidth bug, config item interval to float.	2014-07-12 22:22:56 +08:00
winlin	d8ed7cc968	refine the js library for bandwidth test.	2014-07-12 21:03:26 +08:00
winlin	0707c24b54	refine the js library for bandwidth test.	2014-07-12 20:56:44 +08:00
winlin	2ff88b9bcd	move js to srs_bwt.	2014-07-12 20:51:57 +08:00
winlin	c319cc6a40	refine bandwidth test client, provides js and as library	2014-07-12 20:48:03 +08:00
winlin	55989b4bc8	remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139	2014-06-29 10:43:53 +08:00
winlin	48adeeb1a5	fix the demo player html text	2014-06-06 15:35:47 +08:00
winlin	6de81fdb1c	refine fast id tracer	2014-05-27 19:34:18 +08:00
winlin	384687a36d	add server ip to flash client.	2014-05-27 16:17:40 +08:00
winlin	e39eed6519	add SrsPid and SrsId to client response, add pid to log	2014-05-27 16:11:25 +08:00
winlin	5ff1ce7cba	for bug #87, response the server SrsId to flash.	2014-05-27 15:34:55 +08:00
winlin	9eb76cb1eb	update demo.conf	2014-04-11 14:40:38 +08:00
winlin	15f651bccd	update demo, support acodec	2014-04-11 14:13:14 +08:00
winlin	4e3fe36ae2	refine http server pages. change to 0.9.51	2014-04-05 13:14:59 +08:00
winlin	3c63cf0a86	update demo page, change http port to 8080	2014-04-04 23:09:58 +08:00
winlin	4c8d6d2eb1	fix bug of hls and rename demo player stream to live/demo. change to 0.9.36	2014-03-26 18:13:33 +08:00
winlin	fabdf9507e	fix bug of play stream of nginx, remove the start slash of streamName.	2014-01-01 13:58:58 +08:00
winlin	273bdb2242	update flash client.	2014-01-01 11:38:48 +08:00
winlin	649419c1aa	refine the utility of js.	2014-01-01 09:49:54 +08:00
winlin	c221eb61c4	fix bug of bandwidth test, donot use vhost in query	2013-12-27 18:57:36 +08:00
winlin	5537f9b066	fix bug of bandwidth test, donot use vhost in query	2013-12-27 18:55:47 +08:00
winlin	df349da7d9	fix bug of bandwidth test, donot use vhost in query	2013-12-27 18:55:10 +08:00
winlin	89ac091c35	fix bug of bandwidth test, donot use vhost in query	2013-12-27 18:54:34 +08:00
winlin	62f1f23991	fix bug of bandwidth test, donot use vhost in query	2013-12-27 18:52:09 +08:00
winlin	7901b481e4	change ui version to 1.19	2013-12-27 18:50:43 +08:00
winlin	19f9342034	refine bandwidth test	2013-12-27 18:49:34 +08:00