5467 commits

Author	SHA1	Message	Date
winlin	574536d9ed	merge wenjie. fix jw/flower player pause bug, which send closeStream actually.	2014-01-11 19:55:55 +08:00
winlin	63388e8ac3	merge from wenjie, fix the flower player play bug, play(reset=amf0-number)	2014-01-02 19:09:25 +08:00
wenjiegit	f387b2b569	update master	2014-01-02 18:03:49 +08:00
wenjiegit	e981cde90c	update master	2014-01-02 17:38:44 +08:00
wenjiegit	f8a7db51f2	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:16:26 +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
wenjiegit	e959bb6c5c	fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number]	2014-01-02 13:26:25 +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	4d631d749f	fix ts_info centos5 build bug	2014-01-01 21:07:01 +08:00
winlin	4955425be9	fix the listen backlog bug, change from 10 to 512	2014-01-01 20:14:46 +08:00
winlin	3dbb2132d3	change server timeout longer, recv timeout from 5s to 30s	2014-01-01 19:58:33 +08:00
winlin	99b9fa0c25	fix the forwarder dead when st_thread interrupt at st_usleep, check thread->can_loop().	2014-01-01 16:27:45 +08:00
winlin	dba7329682	refine readme.	2014-01-01 11:28:43 +08:00
winlin	0b7c7240e6	refine the authors and license	2014-01-01 11:21:52 +08:00
winlin	bb3c88fef7	change copyright from 2013 to 2013-2014.	2014-01-01 10:37:12 +08:00
winlin	20d1732ced	merge from wenjie, the bandwidth test feature.	2013-12-27 17:03:12 +08:00
wenjiegit	3af83fb02a	add linux version of band check app; add web version of band check app	2013-12-26 07:24:19 +08:00
wenjiegit	237fb13e1b	add linux version of band check app; add web version of band check app	2013-12-26 06:06:16 +08:00
wenjiegit	c7cd726f1b	merge upstream	2013-12-24 10:59:38 +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	593d16446e	add bandwidth workflow	2013-12-22 17:45:08 +08:00
winlin	908f0d87e9	add bandwidth workflow	2013-12-22 17:41:28 +08:00
winlin	084ad79534	refine the bandwidth test	2013-12-22 17:38:51 +08:00
winlin	9455181790	merge from wenjie, support banwidth test.	2013-12-22 17:28:29 +08:00
winlin	bad6f0d3a8	revert the copyrigh, only when commit feature, add the copyright field	2013-12-22 12:40:46 +08:00
winlin	dfb3e117f8	add contributor to core.hpp	2013-12-22 12:35:41 +08:00
winlin	725ff8e5a5	merge from wenjie: support set chunk size at vhost level	2013-12-22 12:23:20 +08:00
winlin	4b74435e89	fix bug of resolve vhost, must strip then get from config.	2013-12-22 00:33:38 +08:00
winlin	632255f08f	update the signature, when connect to server, parse the response.	2013-12-21 21:13:55 +08:00
wenjiegit	9a70ce7865	add bandcheck code and modified srs code for merge	2013-12-21 16:19:16 +08:00
winlin	9080c2e559	ensure the HLS(ts) is continous when republish stream.	2013-12-15 20:36:59 +08:00
winlin	e262147e81	fix the hls reload bug, feed it the sequence header.	2013-12-15 20:29:18 +08:00
winlin	27255a3e7a	refine protocol, use int64_t timestamp for ts and jitter.	2013-12-15 19:59:32 +08:00
winlin	ce4928cef6	support set the live queue length(in seconds), drop when full.	2013-12-15 19:38:39 +08:00
winlin	5836ffd2d4	refine the forwarder, use srs message queue	2013-12-15 19:24:29 +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	d911c85a12	add todo for the reload	2013-12-15 13:27:08 +08:00
winlin	b3ef28f831	fix bug of get hls enabled config	2013-12-15 13:23:03 +08:00
winlin	fb67f91167	support reload the hls/forwarder/transcoder	2013-12-15 13:07:39 +08:00
winlin	b90b64954e	support reload the forwarder	2013-12-15 12:34:22 +08:00
winlin	7622878979	support reload the gop_cache	2013-12-15 12:08:01 +08:00
winlin	2f397d0460	support reload the gop_cache	2013-12-15 12:04:28 +08:00
winlin	e2bb38c483	support reload the removed vhost	2013-12-14 22:54:10 +08:00
winlin	f016914ac1	rename SrsReloadHandler to ISrsReloadHandler	2013-12-14 21:34:54 +08:00
winlin	010b7a7595	refine config.	2013-12-14 21:19:47 +08:00
winlin	5b29d0ec42	refine the config	2013-12-14 16:44:27 +08:00
winlin	3dd7156f0d	refine the config buffer.	2013-12-14 15:56:20 +08:00