diff --git a/README.md b/README.md index 454290ade..b0bb23c7d 100755 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ srs is a simple, high-performance, running in single process, origin live server srs supports vhost, rtmp, HLS, transcoding, forward, http hooks.
blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin)
see also: [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server)
-see also: [http://winlinvip.github.io/simple-rtmp-server](http://winlinvip.github.io/simple-rtmp-server) -TencentQQ: http://url.cn/WAHICw (Group: 212189142) +see also: [http://winlinvip.github.io/simple-rtmp-server](http://winlinvip.github.io/simple-rtmp-server)
+TencentQQ: [http://url.cn/WAHICw](http://url.cn/WAHICw) (Group: 212189142) ### Contributors winlin([winterserver](#)): [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin)
@@ -253,7 +253,8 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw ### Releases -* 2013-12-08, [release v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8), support http hooks callback, update st-load. 19186 lines.
+* 2013-12-25, [release v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9), support bandwidth test, add player/encoder/chat demos. 20926 lines.
+* 2013-12-08, [release v0.8](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.8), support http hooks callback, update [st_load](https://github.com/winlinvip/st-load). 19186 lines.
* 2013-12-03, [release v0.7](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.7), support live stream transcoding. 17605 lines.
* 2013-11-29, [release v0.6](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.6), support forward stream to origin/edge. 16094 lines.
* 2013-11-26, [release v0.5](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.5), support HLS(m3u8), fragment and window. 14449 lines.
@@ -264,6 +265,7 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw * 2013-10-17, created.
### Compare +* srs v0.9: 20926 lines. player/encoder/chat demos. bandwidth test for encoder/CDN.
* srs v0.8: 19186 lines. implements http hooks refer to [nginx-rtmp](https://github.com/arut/nginx-rtmp-module).
* srs v0.7: 17605 lines. implements transcoding(FFMPEG) feature refer to [wowza](http://www.wowza.com).
* srs v0.6: 16094 lines. important feature forward for CDN.
@@ -276,6 +278,8 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw * nginx v1.5.0: 139524 lines
### History +* v0.9, 2013-12-25, [v0.9](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.9) released. 20926 lines. +* v0.9, 2013-12-25, fix the bitrate bug(in Bps), use enhanced microphone. * v0.9, 2013-12-22, demo video meeting or chat(srs+cherrypy+jquery+bootstrap). * v0.9, 2013-12-22, merge from wenjie, support banwidth test. * v0.9, 2013-12-22, merge from wenjie: support set chunk size at vhost level diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index dded4bba3..4926a0699 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -261,11 +261,8 @@ if [ $SRS_HLS = YES ]; then ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml # override the default index. - cat < ${SRS_OBJS}/nginx/html/index.html - -END + 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 @@ -300,6 +297,12 @@ else echo "#undef SRS_HTTP" >> $SRS_AUTO_HEADERS_H fi +echo "link players to cherrypy static-dir" +rm -f research/api-server/static-dir/players && +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 + ##################################################################################### # openssl, for rtmp complex handshake ##################################################################################### diff --git a/trunk/research/api-server/server.py b/trunk/research/api-server/server.py index 5e860145f..01b7bf929 100755 --- a/trunk/research/api-server/server.py +++ b/trunk/research/api-server/server.py @@ -343,7 +343,7 @@ class RESTChats(object): self.__chat_lock = threading.Lock(); # dead time in seconds, if exceed, remove the chat. - self.__dead_time = 30; + self.__dead_time = 15; def GET(self): enable_crossdomain() @@ -474,7 +474,8 @@ if len(sys.argv) <= 1: # parse port from user options. port = int(sys.argv[1]) -trace("api server listen at port: %s"%(port)) +static_dir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "static-dir")) +trace("api server listen at port: %s, static_dir: %s"%(port, static_dir)) # cherrypy config. conf = { @@ -483,9 +484,12 @@ conf = { 'server.socket_host': '0.0.0.0', 'server.socket_port': port, 'tools.encode.on': True, + 'tools.staticdir.on': True, 'tools.encode.encoding': "utf-8" }, '/': { + 'tools.staticdir.dir': static_dir, + 'tools.staticdir.index': "index.html", # for cherrypy RESTful api support 'request.dispatch': cherrypy.dispatch.MethodDispatcher() } diff --git a/trunk/research/api-server/static-dir/index.html b/trunk/research/api-server/static-dir/index.html new file mode 100755 index 000000000..7607685aa --- /dev/null +++ b/trunk/research/api-server/static-dir/index.html @@ -0,0 +1,50 @@ + + + + SRS + + + + + + + + + + + +
+
+ +
+ diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html index cbffc8852..ee2b2687c 100755 --- a/trunk/research/players/index.html +++ b/trunk/research/players/index.html @@ -7,7 +7,8 @@ - + + - + + + + + +