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
2015-03-17 22:06:59 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ab673e1300dff9baf7a15746f05db9a44387eba3
ab673e13
1 parent
a28c051c
for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
隐藏空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
24 行增加
和
22 行删除
README.md
trunk/etc/init.d/srs-api
trunk/etc/init.d/srs-demo
trunk/etc/init.d/srs-demo-19350
trunk/scripts/run.sh
trunk/src/core/srs_core.hpp
README.md
查看文件 @
ab673e1
...
...
@@ -566,6 +566,7 @@ Supported operating systems and hardware:
### SRS 2.0 history
*
v2.0, 2015-03-17, for
[
#155
](
https://github.com/winlinvip/simple-rtmp-server/issues/155
)
, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
*
v2.0, 2015-03-15, start
[
2.0release branch
](
https://github.com/winlinvip/simple-rtmp-server/tree/2.0release
)
, 80773 lines.
*
v2.0, 2015-03-14, fix
[
#324
](
https://github.com/winlinvip/simple-rtmp-server/issues/324
)
, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.
*
v2.0, 2015-03-14, for
[
#324
](
https://github.com/winlinvip/simple-rtmp-server/issues/324
)
, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.
...
...
trunk/etc/init.d/srs-api
查看文件 @
ab673e1
...
...
@@ -19,11 +19,11 @@ CONFIG="8085"
########################################################################
# utility functions
########################################################################
RED
=
"
\\
e[31m"
GREEN
=
"
\\
e[32m"
YELLOW
=
"
\\
e[33m"
BLACK
=
"
\\
e[0m"
POS
=
"
\\
e[60G"
RED
=
"
\\
033[31m"
GREEN
=
"
\\
033[32m"
YELLOW
=
"
\\
033[33m"
BLACK
=
"
\\
033[0m"
POS
=
"
\\
033[60G"
ok_msg
(){
echo
-e
"
${
1
}${
POS
}${
BLACK
}
[
${
GREEN
}
OK
${
BLACK
}
]"
...
...
trunk/etc/init.d/srs-demo
查看文件 @
ab673e1
...
...
@@ -21,11 +21,11 @@ DEFAULT_LOG_FILE='./objs/srs.demo.log'
########################################################################
# utility functions
########################################################################
RED
=
"
\\
e[31m"
GREEN
=
"
\\
e[32m"
YELLOW
=
"
\\
e[33m"
BLACK
=
"
\\
e[0m"
POS
=
"
\\
e[60G"
RED
=
"
\\
033[31m"
GREEN
=
"
\\
033[32m"
YELLOW
=
"
\\
033[33m"
BLACK
=
"
\\
033[0m"
POS
=
"
\\
033[60G"
ok_msg
()
{
echo
-e
"
${
1
}${
POS
}${
BLACK
}
[
${
GREEN
}
OK
${
BLACK
}
]"
...
...
trunk/etc/init.d/srs-demo-19350
查看文件 @
ab673e1
...
...
@@ -21,11 +21,11 @@ DEFAULT_LOG_FILE='./objs/srs.demo.19350.log'
########################################################################
# utility functions
########################################################################
RED
=
"
\\
e[31m"
GREEN
=
"
\\
e[32m"
YELLOW
=
"
\\
e[33m"
BLACK
=
"
\\
e[0m"
POS
=
"
\\
e[60G"
RED
=
"
\\
033[31m"
GREEN
=
"
\\
033[32m"
YELLOW
=
"
\\
033[33m"
BLACK
=
"
\\
033[0m"
POS
=
"
\\
033[60G"
ok_msg
()
{
echo
-e
"
${
1
}${
POS
}${
BLACK
}
[
${
GREEN
}
OK
${
BLACK
}
]"
...
...
trunk/scripts/run.sh
查看文件 @
ab673e1
...
...
@@ -3,10 +3,10 @@ src_dir='src'
if
[[
! -d
$src_dir
]]
;
then
echo
"错误:必须在src同目录执行脚本"
;
exit
1;
fi
# linux shell color support.
RED
=
"
\\
e[31m"
GREEN
=
"
\\
e[32m"
YELLOW
=
"
\\
e[33m"
BLACK
=
"
\\
e[0m"
RED
=
"
\\
033[31m"
GREEN
=
"
\\
033[32m"
YELLOW
=
"
\\
033[33m"
BLACK
=
"
\\
033[0m"
./etc/init.d/srs-demo restart;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
echo
"错误:启动SRS失败"
;
exit
$ret
;
fi
echo
"启动SRS服务器成功"
...
...
@@ -32,7 +32,8 @@ cat<<END
http://$ip:$port/players/srs_bwt.html?key=35c9b402c12a7246868752e2878f7e0e&vhost=bandcheck.srs.com
END
if
[[
`
getenforce
`
!
=
'Disabled'
]]
;
then
which getenforce >/dev/null 2>&1
if
[[
0 -eq
$?
&&
`
getenforce
`
!
=
'Disabled'
]]
;
then
echo
-e
"
${
RED
}
请关闭selinux:
${
BLACK
}
"
;
echo
-e
"
${
RED
}
打开配置文件:sudo vi /etc/sysconfig/selinux
${
BLACK
}
"
;
echo
-e
"
${
RED
}
修改为:SELINUX=disabled
${
BLACK
}
"
;
...
...
trunk/src/core/srs_core.hpp
查看文件 @
ab673e1
...
...
@@ -31,11 +31,11 @@ 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 14
2
#define VERSION_REVISION 14
3
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_CODE "
OuXuli
"
#define RTMP_SIG_SRS_CODE "
ZhouGuowen
"
#define RTMP_SIG_SRS_ROLE "origin/edge server"
#define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)"
#define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"
...
...
请
注册
或
登录
后发表评论