external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
winlin 2015-03-17 22:06:59 +08:00
parent a28c051c2c
commit ab673e1300
6 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -566,6 +566,7 @@ Supported operating systems and hardware:
### SRS 2.0 history ### 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-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, 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. * 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.

10
trunk/etc/init.d/srs-api
View file

@ -19,11 +19,11 @@ CONFIG="8085"
######################################################################## ########################################################################
# utility functions # utility functions
######################################################################## ########################################################################
RED="\\e[31m" RED="\\033[31m"
GREEN="\\e[32m" GREEN="\\033[32m"
YELLOW="\\e[33m" YELLOW="\\033[33m"
BLACK="\\e[0m" BLACK="\\033[0m"
POS="\\e[60G" POS="\\033[60G"
ok_msg(){ ok_msg(){
echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]" echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]"

10
trunk/etc/init.d/srs-demo
View file

@ -21,11 +21,11 @@ DEFAULT_LOG_FILE='./objs/srs.demo.log'
######################################################################## ########################################################################
# utility functions # utility functions
######################################################################## ########################################################################
RED="\\e[31m" RED="\\033[31m"
GREEN="\\e[32m" GREEN="\\033[32m"
YELLOW="\\e[33m" YELLOW="\\033[33m"
BLACK="\\e[0m" BLACK="\\033[0m"
POS="\\e[60G" POS="\\033[60G"
ok_msg() { ok_msg() {
echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]" echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]"

10
trunk/etc/init.d/srs-demo-19350
View file

@ -21,11 +21,11 @@ DEFAULT_LOG_FILE='./objs/srs.demo.19350.log'
######################################################################## ########################################################################
# utility functions # utility functions
######################################################################## ########################################################################
RED="\\e[31m" RED="\\033[31m"
GREEN="\\e[32m" GREEN="\\033[32m"
YELLOW="\\e[33m" YELLOW="\\033[33m"
BLACK="\\e[0m" BLACK="\\033[0m"
POS="\\e[60G" POS="\\033[60G"
ok_msg() { ok_msg() {
echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]" echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]"

11
trunk/scripts/run.sh
View file

@ -3,10 +3,10 @@ src_dir='src'
if [[ ! -d $src_dir ]]; then echo "错误：必须在src同目录执行脚本"; exit 1; fi if [[ ! -d $src_dir ]]; then echo "错误：必须在src同目录执行脚本"; exit 1; fi
# linux shell color support. # linux shell color support.
RED="\\e[31m" RED="\\033[31m"
GREEN="\\e[32m" GREEN="\\033[32m"
YELLOW="\\e[33m" YELLOW="\\033[33m"
BLACK="\\e[0m" BLACK="\\033[0m"
./etc/init.d/srs-demo restart; ret=$?; if [[ 0 -ne $ret ]]; then echo "错误：启动SRS失败"; exit $ret; fi ./etc/init.d/srs-demo restart; ret=$?; if [[ 0 -ne $ret ]]; then echo "错误：启动SRS失败"; exit $ret; fi
echo "启动SRS服务器成功" echo "启动SRS服务器成功"
@ -32,7 +32,8 @@ cat<<END
http://$ip:$port/players/srs_bwt.html?key=35c9b402c12a7246868752e2878f7e0e&vhost=bandcheck.srs.com http://$ip:$port/players/srs_bwt.html?key=35c9b402c12a7246868752e2878f7e0e&vhost=bandcheck.srs.com
END 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}请关闭selinux：${BLACK}";
echo -e "${RED} 打开配置文件：sudo vi /etc/sysconfig/selinux${BLACK}"; echo -e "${RED} 打开配置文件：sudo vi /etc/sysconfig/selinux${BLACK}";
echo -e "${RED} 修改为：SELINUX=disabled${BLACK}"; echo -e "${RED} 修改为：SELINUX=disabled${BLACK}";

4
trunk/src/core/srs_core.hpp
View file

@ -31,11 +31,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR 2 #define VERSION_MAJOR 2
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 142 #define VERSION_REVISION 143
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #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_ROLE "origin/edge server"
#define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP 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" #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"