From 47dfdd3ae2283965fe5041bf624722ccc9070365 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 5 Jan 2014 15:58:17 +0800 Subject: [PATCH] update readme --- README.md | 3 +++ trunk/auto/depends.sh | 31 +++++++++++++++++++++++++++---- trunk/auto/options.sh | 4 +++- trunk/configure | 5 +++-- 4 files changed, 36 insertions(+), 7 deletions(-) mode change 100644 => 100755 trunk/auto/options.sh diff --git a/README.md b/README.md index d73ae7760..7bb49b8ad 100755 --- a/README.md +++ b/README.md @@ -22,6 +22,9 @@ And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
answer newbie questions, and generally made SRS that much better: [AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt) +### Wiki +[https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki) + ### Usage(simple) Requires: Centos6/Ubuntu12 64bits, others see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Build)
Step -1: get SRS
diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 4926a0699..2f79c99a6 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -259,10 +259,6 @@ if [ $SRS_HLS = YES ]; then ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players && rm -f ${SRS_OBJS}/nginx/crossdomain.xml && ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml - - # override the default index. - rm -f ${SRS_OBJS}/nginx/html/index.html && - ln -sf `pwd`/research/players/nginx_index.html ${SRS_OBJS}/nginx/html/index.html fi if [ $SRS_HLS = YES ]; then @@ -303,6 +299,33 @@ ln -sf `pwd`/research/players research/api-server/static-dir/players && rm -f research/api-server/static-dir/crossdomain.xml && ln -sf `pwd`/research/players/crossdomain.xml research/api-server/static-dir/crossdomain.xml +# only when the nginx is ok, +# if api-server not enalbed, use nginx as demo. +if [ $SRS_HLS = YES ]; then + if [ $SRS_HTTP = YES ]; then + # override the default index. + rm -f ${SRS_OBJS}/nginx/html/index.html && + ln -sf `pwd`/research/players/nginx_index.html ${SRS_OBJS}/nginx/html/index.html + else + rm -f ${SRS_OBJS}/nginx/html/index.html && + cat<> ${SRS_OBJS}/nginx/html/index.html + + + + SRS + + + + + +END + fi +fi + ##################################################################################### # openssl, for rtmp complex handshake ##################################################################################### diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh old mode 100644 new mode 100755 index 4030f47cc..0d4b08a4f --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -54,13 +54,15 @@ cat << END --with-ssl enable rtmp complex handshake, requires openssl-devel installed. to delivery h264 video and aac audio to flash player. + --with-hls enable hls streaming, build nginx as http server for hls. --with-http enable http hooks, build cherrypy as demo api server. srs will call the http hooks, such as: on_connect. - --with-hls enable hls streaming, build nginx as http server for hls. + --with-ffmpeg enable transcoding with ffmpeg. --without-ssl disable rtmp complex handshake. --without-hls disable hls, rtmp streaming only. --without-http disable http, http hooks callback. + --without-ffmpeg disable the ffmpeg transcoding feature. END diff --git a/trunk/configure b/trunk/configure index 5be8cc473..ce7c4d6ae 100755 --- a/trunk/configure +++ b/trunk/configure @@ -158,7 +158,7 @@ echo "configure summary:" if [ $SRS_HLS = YES ]; then echo -e "${GREEN}HLS over nginx is enabled${BLACK}" else - echo -e "warning: without HLS support" + echo -e "${YELLOW}warning: without HLS support${BLACK}" fi if [ $SRS_SSL = YES ]; then echo -e "${GREEN}rtmp complex handshake is enabled${BLACK}" @@ -179,6 +179,7 @@ fi # mkdir dirs mkdir -p ${SRS_OBJS}/logs +ip=`ifconfig|grep "inet addr"| grep -v "127.0.0.1"|awk '{print $2}'|awk -F ':' 'NR==1 {print $2}'` # next step. echo "" echo "you can:" @@ -186,7 +187,7 @@ echo "\" make \" to build the srs(simple rtmp server)." echo "\" make help \" to get the usage of make" if [ $SRS_HLS = YES ]; then echo "\" sudo ./objs/nginx/sbin/nginx \" to start the nginx http server for hls" - echo "\" http://demo:80/players \" rtmp players(OSMF/JWPlayer)" + echo "\" http://$ip \" rtmp players(OSMF/JWPlayer)" fi if [ $SRS_FFMPEG = YES ]; then echo -e "\" ./objs/ffmpeg/bin/ffmpeg \" is used for live stream transcoding"