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

fix bug of hls and rename demo player stream to live/demo. change to 0.9.36

This commit is contained in:
winlin 2014-03-26 18:13:33 +08:00
parent ea3561de08
commit 4c8d6d2eb1
8 changed files with 25 additions and 13 deletions

View file

@ -2,6 +2,6 @@
for((;;)); do \
./objs/ffmpeg/bin/ffmpeg -re -i ./doc/source.200kbps.768x320.flv \
-vcodec copy -acodec copy \
-f flv -y rtmp://127.0.0.1/live?vhost=players/livestream; \
-f flv -y rtmp://127.0.0.1/live?vhost=players/demo; \
sleep 1; \
done

View file

@ -2,10 +2,10 @@
src_dir='src'
if [[ ! -d $src_dir ]]; then echo "错误必须在src同目录执行脚本"; exit 1; fi
cmd="nohup ./objs/srs -c conf/demo.19350.conf > ./objs/demo.19350.log 2>&1 &"
cmd="./objs/srs -c conf/demo.19350.conf"
echo "启动SRS转发服务器$cmd"
pids=`ps aux|grep srs|grep "./objs"|grep "demo.19350.conf"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程:$pid"; kill -s SIGKILL $pid; done
nohup ./objs/srs -c conf/demo.19350.conf > ./objs/demo.19350.log 2>&1 &
./objs/srs -c conf/demo.19350.conf
ret=$?; if [[ 0 -ne $ret ]]; then echo "错误启动SRS转发服务器失败"; exit $ret; fi
echo "启动SRS转发服务器成功"

View file

@ -2,10 +2,10 @@
src_dir='src'
if [[ ! -d $src_dir ]]; then echo "错误必须在src同目录执行脚本"; exit 1; fi
cmd="nohup ./objs/srs -c conf/demo.conf >./objs/demo.log 2>&1 &"
cmd="./objs/srs -c conf/demo.conf"
echo "启动SRS服务器$cmd"
pids=`ps aux|grep srs|grep "./objs"|grep "demo.conf"|awk '{print $2}'`; for pid in $pids; do echo "结束现有进程:$pid"; kill -s SIGKILL $pid; done
nohup ./objs/srs -c conf/demo.conf >./objs/demo.log 2>&1 &
./objs/srs -c conf/demo.conf
ret=$?; if [[ 0 -ne $ret ]]; then echo "错误启动SRS失败"; exit $ret; fi
echo "启动SRS服务器成功"