diff --git a/README.md b/README.md index 87ccdbacc..6159a5205 100755 --- a/README.md +++ b/README.md @@ -29,15 +29,7 @@ bash scripts/build.sh
 bash scripts/run.sh
 
-step 2: srs live show: [http://demo.srs.com/players](http://demo.srs.com/players)
-requires client add server ip to hosts.
-
-# edit the folowing file:
-# linux: /etc/hosts
-# windows: C:\Windows\System32\drivers\etc\hosts
-# where server ip is 192.168.2.111
-192.168.2.111 demo.srs.com
-
+step 2: srs live show: [http://your-server-ip](http://your-server-ip)
step 3: stop srs demo
 bash scripts/stop.sh
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html
index c9a7f082c..9fab6b2ca 100755
--- a/trunk/research/players/srs_player.html
+++ b/trunk/research/players/srs_player.html
@@ -317,7 +317,7 @@
                 
                 
- http://demo.srs.com/live/livestream.m3u8
+ http://demo.srs.com/live/livestream.m3u8
对用户的流进行HLS切片(若编码为非H264/AAC,HLS流会自动禁用)。
@@ -343,7 +343,7 @@
@@ -369,7 +369,7 @@
@@ -395,7 +395,7 @@
- http://demo.srs.com/forward/live/livestream.m3u8
+ http://demo.srs.com/forward/live/livestream.m3u8
对转发原始流进行HLS切片(若编码为非H264/AAC,HLS流会自动禁用)。
@@ -421,7 +421,7 @@
- http://demo.srs.com/forward/live/livestream_ld.m3u8
+ http://demo.srs.com/forward/live/livestream_ld.m3u8
对转发转码配置LD流进行HLS切片,所有转发的流会自动支持HLS。
@@ -447,7 +447,7 @@
- http://demo.srs.com/forward/live/livestream_sd.m3u8
+ http://demo.srs.com/forward/live/livestream_sd.m3u8
对转发转码配置SD流进行HLS切片,所有转发的流会自动支持HLS。
diff --git a/trunk/scripts/_step.start.ffmpeg.demo.sh b/trunk/scripts/_step.start.ffmpeg.demo.sh index bdfb8fd1a..fccd28f14 100755 --- a/trunk/scripts/_step.start.ffmpeg.demo.sh +++ b/trunk/scripts/_step.start.ffmpeg.demo.sh @@ -2,10 +2,10 @@ src_dir='src' if [[ ! -d $src_dir ]]; then echo "错误:必须在src同目录执行脚本"; exit 1; fi -cmd="nohup bash ./scripts/ffmpeg.demo.sh >./objs/logs/ffmpeg-demo.log 2>&1 &" +cmd="nohup bash ./scripts/_ffmpeg.demo.sh >./objs/logs/ffmpeg-demo.log 2>&1 &" echo "启动FFMPEG推送demo流(播放器上12路演示):$cmd" -pids=`ps aux|grep scripts|grep "/ffmpeg.demo.sh"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程:$pid"; kill -s SIGKILL $pid; done -nohup bash ./scripts/ffmpeg.demo.sh >./objs/logs/ffmpeg-demo.log 2>&1 & +pids=`ps aux|grep scripts|grep "/_ffmpeg.demo.sh"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程:$pid"; kill -s SIGKILL $pid; done +nohup bash ./scripts/_ffmpeg.demo.sh >./objs/logs/ffmpeg-demo.log 2>&1 & ret=$?; if [[ 0 -ne $ret ]]; then echo "错误:启动FFMPEG推送demo流(播放器上12路演示)失败"; exit $ret; fi echo "启动FFMPEG推送demo流(播放器上12路演示)成功" diff --git a/trunk/scripts/_step.start.ffmpeg.players.sh b/trunk/scripts/_step.start.ffmpeg.players.sh index c5c6ac695..4b4fa1e63 100755 --- a/trunk/scripts/_step.start.ffmpeg.players.sh +++ b/trunk/scripts/_step.start.ffmpeg.players.sh @@ -2,10 +2,10 @@ src_dir='src' if [[ ! -d $src_dir ]]; then echo "错误:必须在src同目录执行脚本"; exit 1; fi -cmd="nohup bash scripts/ffmpeg.players.sh >./objs/logs/ffmpeg-players.log 2>&1 &" +cmd="nohup bash ./scripts/_ffmpeg.players.sh >./objs/logs/ffmpeg-players.log 2>&1 &" echo "启动FFMPEG推送players流(播放器上演示用):$cmd" -pids=`ps aux|grep scripts|grep "/ffmpeg.players.sh"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程:$pid"; kill -s SIGKILL $pid; done -nohup bash scripts/ffmpeg.players.sh >./objs/logs/ffmpeg-players.log 2>&1 & +pids=`ps aux|grep scripts|grep "/_ffmpeg.players.sh"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程:$pid"; kill -s SIGKILL $pid; done +nohup bash ./scripts/_ffmpeg.players.sh >./objs/logs/ffmpeg-players.log 2>&1 & ret=$?; if [[ 0 -ne $ret ]]; then echo "错误:启动FFMPEG推送players流(播放器上演示用)失败"; exit $ret; fi echo "启动FFMPEG推送players流(播放器上演示用)成功" diff --git a/trunk/scripts/dev.sh b/trunk/scripts/dev.sh index 6ca46cd35..eb803e81a 100755 --- a/trunk/scripts/dev.sh +++ b/trunk/scripts/dev.sh @@ -2,6 +2,12 @@ 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" + # step 1: build srs #bash scripts/_step.build.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $ret; fi @@ -24,7 +30,13 @@ bash scripts/_step.start.api.server.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $ #bash scripts/_step.start.ffmpeg.players.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $ret; fi # step 8: add server ip to client hosts as demo. -cat<