243 commits

Author	SHA1	Message	Date
winlin	a1fcf66f32	for #742, always enable http utilities.	2017-01-23 17:43:59 +08:00
winlin	79def81792	for #742, refine the rtmp conn, use info as data cluster.	2017-01-23 17:12:04 +08:00
winlin	39aee2b318	for #742, fix publish recv thread bug.	2017-01-23 16:44:42 +08:00
winlin	954bb186c1	identify the flash and fmle for recv thread.	2017-01-23 16:43:43 +08:00
winlin	5c959fc781	merge from srs2, for kbps free io	2017-01-22 13:16:05 +08:00
winlin	310032d8d8	merge srs2, timestamp overflow for ATC.	2017-01-18 11:48:31 +08:00
cenxinwei	762d7a8884	fix publish_normal_timeout 配置读取错误	2017-01-17 15:11:40 +08:00
winlin	3fe338d1c5	for #742, use ms for application clock tbn.	2017-01-17 12:25:30 +08:00
winlin	dca9749f37	for #742, refine the object live cycle. 3.0.15	2017-01-17 10:44:13 +08:00
winlin	f4c0af8bfc	refine code remove dup api for #742	2017-01-16 16:20:34 +08:00
winlin	d49f195bbf	fix #734, log format error.	2017-01-10 09:36:51 +08:00
winlin	1b175b1107	for #730, support config in/out ack size. 3.0.13	2017-01-06 14:57:54 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	664844b5f5	merge from srs2. for #513.	2016-12-15 14:54:09 +08:00
winlin	759c84a395	for #513, remove hls ram from srs2 to srs3+. 2.0.224	2016-12-15 14:48:38 +08:00
winlin	9ba4bed648	merge srs2	2016-12-13 17:58:42 +08:00
winlin	cb1d47bfef	fix #713, refine source to avoid critical fetch and create. 2.0.222	2016-12-13 17:57:49 +08:00
winlin	9a3674c624	refine kafka	2016-12-08 11:44:49 +08:00
winlin	7d96a33207	Merge branch '2.0release' into develop	2016-09-01 16:51:18 +08:00
winlin	e2865c6ac1	workaround for #511, the fly stfd in close. 2.0.211	2016-09-01 16:51:09 +08:00
winlin	79fdc4e766	fix bug for rtmp client use NULL ptr.	2015-12-28 18:13:40 +08:00
winlin	7ae2c6bf50	merge from srs2.	2015-12-26 12:17:51 +08:00
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	2015-12-26 12:13:17 +08:00
winlin	11e11005ac	specifies the try default vhost	2015-12-24 19:14:23 +08:00
winlin	a7bf4bfda5	refine code, ignore client when no ip.	2015-12-24 17:25:05 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	5ac8177ce6	fix bugs	2015-12-08 18:32:37 +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	d2ca51ac50	notify kafka when client close	2015-10-23 14:42:04 +08:00
winlin	61486a82aa	kafka use topic and partition cache	2015-10-23 14:42:04 +08:00
winlin	a08d8f83d6	refine mpegts code, use simple rtmp client	2015-10-23 14:42:02 +08:00
winlin	ad9b377d96	refine forwarder code, use simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	0f4cb8ee00	refine code, remove the rtmp recv/send macro, use one macro.	2015-10-23 14:42:02 +08:00
winlin	12e013142d	refine code, use simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	bc27481886	refine code, use simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	e4c852945f	refine code, support override vhost	2015-10-23 14:42:02 +08:00
winlin	a9ad7b211b	refine simple rtmp client for post flv stream.	2015-10-23 14:42:02 +08:00
winlin	adb8f243bf	use simple rtmp client for raw connect app	2015-10-23 14:42:02 +08:00
winlin	24b3899972	use SrsTcpClient instead raw socket.	2015-10-23 14:42:02 +08:00
winlin	d8f18aee37	use the right int type for port.	2015-09-24 18:33:07 +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	1fd83d9314	refine the order.	2015-09-17 13:36:02 +08:00
winlin	a7c4b786cf	merge from 2.0	2015-09-14 18:42:31 +08:00
winlin	8be3c875af	donot release stream when busy	2015-09-14 15:17:59 +08:00
winlin	a994191ddc	for #474, always release publish for source.	2015-09-14 15:10:34 +08:00
winlin	3b483094bd	merge from 2.0	2015-09-14 12:24:57 +08:00
winlin	6d50aa1aa2	#475, fix http hooks crash for st context switch. 2.0.187	2015-09-14 12:22:19 +08:00
winlin	bc24c0407b	for #319, move smi and rsh to play	2015-08-30 07:36:06 +08:00