胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
ab673e13 1 parent a28c051c

for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.

内嵌 并排对比
正在显示 6 个修改的文件 包含 24 行增加 和 22 行删除
@@ -566,6 +566,7 @@ Supported operating systems and hardware: @@ -566,6 +566,7 @@ Supported operating systems and hardware:
566 566
567 ### SRS 2.0 history 567 ### SRS 2.0 history
568 568
  569 +* 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.
569 * v2.0, 2015-03-15, start [2.0release branch](https://github.com/winlinvip/simple-rtmp-server/tree/2.0release), 80773 lines. 570 * v2.0, 2015-03-15, start [2.0release branch](https://github.com/winlinvip/simple-rtmp-server/tree/2.0release), 80773 lines.
570 * 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. 571 * 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.
571 * 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. 572 * 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.
@@ -19,11 +19,11 @@ CONFIG="8085" @@ -19,11 +19,11 @@ CONFIG="8085"
19 ######################################################################## 19 ########################################################################
20 # utility functions 20 # utility functions
21 ######################################################################## 21 ########################################################################
22 -RED="\\e[31m"  
23 -GREEN="\\e[32m"  
24 -YELLOW="\\e[33m"  
25 -BLACK="\\e[0m"  
26 -POS="\\e[60G" 22 +RED="\\033[31m"
  23 +GREEN="\\033[32m"
  24 +YELLOW="\\033[33m"
  25 +BLACK="\\033[0m"
  26 +POS="\\033[60G"
27 27
28 ok_msg(){ 28 ok_msg(){
29 echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]" 29 echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]"
@@ -21,11 +21,11 @@ DEFAULT_LOG_FILE='./objs/srs.demo.log' @@ -21,11 +21,11 @@ DEFAULT_LOG_FILE='./objs/srs.demo.log'
21 ######################################################################## 21 ########################################################################
22 # utility functions 22 # utility functions
23 ######################################################################## 23 ########################################################################
24 -RED="\\e[31m"  
25 -GREEN="\\e[32m"  
26 -YELLOW="\\e[33m"  
27 -BLACK="\\e[0m"  
28 -POS="\\e[60G" 24 +RED="\\033[31m"
  25 +GREEN="\\033[32m"
  26 +YELLOW="\\033[33m"
  27 +BLACK="\\033[0m"
  28 +POS="\\033[60G"
29 29
30 ok_msg() { 30 ok_msg() {
31 echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]" 31 echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]"
@@ -21,11 +21,11 @@ DEFAULT_LOG_FILE='./objs/srs.demo.19350.log' @@ -21,11 +21,11 @@ DEFAULT_LOG_FILE='./objs/srs.demo.19350.log'
21 ######################################################################## 21 ########################################################################
22 # utility functions 22 # utility functions
23 ######################################################################## 23 ########################################################################
24 -RED="\\e[31m"  
25 -GREEN="\\e[32m"  
26 -YELLOW="\\e[33m"  
27 -BLACK="\\e[0m"  
28 -POS="\\e[60G" 24 +RED="\\033[31m"
  25 +GREEN="\\033[32m"
  26 +YELLOW="\\033[33m"
  27 +BLACK="\\033[0m"
  28 +POS="\\033[60G"
29 29
30 ok_msg() { 30 ok_msg() {
31 echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]" 31 echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]"
@@ -3,10 +3,10 @@ src_dir='src' @@ -3,10 +3,10 @@ src_dir='src'
3 if [[ ! -d $src_dir ]]; then echo "错误：必须在src同目录执行脚本"; exit 1; fi 3 if [[ ! -d $src_dir ]]; then echo "错误：必须在src同目录执行脚本"; exit 1; fi
4 4
5 # linux shell color support. 5 # linux shell color support.
6 -RED="\\e[31m"  
7 -GREEN="\\e[32m"  
8 -YELLOW="\\e[33m"  
9 -BLACK="\\e[0m" 6 +RED="\\033[31m"
  7 +GREEN="\\033[32m"
  8 +YELLOW="\\033[33m"
  9 +BLACK="\\033[0m"
10 10
11 ./etc/init.d/srs-demo restart; ret=$?; if [[ 0 -ne $ret ]]; then echo "错误：启动SRS失败"; exit $ret; fi 11 ./etc/init.d/srs-demo restart; ret=$?; if [[ 0 -ne $ret ]]; then echo "错误：启动SRS失败"; exit $ret; fi
12 echo "启动SRS服务器成功" 12 echo "启动SRS服务器成功"
@@ -32,7 +32,8 @@ cat<<END @@ -32,7 +32,8 @@ cat<<END
32 http://$ip:$port/players/srs_bwt.html?key=35c9b402c12a7246868752e2878f7e0e&vhost=bandcheck.srs.com 32 http://$ip:$port/players/srs_bwt.html?key=35c9b402c12a7246868752e2878f7e0e&vhost=bandcheck.srs.com
33 END 33 END
34 34
35 -if [[ `getenforce` != 'Disabled' ]]; then 35 +which getenforce >/dev/null 2>&1
  36 +if [[ 0 -eq $? && `getenforce` != 'Disabled' ]]; then
36 echo -e "${RED}请关闭selinux：${BLACK}"; 37 echo -e "${RED}请关闭selinux：${BLACK}";
37 echo -e "${RED} 打开配置文件：sudo vi /etc/sysconfig/selinux${BLACK}"; 38 echo -e "${RED} 打开配置文件：sudo vi /etc/sysconfig/selinux${BLACK}";
38 echo -e "${RED} 修改为：SELINUX=disabled${BLACK}"; 39 echo -e "${RED} 修改为：SELINUX=disabled${BLACK}";
@@ -31,11 +31,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,11 +31,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 2 32 #define VERSION_MAJOR 2
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 142 34 +#define VERSION_REVISION 143
35 35
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"
38 -#define RTMP_SIG_SRS_CODE "OuXuli" 38 +#define RTMP_SIG_SRS_CODE "ZhouGuowen"
39 #define RTMP_SIG_SRS_ROLE "origin/edge server" 39 #define RTMP_SIG_SRS_ROLE "origin/edge server"
40 #define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)" 40 #define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)"
41 #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server" 41 #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"