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-11-12 13:48:03 +0800
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
cac2980654f1c57bde0a547c9e8d45a2d77abb14
cac29806
2 parents
9d5b92ae
55580ca9
Merge branch 'srs.master'
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
4 行增加
和
2 行删除
trunk/auto/depends.sh
trunk/src/app/srs_app_rtmp_conn.cpp
trunk/auto/depends.sh
查看文件 @
cac2980
...
...
@@ -227,6 +227,8 @@ fi
if
[
$SRS_EXPORT_LIBRTMP_PROJECT
=
NO
]
;
then
# check the arm flag file, if flag changed, need to rebuild the st.
_ST_MAKE
=
linux-debug
# memory leak for linux-optimized
# @see: https://github.com/winlinvip/simple-rtmp-server/issues/197
if
[
$SRS_EMBEDED_CPU
=
YES
]
;
then
# ok, arm specified, if the flag filed does not exists, need to rebuild.
if
[[
-f
${
SRS_OBJS
}
/_flag.st.arm.tmp
&&
-f
${
SRS_OBJS
}
/st/libst.a
]]
;
then
...
...
trunk/src/app/srs_app_rtmp_conn.cpp
查看文件 @
cac2980
...
...
@@ -528,8 +528,8 @@ int SrsRtmpConn::playing(SrsSource* source)
// collect elapse for pithy print.
pithy_print
.
elapse
();
// read message when no data to send.
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/194
// to use isolate thread to recv, can improve about 5% performance.
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/196
// read from client.
if
(
true
)
{
SrsMessage
*
msg
=
NULL
;
...
...
请
注册
或
登录
后发表评论