diff --git a/README.md b/README.md
index 6f67e4d69..08b2917c8 100755
--- a/README.md
+++ b/README.md
@@ -59,22 +59,28 @@ step 8: play live stream.
rtmp url: rtmp://demo:1935/live/livestream m3u8 url: http://demo:80/live/livestream.m3u8 +for android: http://demo:80/live/livestream.htmlstep 9: play live stream auto transcoded
rtmp url: rtmp://demo:1935/live/livestream_ld m3u8 url: http://demo:80/live/livestream_ld.m3u8 +for android: http://demo:80/live/livestream_ld.html rtmp url: rtmp://demo:1935/live/livestream_sd m3u8 url: http://demo:80/live/livestream_sd.m3u8 +for android: http://demo:80/live/livestream_sd.htmlstep 10: play live stream auto forwarded, the hls dir change to /forward
rtmp url: rtmp://demo:19350/live/livestream m3u8 url: http://demo:80/forward/live/livestream.m3u8 +for android: http://demo:80/forward/live/livestream.html rtmp url: rtmp://demo:19350/live/livestream_ld m3u8 url: http://demo:80/forward/live/livestream_ld.m3u8 +for android: http://demo:80/forward/live/livestream_ld.html rtmp url: rtmp://demo:19350/live/livestream_sd m3u8 url: http://demo:80/forward/live/livestream_sd.m3u8 +for android: http://demo:80/forward/live/livestream_sd.html### Architecture diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 1024bdea7..cc873a377 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -3,6 +3,150 @@ # TODO: check gcc/g++ echo "check gcc/g++/gdb/make/openssl-devel" echo "depends tools are ok" +##################################################################################### +# for Ubuntu +##################################################################################### +function Ubuntu_prepare() +{ + uname -v|grep Ubuntu >/dev/null 2>&1 + ret=$?; if [[ 0 -ne $ret ]]; then + return; + fi + + echo "Ubuntu detected, install tools if needed" + + apt-cache show libpcre3; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install libpcre3" + require_sudoer "sudo apt-get install -y libpcre3" + sudo apt-get install -y libpcre3 + echo "install libpcre3 success" + fi + + apt-cache show libpcre3-dev; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install libpcre3-dev" + require_sudoer "sudo apt-get install -y libpcre3-dev" + sudo apt-get install -y libpcre3-dev + echo "install libpcre3-dev success" + fi + + apt-cache show zlib1g-dev; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install zlib1g-dev" + require_sudoer "sudo apt-get install -y zlib1g-dev" + sudo apt-get install -y zlib1g-dev + echo "install zlib1g-dev success" + fi + + apt-cache show libfreetype6-dev; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install libfreetype6-dev" + require_sudoer "sudo apt-get install -y libfreetype6-dev" + sudo apt-get install -y libfreetype6-dev + echo "install libfreetype6-dev success" + fi + + apt-cache show gcc; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install gcc" + require_sudoer "sudo apt-get install -y gcc" + sudo apt-get install -y gcc + echo "install gcc success" + fi + + apt-cache show g++; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install g++" + require_sudoer "sudo apt-get install -y g++" + sudo apt-get install -y g++ + echo "install g++ success" + fi + + apt-cache show make; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install make" + require_sudoer "sudo apt-get install -y make" + sudo apt-get install -y make + echo "install make success" + fi + + apt-cache show autoconf; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install autoconf" + require_sudoer "sudo apt-get install -y autoconf" + sudo apt-get install -y autoconf + echo "install autoconf success" + fi + + apt-cache show libtool; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install libtool" + require_sudoer "sudo apt-get install -y libtool" + sudo apt-get install -y libtool + echo "install libtool success" + fi + + apt-cache show libssl-dev; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install libssl-dev" + require_sudoer "sudo apt-get install -y libssl-dev" + sudo apt-get install -y libssl-dev + echo "install libssl-dev success" + fi +} +Ubuntu_prepare +##################################################################################### +# for Centos +##################################################################################### +function Centos_prepare() +{ + if [[ ! -f /etc/redhat-release ]]; then + return; + fi + + echo "Centos detected, install tools if needed" + + gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install gcc" + require_sudoer "sudo yum install -y gcc" + sudo yum install -y gcc + echo "install gcc success" + fi + + g++ --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install gcc-c++" + require_sudoer "sudo yum install -y gcc-c++" + sudo yum install -y gcc-c++ + echo "install gcc-c++ success" + fi + + make --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install make" + require_sudoer "sudo yum install -y make" + sudo yum install -y make + echo "install make success" + fi + + automake --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install automake" + require_sudoer "sudo yum install -y automake" + sudo yum install -y automake + echo "install automake success" + fi + + autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install autoconf" + require_sudoer "sudo yum install -y autoconf" + sudo yum install -y autoconf + echo "install autoconf success" + fi + + libtool --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then + echo "install libtool" + require_sudoer "sudo yum install -y libtool" + sudo yum install -y libtool + echo "install libtool success" + fi + + if [[ ! -d /usr/include/openssl ]]; then + echo "install openssl-devel" + require_sudoer "sudo yum install -y openssl-devel" + sudo yum install -y openssl-devel + echo "install openssl-devels success" + fi +} +Centos_prepare ##################################################################################### # st-1.9 @@ -48,6 +192,16 @@ fi ##################################################################################### # nginx for HLS, nginx-1.5.0 ##################################################################################### +function write_nginx_html5() +{ + cat<