Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-12-07 16:31:47 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
1311b6fe6576fd7b9c6d299b0f8f2e8d202f4bf8
1311b6fe
1 parent
55d98fce
fix #251, support 10k clients. 2.0.67
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
6 行增加
和
6 行删除
trunk/conf/full.conf
trunk/src/core/srs_core.hpp
trunk/src/core/srs_core_performance.hpp
trunk/conf/full.conf
查看文件 @
1311b6f
...
...
@@ -165,8 +165,8 @@ vhost mrw.srs.com {
# SRS always set mw on, so we just set the latency value.
# the latency of stream >= mw_latency + mr_latency
# the value recomment is [300, 1800]
# default: 350
mw_latency
350
;
# default: 450
mw_latency
450
;
}
# vhost for edge, edge and origin is the same vhost
...
...
trunk/src/core/srs_core.hpp
查看文件 @
1311b6f
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 6
6
#define VERSION_REVISION 6
7
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server"
...
...
trunk/src/core/srs_core_performance.hpp
查看文件 @
1311b6f
...
...
@@ -95,7 +95,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* 2000 150 300
*/
// the default config of mw.
#define SRS_PERF_MW_SLEEP
3
50
#define SRS_PERF_MW_SLEEP
4
50
/**
* use iovs cache in each msg,
* for the shared ptr message, we calc once and used for every copy.
...
...
@@ -138,7 +138,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* whether enable the fast vector for qeueue.
* @see https://github.com/winlinvip/simple-rtmp-server/issues/251
*/
#
undef
SRS_PERF_QUEUE_FAST_VECTOR
#
define
SRS_PERF_QUEUE_FAST_VECTOR
#if defined(SRS_PERF_QUEUE_FAST_CACHE) && defined(SRS_PERF_QUEUE_FAST_VECTOR)
#error "fast cache conflict with fast vector"
#endif
...
...
@@ -147,7 +147,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* @remark this improve performance for large connectios.
* @see https://github.com/winlinvip/simple-rtmp-server/issues/251
*/
#
undef
SRS_PERF_QUEUE_COND_WAIT
#
define
SRS_PERF_QUEUE_COND_WAIT
#ifdef SRS_PERF_QUEUE_COND_WAIT
#define SRS_PERF_MW_MIN_MSGS 8
#endif
...
...
请
注册
或
登录
后发表评论