external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

update demo script, remove ffmpeg publish. use ingest instead

Browse source
This commit is contained in:
winlin 2014-04-07 14:33:27 +08:00
parent 4f445f2f60
commit 3d073f9ef6
3 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
trunk/conf/demo.conf
View file

@ -112,6 +112,18 @@ vhost demo.srs.com {
output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
}
}
ingest {
enable on;
input {
type file;
url ./doc/source.200kbps.768x320.flv;
}
ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine {
enable off;
output rtmp://127.0.0.1:[port]/live?vhost=[vhost]/livestream;
}
}
}
vhost players {
@ -145,6 +157,18 @@ vhost players {
output rtmp://127.0.0.1:[port]/[app]?vhost=players_pub/[stream];
}
}
ingest {
enable on;
input {
type file;
url ./doc/source.200kbps.768x320.flv;
}
ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine {
enable off;
output rtmp://127.0.0.1:[port]/live?vhost=[vhost]/demo;
}
}
}
vhost players_pub {

4
trunk/scripts/run.sh
View file

@ -25,10 +25,10 @@ bash scripts/_step.start.srs.19350.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $r
bash scripts/_step.start.api.server.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $ret; fi
# step 6: publish demo live stream
bash scripts/_step.start.ffmpeg.demo.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $ret; fi
#bash scripts/_step.start.ffmpeg.demo.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $ret; fi
# step 7: publish players live stream
bash scripts/_step.start.ffmpeg.players.sh; ret=$?; if [[ 0 -ne $ret ]]; then exit $ret; fi
#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.
ip=`ifconfig|grep "inet"|grep "addr"|grep "Mask"|grep -v "127.0.0.1"|awk 'NR==1 {print $2}'|awk -F ':' '{print $2}'`

12
trunk/scripts/stop.sh
View file

@ -22,13 +22,13 @@ ps aux|grep python|grep research|grep "api-server"
pids=`ps aux|grep python|grep research|grep "api-server"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程：$pid"; kill -s SIGKILL $pid; done
# step 6: publish demo live stream
echo "停止FFMPEG推送demo流(播放器上12路演示)"
ps aux|grep scripts|grep "ffmpeg.demo.sh"
pids=`ps aux|grep scripts|grep "/_ffmpeg.demo.sh"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程：$pid"; kill -s SIGKILL $pid; done
#echo "停止FFMPEG推送demo流(播放器上12路演示)"
#ps aux|grep scripts|grep "ffmpeg.demo.sh"
#pids=`ps aux|grep scripts|grep "/_ffmpeg.demo.sh"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程：$pid"; kill -s SIGKILL $pid; done
# step 7: publish players live stream
echo "停止FFMPEG推送players流(播放器上演示用)"
ps aux|grep scripts|grep "ffmpeg.players.sh"
pids=`ps aux|grep scripts|grep "/_ffmpeg.players.sh"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程：$pid"; kill -s SIGKILL $pid; done
#echo "停止FFMPEG推送players流(播放器上演示用)"
#ps aux|grep scripts|grep "ffmpeg.players.sh"
#pids=`ps aux|grep scripts|grep "/_ffmpeg.players.sh"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程：$pid"; kill -s SIGKILL $pid; done
echo "SRS系统服务均已停止"