83 commits

Author	SHA1	Message	Date
wenjiegit	276b60200f	fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number]	2014-01-02 14:05:09 +08:00
wenjiegit	bfef0eebfe	fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number]	2014-01-02 14:00:00 +08:00
winlin	993c5daec7	chunk size default to 60000, high performance. set chunk size when forward	2014-01-01 21:39:06 +08:00
winlin	20d1732ced	merge from wenjie, the bandwidth test feature.	2013-12-27 17:03:12 +08:00
wenjiegit	00fb37a831	merge upstream	2013-12-24 10:49:17 +08:00
wenjiegit	3753e8c5f1	merge upstream	2013-12-24 10:38:38 +08:00
winlin	6b99a749ea	refine the chat, use players_pub_rtmp without hls and gopcache, low latecy	2013-12-23 10:58:41 +08:00
winlin	bad6f0d3a8	revert the copyrigh, only when commit feature, add the copyright field	2013-12-22 12:40:46 +08:00
winlin	725ff8e5a5	merge from wenjie: support set chunk size at vhost level	2013-12-22 12:23:20 +08:00
winlin	309322fd5c	update the bootstrap wizard, use v2	2013-12-22 11:58:30 +08:00
winlin	ee79f4a52f	update the conf, add demo.srs.com, add players and players_pub, add __defaultVhost__ for rtmp	2013-12-22 00:08:17 +08:00
wenjiegit	9a70ce7865	add bandcheck code and modified srs code for merge	2013-12-21 16:19:16 +08:00
winlin	40c1298476	add srs player	2013-12-20 00:12:17 +08:00
winlin	6beff7cf54	fix build script bug, create nginx/html/live dir	2013-12-18 15:22:14 +08:00
winlin	1c04e35924	refine the ui, add osmf/jwplayer	2013-12-18 12:37:46 +08:00
winlin	e262147e81	fix the hls reload bug, feed it the sequence header.	2013-12-15 20:29:18 +08:00
winlin	ce4928cef6	support set the live queue length(in seconds), drop when full.	2013-12-15 19:38:39 +08:00
winlin	c47f07c69a	refine the consumer, use srs message queue to shrink message when overflow.	2013-12-15 19:11:57 +08:00
winlin	b4093bfbe4	support set live queue length	2013-12-15 18:25:55 +08:00
winlin	270041b225	fix the forwarder reconnect bug, feed it the sequence header.	2013-12-15 17:09:25 +08:00
winlin	63cec6f967	update readme	2013-12-15 13:41:17 +08:00
winlin	b3ef28f831	fix bug of get hls enabled config	2013-12-15 13:23:03 +08:00
winlin	aaba290c1d	add reload readme.	2013-12-15 12:44:09 +08:00
winlin	b90b64954e	support reload the forwarder	2013-12-15 12:34:22 +08:00
winlin	e2bb38c483	support reload the removed vhost	2013-12-14 22:54:10 +08:00
winlin	010b7a7595	refine config.	2013-12-14 21:19:47 +08:00
winlin	ac5ccbc77e	refine the thread model for the retry threads	2013-12-14 14:06:32 +08:00
wenjiegit	94fb022ef9	merge srs.conf	2013-12-13 03:51:02 +08:00
wenjiegit	c87e55a2cc	merged master	2013-12-13 02:41:31 +08:00
wenjie	6e9f375606	+server support band check +every vhost can have it's own chunk size	2013-12-12 20:56:19 +08:00
winlin	bb90881489	auto install depends software for ubuntu or centos.	2013-12-10 10:09:29 +08:00
winlin	c618229487	regression test ok	2013-12-08 13:17:39 +08:00
winlin	3fd3ac5a11	support http hooks: on_connect/close/publish/unpublish/play/stop.	2013-12-08 12:48:03 +08:00
winlin	889ad9238b	support http hooks: on_connect/close/publish/unpublish/play/stop.	2013-12-08 12:45:12 +08:00
winlin	30099dfa09	support multiple http hooks for a event.	2013-12-08 10:46:15 +08:00
winlin	65fde21e6c	add http client	2013-12-07 22:06:53 +08:00
winlin	d3cee00b3b	add cherrypy api server	2013-12-07 20:34:42 +08:00
winlin	263213d8b6	update version, add build date	2013-12-07 19:27:31 +08:00
winlin	3b09f9bea9	support audio transcode only, speex/mp3 to aac	2013-12-06 14:35:03 +08:00
winlin	679e851f07	support max_connections, drop if exceed.	2013-12-06 11:00:37 +08:00
winlin	b9440df745	add encoder/hls pithy print	2013-12-05 23:34:26 +08:00
winlin	464d78b762	add todo for ffmpeg	2013-12-03 00:26:40 +08:00
winlin	113731dd6b	reap the transcode process	2013-12-02 23:51:51 +08:00
winlin	a2e6e6718e	fix the m3u8 crash bug, simplify it	2013-12-02 11:46:39 +08:00
winlin	2695e4d0c6	fix bug of core	2013-12-01 17:42:09 +08:00
winlin	6af0794bab	support dead-loop detect for forwarder and transcoder.	2013-12-01 17:32:06 +08:00
winlin	e4ea965a3a	update conf	2013-12-01 14:28:07 +08:00
winlin	9d65cd1c9f	change server name to demo, dev used for development vhost	2013-12-01 14:08:28 +08:00
winlin	bf18a3ac96	change demo video to 200kbps	2013-12-01 12:41:52 +08:00
winlin	bbf7b9bb01	disable the forward for bug. update the steps	2013-12-01 12:31:23 +08:00