external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity
2053 commits 13 branches 107 tags 375 MiB
Commit graph

2053 commits

This branch
This branch
All branches
Author SHA1 Message Date
winlin
050e51ea9b Merge branch 'srs.master' 2014-11-14 11:25:42 +08:00
winlin
47ed9e33dd refine code for bug #194, use send messages for all msg array. 2014-11-14 11:24:49 +08:00
winlin
94df80dc39 Merge branch 'srs.master' 2014-11-13 17:31:51 +08:00
winlin
f11272e3ce add comments for bug #194, #196 2014-11-13 17:29:56 +08:00
winlin
bc597ddb58 Merge branch 'srs.master' 2014-11-13 17:04:51 +08:00
winlin
38a683192a fix typo 2014-11-13 17:04:13 +08:00
winlin
8a60b3f8f3 Merge branch 'srs.master' 2014-11-13 16:58:16 +08:00
winlin
f2f02b06d5 for bug #194, refine code, to 2.0.17 2014-11-13 16:56:59 +08:00
winlin
8845bb7caf for bug #194, refine code, remove the old duplicated code. 2014-11-13 16:56:41 +08:00
winlin
ebbb4f6be5 Merge branch 'srs.master' 2014-11-13 14:55:28 +08:00
winlin
1f5c82ecc4 update readme 2014-11-13 14:54:40 +08:00
winlin
abd891fab3 Merge branch 'srs.master' 2014-11-13 14:39:14 +08:00
winlin
62719c2b12 for bug #200, fix the writev for librtmp, add comments. 2014-11-13 14:38:23 +08:00
winlin
e5c504b465 Merge branch 'srs.master' 2014-11-13 14:31:19 +08:00
winlin
0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 2014-11-13 14:30:56 +08:00
winlin
93e5d87463 Merge branch 'srs.master' 2014-11-13 13:50:45 +08:00
winlin
77cf885d8c add comments for #161 2014-11-13 13:49:50 +08:00
winlin
3084ec49de Merge branch 'srs.master' 2014-11-13 12:46:44 +08:00
winlin
4af2e78c59 refine code for bug #194, add comments to macros. 2014-11-13 12:45:54 +08:00
winlin
7c2576e518 Merge branch 'srs.master' 2014-11-13 12:27:13 +08:00
winlin
cc6aca9ad5 fix #194, writev multiple msgs, support 6k+ 250kbps clients. 2.0.15. 2014-11-13 12:25:56 +08:00
winlin
bee313e924 Merge branch 'srs.master' 2014-11-12 18:42:11 +08:00
winlin
7cf855f242 for bug #199, refine the header generate 2014-11-12 18:41:24 +08:00
winlin
7f6583a097 Merge branch 'srs.master' 2014-11-12 18:19:47 +08:00
winlin
953159258c refine code, rename the c0c3 header cache and iov cache. 2014-11-12 18:19:09 +08:00
winlin
a1a6292a05 Merge branch 'srs.master' 2014-11-12 18:00:35 +08:00
winlin
ab93506b01 for bug #199, refine the api of send message. 2014-11-12 17:59:32 +08:00
winlin
cac2980654 Merge branch 'srs.master' 2014-11-12 13:48:03 +08:00
winlin
55580ca900 add comments about bug #197 2014-11-12 13:47:04 +08:00
winlin
d257360e96 add comments about bug #196 2014-11-12 13:46:21 +08:00
winlin
9d5b92ae57 Merge branch 'srs.master' 2014-11-12 13:00:29 +08:00
winlin
8acd143a7a fix #194: refine the timeout recv, pulse to 500ms. 2.0.14. 2014-11-12 12:59:53 +08:00
winlin
4dd4161e99 Merge branch 'srs.master' 2014-11-12 10:28:17 +08:00
winlin
a6f3478a74 for bug #194, remove the poll, it's no-use 2014-11-12 10:26:48 +08:00
winlin
9021fea643 Merge branch 'srs.master' 2014-11-12 10:07:21 +08:00
winlin
bc1b5f4bbf for bug #194, disable the srs fd poll. 2014-11-12 10:05:42 +08:00
winlin
570e99a2dc Merge branch 'srs.master' 2014-11-11 18:58:53 +08:00
winlin
4f21e92ae0 fix the message of config for max_connections. 2014-11-11 18:49:27 +08:00
winlin
21f16f3a83 for bug #194, use play fd poll to improve performance, it works. 2014-11-11 18:46:35 +08:00
winlin
164f632b62 for bug #194, add fds poll, just sleep to send without recv. 2014-11-11 18:35:46 +08:00
winlin
133cc62b51 for bug #194, use play fd poll, create the singleton poll 2014-11-11 17:54:02 +08:00
winlin
dc4de3491c Merge branch 'srs.master' 2014-11-11 17:20:35 +08:00
winlin
efc85ed6df refine config, check the connections more precise 2014-11-11 17:19:56 +08:00
winlin
de5e2d0a40 Revert "Revert "for bug #194, refine the config"" 
This reverts commit b4c1d55311.
 2014-11-11 17:12:45 +08:00
winlin
c3d98fd720 Merge branch 'srs.master' 2014-11-11 17:06:49 +08:00
winlin
b4c1d55311 Revert "for bug #194, refine the config" 
This reverts commit 2a55ae4317.
 2014-11-11 17:05:36 +08:00
winlin
e87eacd499 Revert "add srs pipe for bug #194" 
This reverts commit f9756ea14c.
 2014-11-11 17:05:25 +08:00
winlin
73abb1a31d Revert "for bug #194, add pipe to consumer." 
This reverts commit 1e601a6efc.
 2014-11-11 17:04:56 +08:00
winlin
306f75b267 Revert "for bug#194, open pipe for each connection." 
This reverts commit ade81bb244.
 2014-11-11 17:04:32 +08:00
winlin
0e2c8da2a2 Merge branch 'srs.master' 2014-11-11 17:02:40 +08:00