add ingest feature to readme

winlin
Commit e80abac4f00fbf3f330e760489d6c79aa45d8407 e80abac4 1 parent d1f15650
README.md
trunk/auto/options.sh
--- a/README.md
查看文件 @e80abac
+++ b/README.md
查看文件 @e80abac
@@ -44,7 +44,7 @@ use [nginx](http://nginx.org/), [ffmpeg](http://ffmpeg.org/) and [cherrypy](http
 minimum run. see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Build).
 SRS supports [vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/RtmpUrlVhost), 
-rtmp([encoder push](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryRTMP), client/edge pull), ingester(srs pull), 
+rtmp([encoder push](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryRTMP), client/edge pull), [ingester(srs pull)](https://github.com/winlinvip/simple-rtmp-server/wiki/Ingest), 
 [HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS), [HLS audio only](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS#hlsaudioonly), [transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), 
 [forward](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback).
--- a/trunk/auto/options.sh
查看文件 @e80abac
+++ b/trunk/auto/options.sh
查看文件 @e80abac
@@ -18,6 +18,7 @@ SRS_NGINX=RESERVED
 SRS_SSL=RESERVED
 SRS_FFMPEG=RESERVED
 SRS_TRANSCODE=RESERVED
+SRS_INGEST=RESERVED
 SRS_HTTP_PARSER=RESERVED
 SRS_HTTP_CALLBACK=RESERVED
 SRS_HTTP_SERVER=RESERVED
@@ -77,6 +78,7 @@ do
         --with-nginx)                   SRS_NGINX=YES               ;;
         --with-ffmpeg)                  SRS_FFMPEG=YES              ;;
         --with-transcode)               SRS_TRANSCODE=YES           ;;
+        --with-ingest)                  SRS_INGEST=YES              ;;
         --with-http-callback)           SRS_HTTP_CALLBACK=YES       ;;
         --with-http-server)             SRS_HTTP_SERVER=YES         ;;
         --with-http-api)                SRS_HTTP_API=YES            ;;
@@ -96,6 +98,7 @@ do
         --without-nginx)                SRS_NGINX=NO                ;;
         --without-ffmpeg)               SRS_FFMPEG=NO               ;;
         --without-transcode)            SRS_TRANSCODE=NO            ;;
+        --without-ingest)               SRS_INGEST=NO               ;;
         --without-http-callback)        SRS_HTTP_CALLBACK=NO        ;;
         --without-http-server)          SRS_HTTP_SERVER=NO          ;;
         --without-http-api)             SRS_HTTP_API=NO             ;;
@@ -135,6 +138,7 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then
     if [ $SRS_SSL = RESERVED ]; then SRS_SSL=YES; fi
     if [ $SRS_FFMPEG = RESERVED ]; then SRS_FFMPEG=NO; fi
     if [ $SRS_TRANSCODE = RESERVED ]; then SRS_TRANSCODE=NO; fi
+    if [ $SRS_INGEST = RESERVED ]; then SRS_INGEST=NO; fi
     if [ $SRS_HTTP_CALLBACK = RESERVED ]; then SRS_HTTP_CALLBACK=NO; fi
     if [ $SRS_HTTP_SERVER = RESERVED ]; then SRS_HTTP_SERVER=YES; fi
     if [ $SRS_HTTP_API = RESERVED ]; then SRS_HTTP_API=YES; fi
@@ -158,6 +162,7 @@ else
     if [ $SRS_SSL = RESERVED ]; then SRS_SSL=YES; fi
     if [ $SRS_FFMPEG = RESERVED ]; then SRS_FFMPEG=NO; fi
     if [ $SRS_TRANSCODE = RESERVED ]; then SRS_TRANSCODE=NO; fi
+    if [ $SRS_INGEST = RESERVED ]; then SRS_INGEST=NO; fi
     if [ $SRS_HTTP_CALLBACK = RESERVED ]; then SRS_HTTP_CALLBACK=NO; fi
     if [ $SRS_HTTP_SERVER = RESERVED ]; then SRS_HTTP_SERVER=YES; fi
     if [ $SRS_HTTP_API = RESERVED ]; then SRS_HTTP_API=YES; fi
@@ -183,6 +188,7 @@ if [ $SRS_DEV = YES ]; then
     SRS_SSL=YES
     SRS_FFMPEG=YES
     SRS_TRANSCODE=YES
+    SRS_INGEST=YES
     SRS_HTTP_CALLBACK=YES
     SRS_HTTP_SERVER=YES
     SRS_HTTP_API=YES
@@ -207,6 +213,7 @@ if [ $SRS_PI = YES ]; then
     SRS_SSL=YES
     if [ $SRS_FFMPEG = RESERVED ]; then SRS_FFMPEG=NO; fi
     if [ $SRS_TRANSCODE = RESERVED ]; then SRS_TRANSCODE=NO; fi
+    if [ $SRS_INGEST = RESERVED ]; then SRS_INGEST=NO; fi
     SRS_HTTP_CALLBACK=NO
     SRS_HTTP_SERVER=YES
     SRS_HTTP_API=YES
@@ -231,6 +238,7 @@ if [ $SRS_HTTP_API = YES ]; then SRS_HTTP_PARSER=YES; fi
 # if transcode specified, try ffmpeg if possible.
 if [ $SRS_TRANSCODE = YES ]; then if [ $SRS_FFMPEG = RESERVED ]; then SRS_FFMPEG=YES; fi fi
+if [ $SRS_INGEST = YES ]; then if [ $SRS_FFMPEG = RESERVED ]; then SRS_FFMPEG=YES; fi fi
 # parse the jobs for make
 if [[ "" -eq SRS_JOBS ]]; then 
@@ -262,6 +270,8 @@ if [ $help = yes ]; then
                             build ffmpeg at: ./objs/ffmpeg/bin/ffmpeg
   --with-transcode          enable transcoding features.
                             user must specifies the transcode tools in conf.
+  --with-ingest             enable ingest features.
+                            user must specifies the ingest tools in conf.
   --with-librtmp            enable srs-librtmp, library for client.
   --with-bwtc               enable SRS bandwidth test client tool.
   --with-research           build the research tools.
@@ -281,6 +291,7 @@ if [ $help = yes ]; then
   --without-http-api        disable http api, only use console to manage SRS process.
   --without-ffmpeg          disable the ffmpeg transcode tool feature.
   --without-transcode       disable the transcoding feature.
+  --without-ingest          disable the ingest feature.
   --without-librtmp         disable srs-librtmp, library for client.
   --without-bwtc            disable SRS bandwidth test client tool.
   --without-research        do not build the research tools.
@@ -377,6 +388,7 @@ if [ $SRS_NGINX = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-nginx"; els
 if [ $SRS_SSL = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-ssl"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-ssl"; fi
 if [ $SRS_FFMPEG = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-ffmpeg"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-ffmpeg"; fi
 if [ $SRS_TRANSCODE = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-transcode"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-transcode"; fi
+if [ $SRS_INGEST = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-ingest"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-ingest"; fi
 if [ $SRS_HTTP_CALLBACK = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-http-callback"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-http-callback"; fi
 if [ $SRS_HTTP_SERVER = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-http-server"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-http-server"; fi
 if [ $SRS_HTTP_API = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-http-api"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-http-api"; fi