194 commits

Author	SHA1	Message	Date
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	2015-12-26 12:13:17 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +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	6d50aa1aa2	#475, fix http hooks crash for st context switch. 2.0.187	2015-09-14 12:22:19 +08:00
lovecat	9c2beffe8f	statistic connection bytes before remove client.	2015-08-25 11:46:12 +08:00
winlin	aeebddb269	for #442, add more information for client for api.	2015-08-22 13:57:34 +08:00
winlin	94641c812b	fix #442, support kickoff client.	2015-08-22 13:36:15 +08:00
winlin	c75f05c88b	fix the log cid display error, merge the publish recv thread log to publish connection.	2015-08-21 15:22:40 +08:00
winlin	3c402cb908	refine the tcp nodelay, effect connected connections.	2015-08-21 13:43:33 +08:00
winlin	ec87dd9cd6	refine code for srs rtmp dump	2015-08-19 19:02:33 +08:00
winlin	7273c33c35	support publish_1stpkt_timeout and publish_normal_timeout	2015-08-19 16:16:05 +08:00
winlin	e7714cd445	add packets interval in ms to set the right send_min_interval	2015-08-19 15:14:26 +08:00
winlin	2cf526ffc7	close #454, support obs restart publish. 2.0.184	2015-08-18 17:43:01 +08:00
winlin	ae37fa8f3e	use send_min_interval for stream control. 2.0.183	2015-08-14 11:13:40 +08:00
winlin	9fb4640a8f	enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182	2015-08-12 13:22:09 +08:00
lovacat	e8c0ca7af0	fix #442: HTTP API kickoff client.	2015-08-11 15:23:46 +08:00
winlin	c2ef779523	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	2015-07-16 17:31:31 +08:00
winlin	366d3a3f56	for #441, use 30s timeout for first msg. 2.0.178	2015-07-16 17:30:27 +08:00
zhengfl	a5a9f7c8c5	refine code:优化edge模式回源播放线程启动流程	2015-07-16 11:36:14 +08:00
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