141 commits

Author	SHA1	Message	Date
winlin	396bb43672	Merge branch '2.0release' into develop	2015-09-23 15:46:58 +08:00
winlin	8b1198562a	show cpu info.	2015-09-23 15:46:51 +08:00
winlin	abb5c5ad31	add kafka producer	2015-09-22 17:40:05 +08:00
winlin	df6ac8842c	rename rtmp utility to protocol utility	2015-09-22 09:11:07 +08:00
winlin	168625dce2	rename rtmp amf0 to protocol amf0.	2015-09-22 09:05:21 +08:00
winlin	0e52fc6d5b	rename SrsStream to SrsBuffer	2015-09-22 08:57:31 +08:00
winlin	ca3577e11b	rename temp to stream	2015-09-22 08:52:00 +08:00
winlin	a4f51564db	rename kernel stream to buffer	2015-09-22 08:48:55 +08:00
winlin	ac2b03a3ed	rename srs_kernel_buffer to temp	2015-09-22 08:42:54 +08:00
winlin	1fd83d9314	refine the order.	2015-09-17 13:36:02 +08:00
winlin	4763f205a2	add kbps for vhost and stream	2015-08-22 09:49:38 +08:00
winlin	baa892a762	merge srs_app_st_socket to srs_app_st.	2015-06-14 08:43:38 +08:00
winlin	d103557a8b	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00
winlin	0d66e92ab5	refine code, support configure to enable --memory-watch	2015-06-13 15:45:25 +08:00
winlin	7996b3b789	add warning for gmp, use gmc to detect memory leak.	2015-06-09 10:52:32 +08:00
winlin	573495a19f	refine the memory watcher.	2015-06-08 09:47:45 +08:00
winlin	e5461d2df9	refine code	2015-05-28 07:03:38 +08:00
winlin	fec8422d6b	fix bug of configure.	2015-05-27 10:23:40 +08:00
winlin	c1b9541b5c	support disable all	2015-05-27 07:22:44 +08:00
winlin	6bfb743aa0	remove the unused app http file	2015-05-22 22:38:15 +08:00
winlin	f0ae66a081	merge the app http to conn.	2015-05-22 22:34:03 +08:00
winlin	ce1bb6c605	refine code, extrat the ISrsHttpMessage.	2015-05-22 22:24:05 +08:00
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	2015-05-19 18:06:20 +08:00
winlin	77ee2400df	fix the unicode to ascii	2015-05-09 23:12:12 +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	7b157b0678	refine hls ingester, quit when error.	2015-04-22 09:04:18 +08:00
winlin	aabe84046c	refine hls ingester, quit when error.	2015-04-22 09:01:38 +08:00
winlin	1d973e2178	refine the overflow algorithm, prevent smaller piece.	2015-04-21 16:18:37 +08:00
winlin	d19dfa528e	abs overflow also plus the deviation, for pure audio hls.	2015-04-21 14:35:28 +08:00
winlin	c514a4ceeb	use atc for ingest hls aac time.	2015-04-21 12:58:54 +08:00
winlin	a28eec89b0	support ingest hls with m3u8 in m3u8.	2015-04-21 12:53:45 +08:00
winlin	ba6736839b	support hls ingest, fix the bugs.	2015-04-20 18:31:45 +08:00
winlin	2239e9f1fd	support ingest hls live stream to RTMP.	2015-04-20 16:25:48 +08:00
winlin	717d088376	support server cycle handler. 2.0.153.	2015-03-31 18:06:55 +08:00
winlin	d349a3dbda	update stable version check	2015-03-15 08:15:04 +08:00
winlin	ffef62900f	for #328, support adobe hds. 2.0.138.	2015-03-12 11:15:15 +08:00
winlin	f9767c91b5	fix configure bug, refine code for stream caster.	2015-03-10 18:07:43 +08:00
winlin	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	2015-03-10 12:50:27 +08:00
winlin	fbbe46d272	refine the config, support directly parse file.	2015-03-07 22:25:43 +08:00
winlin	3982ec1d87	refine http request parse. 2.0.132.	2015-03-06 11:36:26 +08:00
winlin	4325809daf	refine http	2015-03-05 21:45:01 +08:00
winlin	3e394a5f06	for #320, set socket send buffer to smaller macro. 2.0.131	2015-03-04 16:52:43 +08:00
winlin	e81e090239	for #133, add rtsp listener and handler.	2015-02-15 21:28:31 +08:00
winlin	e71bc0cbc5	for bug #277, refine the http server.	2015-01-17 23:44:21 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	7150a99f41	for bug #251, remove the mic(message iovs cache), no use.	2014-12-10 09:15:38 +08:00
winlin	d53fd7f570	for bug #251, support mic(message iovs cache). 2.0.61	2014-12-06 20:10:05 +08:00
winlin	32d537b96b	for bug #251, refine code before mic.	2014-12-06 19:56:06 +08:00
winlin	b1d7fbe668	fix #241, add mw(merged-write) config. 2.0.53	2014-12-04 21:35:13 +08:00