1721 commits

Author	SHA1	Message	Date
winlin	29324fab46	fix #248, improve about 15% performance for fast buffer. 2.0.49	2014-12-04 13:05:13 +08:00
winlin	8423974e3b	for bug #248, rename SrsBuffer to SrsFastBuffer.	2014-12-04 11:32:32 +08:00
winlin	0ea8cd9e84	for bug #248, use simple buffer for http.	2014-12-04 11:29:47 +08:00
winlin	2cb8b7dd52	for bug #248, use simple buffer for hls.	2014-12-04 11:27:07 +08:00
winlin	315f981821	refine for bug #241, increase the small bytes for merged read.	2014-12-04 09:10:57 +08:00
winlin	d1d6023c70	for bug #241, limit the buffer for input chunk size.	2014-12-03 23:11:13 +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	adf95d239e	refine code, move the ISrsBufferReader to srs_protocol_io	2014-12-03 19:09:59 +08:00
winlin	ea0e837cd6	move the srs_kernel_buffer to srs_protocol_buffer.	2014-12-03 18:56:09 +08:00
winlin	2fdf994350	for bug #241, use heap to alloc the socket buffer.	2014-12-03 14:27:36 +08:00
winlin	6cbf732e1a	for bug #237, thread donot sleep when timeout is 0.	2014-12-03 14:25:02 +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	24a6a723ee	for bug #237, never sleep when thread interval is 0.	2014-12-02 19:22:06 +08:00
winlin	6f963b50f3	refine code, publish recv thread sleep 697ms	2014-12-02 18:19:01 +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	5905e5c050	merge from 1.0release, traverse the token before response connect. 2.0.45.	2014-12-02 15:41:54 +08:00
winlin	24815e4efe	refine code for bug #239	2014-12-02 15:33:22 +08:00
winlin	304208f822	fix #239, traverse the token before response connect. 1.0.10.	2014-12-02 15:27:36 +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
tufang14	3d0d43c5dc	token bug ... 多级origin-edge模式，edge上功能不生效	2014-12-02 14:38:54 +08:00
winlin	b28dc7364e	refine the srs-librtmp, add hijack get the object.	2014-12-02 14:02:28 +08:00
winlin	a94dbecdc4	refine macro of srs-librtmp. 2.0.43	2014-12-02 13:41:41 +08:00
winlin	9387d09f5f	refine the macros for windows of srs-librtmp	2014-12-02 13:38:30 +08:00
winlin	15ae4745f4	add macro to disable log.	2014-12-02 13:21:26 +08:00
winlin	07d55010fe	remove the free bytes api of srs-librtmp. use system default is ok.	2014-12-02 13:03:25 +08:00
winlin	f6032ffe6b	always use system log and context. allow hijack the human print macro.	2014-12-02 12:51:07 +08:00
winlin	3584bdb7b6	srs-librtmp support hijack io apis for st-load. 2.0.42.	2014-12-02 12:19:17 +08:00
winlin	29c6014192	refs #1670: fix the bug for bug #237, use us and ms timeout.	2014-12-02 10:40:21 +08:00
winlin	af83e18d7e	update the README for 1.5k publishers. 2.0.41	2014-12-02 07:27:20 +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	1847c5fef7	ignore the actual length of share key. 2.0.40	2014-12-01 22:09:09 +08:00
winlin	d171a26758	disable gop cache when not h.264. fix some warning.	2014-12-01 21:34:35 +08:00
winlin	c5dd334645	fix the warning of ts_info	2014-12-01 20:54:19 +08:00
winlin	47b4b694be	add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39.	2014-12-01 10:58:17 +08:00
winlin	3e521d317d	update upp dir to srs.	2014-11-30 16:54:57 +08:00
winlin	b4057916b6	add qt project file. fix cmake file for clion.	2014-11-30 16:06:37 +08:00
winlin	efb73c5487	fix #235, refine handshake, replace union with template method. 2.0.38.	2014-11-29 18:41:14 +08:00
winlin	abb0fce3d8	fix bug for utest of message array, it does not free messages now.	2014-11-29 18:36:40 +08:00
winlin	23f4aa5737	for bug #235, fix bug of utest.	2014-11-29 18:33:43 +08:00
winlin	e167c97786	for bug #235, fix the return code bug.	2014-11-29 18:16:15 +08:00
winlin	818000dd18	for bug #235, use constructor and destructor for block and digest.	2014-11-29 18:10:33 +08:00
winlin	b32d3fb6aa	remove the read and write with SrsStream.	2014-11-29 17:58:40 +08:00
winlin	6d49cddc9d	for bug #235, refine code order of c1s1 and c2s2	2014-11-29 17:05:54 +08:00
winlin	646d6f6673	for bug #235, refine schema0 and schema1, extract dup code.	2014-11-29 17:04:24 +08:00
winlin	4b9875e279	for bug #235, use strategy to implements the schema0 and schema1.	2014-11-29 16:17:07 +08:00
winlin	5d883e2e29	for bug #235, move functions of block and digest to struct.	2014-11-29 13:08:43 +08:00
winlin	ff5cdb1cc1	for bug #215, add srs_rtmp_dump tool. 2.0.37.	2014-11-28 12:26:36 +08:00
winlin	0d98dc88bf	Merge branch '1.0release'	2014-11-28 11:09:33 +08:00
winlin	0c132e9781	update the log position.	2014-11-28 10:58:16 +08:00
winlin	127b96b255	add git2unix and git commit script.	2014-11-28 10:42:47 +08:00
winlin	7f121efd7a	merge from allspace srs-librtmp for win vs2010. 2.0.36	2014-11-28 10:33:36 +08:00
winlin	14fca601f9	merge from 1.0 hotfix. 3.0.35	2014-11-27 18:50:54 +08:00
winlin	9c033c7da6	hotfix 1.0, author bug, use error macro. 1.0.9	2014-11-27 18:48:01 +08:00
winlin	03f72fb1a6	for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34	2014-11-27 18:39:02 +08:00
winlin	bb85a0c856	for bug #229, remove the windows vs2010 build files for srs-librtmp build failed on windows.	2014-11-27 18:31:25 +08:00
winlin	eb4e7aad69	try to build srs-librtmp on vs2010, failed.	2014-11-27 18:20:13 +08:00
winlin	904a06cadf	Merge branch '1.0release'	2014-11-27 17:47:23 +08:00
winlin	575e50b6e2	hotfix to add comments on 1.0release	2014-11-27 17:47:13 +08:00
winlin	62b861718f	Revert "remove vs2010 files from master" ... This reverts commit f8a2c22f3a.	2014-11-27 17:02:30 +08:00
winlin	f8a2c22f3a	remove vs2010 files from master	2014-11-27 16:16:04 +08:00
winlin	4c0c3a9ada	refine merged code for allspace.	2014-11-27 15:29:24 +08:00
winlin	468941833c	change srs version to 2.0.33	2014-11-27 15:23:16 +08:00
winlin	18c308248e	refine code by winlin, for merged from allspace.	2014-11-27 15:22:39 +08:00
winlin	1855c9429c	merge from allspace, to srs-librtmp, for vs2010	2014-11-27 14:46:05 +08:00
winlin	bb54194c26	checkout master	2014-11-27 12:53:21 +08:00
winlin	1ce79980b1	checkout master	2014-11-27 12:52:47 +08:00
winlin	c49981ed6f	refine script	2014-11-27 12:51:33 +08:00
winlin	b825ea62f9	refine comments	2014-11-27 12:50:04 +08:00
winlin	8766ab5de2	add git2unix script	2014-11-27 12:45:34 +08:00
winlin	be53b10ed3	refine log position	2014-11-27 08:04:39 +08:00
winlin	e76c53dae8	sleep when git commit failed.	2014-11-27 08:03:21 +08:00
winlin	ff73088091	fix bug of git commit	2014-11-27 08:02:17 +08:00
winlin	93ee15a552	udpate github commit to git commit	2014-11-27 08:00:11 +08:00
winlin	55461e866f	sync tags with csdn and oschina	2014-11-27 07:52:12 +08:00
winlin	131f598ab5	use multiple remote to commit and sync with csdn+oschina.	2014-11-27 07:47:39 +08:00
winlin	6a5f405ba0	add github script	2014-11-27 07:02:54 +08:00
winlin	d91a9dfa9d	udpate the srs_bwt.	2014-11-25 11:10:54 +08:00
winlin	e11fa383ca	udpate the srs_bwt.	2014-11-25 11:09:28 +08:00
winlin	02778dba4c	udpate the srs_bwt.	2014-11-25 11:05:45 +08:00
winlin	a2af051840	udpate the srs_bwt.	2014-11-25 10:59:38 +08:00
winlin	cd0ab5fb43	update PRIMARY, AUTHORS, CONTRIBUTORS rule	2014-11-25 10:50:59 +08:00
winlin	db7af6259a	update PRIMARY, AUTHORS, CONTRIBUTORS rule	2014-11-25 10:50:25 +08:00
winlin	e7ccbce472	update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32.	2014-11-25 10:41:55 +08:00
winlin	d672fae255	update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8	2014-11-25 10:07:41 +08:00
winlin	44962c9142	update PRIMARY, AUTHORS, CONTRIBUTORS rule	2014-11-25 10:06:26 +08:00
winlin	e492fa5353	fix #212, support publish aac adts raw stream. 2.0.31.	2014-11-24 16:28:52 +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