2266 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	9bda56cb42	update readme for bug #239	2014-12-02 15:39:32 +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	ba3e7c28da	Merge pull request #239 from tufang14/1.0release ... token traverse bug, tranverse token then response the connect request.	2014-12-02 15:24:00 +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	212a9aa78c	for bug #237, refine syscall for recv, supports 1.5k clients. 2.0.41.	2014-12-02 12:18:33 +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	43309379d4	Merge branch '1.0release'	2014-11-28 10:52:26 +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