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

update readme

This commit is contained in:
winlin 2014-01-05 15:58:17 +08:00
parent 1e84bdcb29
commit 47dfdd3ae2
4 changed files with 36 additions and 7 deletions

View file

@ -22,6 +22,9 @@ And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --<br
people who have submitted patches, reported bugs, added translations, helped<br/> people who have submitted patches, reported bugs, added translations, helped<br/>
answer newbie questions, and generally made SRS that much better: [AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt) 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) ### Usage(simple)
<strong>Requires: Centos6/Ubuntu12 64bits, others see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Build)</strong><br/> <strong>Requires: Centos6/Ubuntu12 64bits, others see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Build)</strong><br/>
<strong>Step -1:</strong> get SRS<br/> <strong>Step -1:</strong> get SRS<br/>

View file

@ -259,10 +259,6 @@ if [ $SRS_HLS = YES ]; then
ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players && ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players &&
rm -f ${SRS_OBJS}/nginx/crossdomain.xml && rm -f ${SRS_OBJS}/nginx/crossdomain.xml &&
ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/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 fi
if [ $SRS_HLS = YES ]; then 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 && rm -f research/api-server/static-dir/crossdomain.xml &&
ln -sf `pwd`/research/players/crossdomain.xml 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<<END >> ${SRS_OBJS}/nginx/html/index.html
<!DOCTYPE html>
<html>
<head>
<title>SRS</title>
<meta charset="utf-8">
</head>
<body>
<script type="text/javascript">
setTimeout(function(){
window.location.href = "players/index.html" + window.location.search;
}, 3000);
</script>
</body>
END
fi
fi
##################################################################################### #####################################################################################
# openssl, for rtmp complex handshake # openssl, for rtmp complex handshake
##################################################################################### #####################################################################################

4
trunk/auto/options.sh Normal file → Executable file
View file

@ -54,13 +54,15 @@ cat << END
--with-ssl enable rtmp complex handshake, requires openssl-devel installed. --with-ssl enable rtmp complex handshake, requires openssl-devel installed.
to delivery h264 video and aac audio to flash player. 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. --with-http enable http hooks, build cherrypy as demo api server.
srs will call the http hooks, such as: on_connect. 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-ssl disable rtmp complex handshake.
--without-hls disable hls, rtmp streaming only. --without-hls disable hls, rtmp streaming only.
--without-http disable http, http hooks callback. --without-http disable http, http hooks callback.
--without-ffmpeg disable the ffmpeg transcoding feature.
END END

5
trunk/configure vendored
View file

@ -158,7 +158,7 @@ echo "configure summary:"
if [ $SRS_HLS = YES ]; then if [ $SRS_HLS = YES ]; then
echo -e "${GREEN}HLS over nginx is enabled${BLACK}" echo -e "${GREEN}HLS over nginx is enabled${BLACK}"
else else
echo -e "warning: without HLS support" echo -e "${YELLOW}warning: without HLS support${BLACK}"
fi fi
if [ $SRS_SSL = YES ]; then if [ $SRS_SSL = YES ]; then
echo -e "${GREEN}rtmp complex handshake is enabled${BLACK}" echo -e "${GREEN}rtmp complex handshake is enabled${BLACK}"
@ -179,6 +179,7 @@ fi
# mkdir dirs # mkdir dirs
mkdir -p ${SRS_OBJS}/logs 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. # next step.
echo "" echo ""
echo "you can:" 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" echo "\" make help \" to get the usage of make"
if [ $SRS_HLS = YES ]; then if [ $SRS_HLS = YES ]; then
echo "\" sudo ./objs/nginx/sbin/nginx \" to start the nginx http server for hls" 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 fi
if [ $SRS_FFMPEG = YES ]; then if [ $SRS_FFMPEG = YES ]; then
echo -e "\" ./objs/ffmpeg/bin/ffmpeg \" is used for live stream transcoding" echo -e "\" ./objs/ffmpeg/bin/ffmpeg \" is used for live stream transcoding"