50 commits

Author	SHA1	Message	Date
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +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	2cf526ffc7	close #454, support obs restart publish. 2.0.184	2015-08-18 17:43:01 +08:00
winlin	d103557a8b	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00
winlin	5908096fc3	refine the thread, protocol, kbps code. 2.0.166	2015-05-23 10:04:28 +08:00
winlin	cfc0877ec9	refine the thread, add all callback.	2015-05-23 09:49:15 +08:00
winlin	e5f449ce36	refine the thread to three category.	2015-05-23 09:20:16 +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	a4ba40952a	for #250, rename rtmp to protocol dir.	2015-01-23 10:07:20 +08:00
winlin	5f194bc87c	merge from feilong, the crash for cosumer wait.	2015-01-19 14:05:59 +08:00
winlin	a402ca7120	refine code, the consumer always alive longer than queue recv thread.	2015-01-07 14:31:42 +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	2317f0e767	refine	2014-10-02 20:25:36 +08:00
zhengfl	bafdd83122	last	2014-10-02 19:51:01 +08:00
zhengfl	1e34d2a5cd	client connection no disconnect	2014-10-02 19:45:04 +08:00
winlin	10297fab51	fix #257, support 0.1s+ latency. 2.0.70	2014-12-12 21:51:06 +08:00
winlin	f9b9a60de7	for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60	2014-12-05 23:03:52 +08:00
winlin	4c1d5c0d1e	refine the log for mw and mr. 2.0.55	2014-12-05 11:31:06 +08:00
winlin	fad6074a25	set send socket buf. mw/mr sleep default to 350.	2014-12-05 11:24:05 +08:00
winlin	98647d6e67	limit the user-space buffer size to 128KB, 128MB for 1k publishers.	2014-12-04 22:00:09 +08:00
winlin	76af04c55d	refine the recv buffer for mr.	2014-12-04 21:50:23 +08:00
winlin	f1192a8302	fix bug for bug #241, default to 32k for socket buffer.	2014-12-04 18:35:50 +08:00
winlin	5589b13d2e	for bug #241, support mr(merged-read) config and reload. 2.0.52.	2014-12-04 18:21:04 +08:00
winlin	a23b5b9a4b	for bug#241, simplify the buffer, donot change its size.	2014-12-04 15:43:37 +08:00
winlin	4b09531e2f	for bug #241, simplify the merged read config macros.	2014-12-04 15:33:17 +08:00
winlin	60bc9c2aa0	add performance header to control options for performance. 2.0.50	2014-12-04 13:43:55 +08:00
winlin	315f981821	refine for bug #241, increase the small bytes for merged read.	2014-12-04 09:10:57 +08:00
winlin	5791ed59fd	for bug #241, refine the socket max buffer.	2014-12-03 23:05:42 +08:00
winlin	4785f882d4	for bug #241, refine the max buffer and kbps.	2014-12-03 22:51:19 +08:00
winlin	850946bb13	for bug #241, calc the small and sleep for merged read.	2014-12-03 22:39:25 +08:00
winlin	aee00877df	for bug #241, change buffer size when chunk size changed.	2014-12-03 21:46:47 +08:00
winlin	f35ec2155b	for bug #241, support merged read. 2.0.48	2014-12-03 19:27:27 +08:00
winlin	c457364321	for bug #237, add name for thread. 2.0.47	2014-12-03 14:05:15 +08:00
winlin	787ab674e3	fix #244, conn thread use cond to wait for recv thread error. 2.0.47.	2014-12-03 12:08:29 +08:00
winlin	565f29ed6c	Revert "for bug #241, merge big chunks for publish, no use." ... This reverts commit 6b57597718.	2014-12-02 22:26:20 +08:00
winlin	6b57597718	for bug #241, merge big chunks for publish, no use.	2014-12-02 22:26:04 +08:00
winlin	463e1fbc41	for bug #237, refine the thread loop for publish thread. 2.0.47	2014-12-02 19:28:36 +08:00
winlin	e9712cc627	refine recv thread, donot set auto response for publish recv thread. 2.0.46	2014-12-02 17:16:20 +08:00
winlin	757cffbabf	for bug #237, when recv thread failed, quit the cycle. 2.0.44	2014-12-02 15:21:08 +08:00
winlin	472b1742a2	for bug #237, use isolate thread to recv message. 2.0.41	2014-12-01 23:38:51 +08:00
winlin	0e7836868c	for bug #235, refine the queue recv thread.	2014-12-01 22:53:03 +08:00
winlin	0b631ee80d	for bug #235, pass timeout to recv thread.	2014-12-01 22:45:45 +08:00
winlin	31eb9bf1c1	for bug #237, extract a queue recv thread.	2014-12-01 22:39:22 +08:00
winlin	22524f390a	rename the recv thread to queue recv thread for bug #237.	2014-12-01 22:23:05 +08:00
winlin	3d97048c3a	fix bug #217, add reuse conn to play different player.	2014-11-22 19:15:40 +08:00
winlin	3e81e6e0f1	refine code for bug #217, use recv thread to set the timeout.	2014-11-22 18:08:45 +08:00
winlin	58136ec178	fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30.	2014-11-22 17:58:02 +08:00