174 commits

Author	SHA1	Message	Date
zhengfl	2263f2a610	refine code: ... 优化 判断重复推流 及 推流流程	2015-07-09 15:45:55 +08:00
winlin	0aed408855	refine code, to 644 and unix encoding.	2015-07-08 17:44:25 +08:00
winlin	c6c90e2643	refine code, add comments for stat on_disconnect.	2015-07-08 17:42:35 +08:00
zhengfl	db9ea4e66e	rewrite #438	2015-07-08 17:08:29 +08:00
zhengfl	f9257b89e7	fix #438 ... 问题：edge模式，推流时异常断开。 解决方法：增加edge模式推流检测。	2015-07-08 15:43:09 +08:00
zhengfl	52110990c1	修正编码风格问题	2015-06-18 16:21:00 +08:00
zhengfl	b4ff9cfba1	fix bug ... 某种情况下，当客户端全部断开后，边缘服务器回源线程（EdgeIngester/EdgeForwarder）没有被断开。	2015-06-17 23:09:17 +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	1f1776a0d8	fix the export project bug. wakeup connection when dispose server.	2015-06-09 14:38:05 +08:00
winlin	00a25ee5c5	cleanup connections when terminate server.	2015-06-08 14:08:12 +08:00
winlin	d7e5df2578	cleanup connections when terminate server.	2015-06-08 14:03:16 +08:00
winlin	ec24533955	use smaller value for publish timeout.	2015-06-06 21:42:01 +08:00
winlin	0fbfad4172	fix gop cache, drop video only when video and not h.264	2015-06-06 20:23:18 +08:00
winlin	6bfb743aa0	remove the unused app http file	2015-05-22 22:38:15 +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	022b6aa561	refine the http remux for http flv stream.	2015-05-03 23:34:59 +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	3b4bd194b6	refine http hooks, donot pass the known variable.	2015-03-31 17:52:49 +08:00
winlin	c92d40e00b	for #334, refine code, use kbps instead skt of rtmp connection.	2015-03-16 15:40:43 +08:00
Nimrod A. Abing (on kohima)	a95bd7d30e	Modified on_close webhook. ... Pass the send_bytes and recv_bytes count to the web hook.	2015-03-16 15:39:49 +08:00
winlin	27cb62b7aa	for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.	2015-03-14 19:45:13 +08:00
winlin	5143e3a58d	fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136	2015-03-08 19:59:10 +08:00
winlin	04f3f2a8f8	for #316, add codec info to stream.	2015-03-08 15:33:08 +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	a47dbf7a92	for #320, refine code.	2015-03-03 17:28:07 +08:00
winlin	34d6a2ece5	for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129	2015-03-03 17:22:44 +08:00
winlin	0213cc6466	for #179, refine dvr, support POST create dvr when publish not start. 2.0.126	2015-02-27 20:39:36 +08:00
winlin	1102c7a58f	refine pithy print to more easyer to use 2.0.121.	2015-02-19 18:56:21 +08:00
winlin	a23191497f	fix #136, support hls without io(in ram). 2.0.112	2015-02-03 16:01:07 +08:00
winlin	a4ba40952a	for #250, rename rtmp to protocol dir.	2015-01-23 10:07:20 +08:00
winlin	2698e6dbae	for bug #293, http live streaming framework.	2015-01-18 18:39:53 +08:00
winlin	b3225100e7	Merge pull request #282 from tufang14/develop ... add client num in statistic with traverse every client for #227	2015-01-09 09:00:08 +08:00
qiang.li	310e49e7f3	add client num in statistic with traverse every client	2015-01-08 21:58:10 +08:00
winlin	ac584a4db2	Merge pull request #279 from tufang14/develop ... add client num for stream in statistic for #227	2015-01-08 15:52:44 +08:00
qiang.li	46d716612c	add client num for stream in statistic	2015-01-07 23:27:24 +08:00
winlin	a402ca7120	refine code, the consumer always alive longer than queue recv thread.	2015-01-07 14:31:42 +08:00
qiang.li	08e9f6ef42	add play client num in statistic	2015-01-06 22:20:31 +08:00
winlin	cc796a433a	refine the statistic arch.	2015-01-05 12:40:38 +08:00
winlin	67adc8dc61	merge with security bug fix.	2015-01-05 12:09:15 +08:00
qiang.li	a4a93613d0	add statistic for stream	2015-01-04 22:47:12 +08:00
winlin	dc11418c79	fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89	2015-01-03 15:33:23 +08:00
winlin	75f2607685	fix #211, support security allow/deny publish/play all/ip. 2.0.86	2015-01-02 16:02:13 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	db13c725a6	refine #259, rename the on_dispose to wakeup. 2.0.73	2014-12-19 09:19:47 +08:00
winlin	61a648f1d2	refine for #259, chmod -x files.	2014-12-19 09:07:31 +08:00
zhengfl	1e34d2a5cd	client connection no disconnect	2014-10-02 19:45:04 +08:00
winlin	0d6b91039d	fix #257, refine latency, send when got one+ msgs, 2.0.72	2014-12-16 09:26:22 +08:00
winlin	cbad7a3074	fix #257, server latency is 0.1s+, the bottleneck is encoder. 2.0.71	2014-12-13 12:48:49 +08:00