正在显示
6 个修改的文件
包含
13 行增加
和
13 行删除
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | ////////////////////////////////////////////////////////////////////////////////// | 3 | ////////////////////////////////////////////////////////////////////////////////// |
| 4 | 4 | ||
| 5 | // to query the swf anti cache. | 5 | // to query the swf anti cache. |
| 6 | -function srs_get_version_code() { return "1.28"; } | 6 | +function srs_get_version_code() { return "1.29"; } |
| 7 | 7 | ||
| 8 | /** | 8 | /** |
| 9 | * player specified size. | 9 | * player specified size. |
| @@ -56,7 +56,7 @@ function build_default_rtmp_url() { | @@ -56,7 +56,7 @@ function build_default_rtmp_url() { | ||
| 56 | 56 | ||
| 57 | var schema = (query.schema == undefined)? "rtmp":query.schema; | 57 | var schema = (query.schema == undefined)? "rtmp":query.schema; |
| 58 | var server = (query.server == undefined)? window.location.hostname:query.server; | 58 | var server = (query.server == undefined)? window.location.hostname:query.server; |
| 59 | - var port = (query.port == undefined)? 1935:query.port; | 59 | + var port = (query.port == undefined)? schema=="http"?80:1935:query.port; |
| 60 | var vhost = (query.vhost == undefined)? window.location.hostname:query.vhost; | 60 | var vhost = (query.vhost == undefined)? window.location.hostname:query.vhost; |
| 61 | var app = (query.app == undefined)? "live":query.app; | 61 | var app = (query.app == undefined)? "live":query.app; |
| 62 | var stream = (query.stream == undefined)? "demo":query.stream; | 62 | var stream = (query.stream == undefined)? "demo":query.stream; |
| @@ -82,7 +82,7 @@ function build_default_publish_rtmp_url() { | @@ -82,7 +82,7 @@ function build_default_publish_rtmp_url() { | ||
| 82 | 82 | ||
| 83 | var schema = (query.schema == undefined)? "rtmp":query.schema; | 83 | var schema = (query.schema == undefined)? "rtmp":query.schema; |
| 84 | var server = (query.server == undefined)? window.location.hostname:query.server; | 84 | var server = (query.server == undefined)? window.location.hostname:query.server; |
| 85 | - var port = (query.port == undefined)? 1935:query.port; | 85 | + var port = (query.port == undefined)? schema=="http"?80:1935:query.port; |
| 86 | var vhost = (query.vhost == undefined)? window.location.hostname:query.vhost; | 86 | var vhost = (query.vhost == undefined)? window.location.hostname:query.vhost; |
| 87 | var app = (query.app == undefined)? "live":query.app; | 87 | var app = (query.app == undefined)? "live":query.app; |
| 88 | var stream = (query.stream == undefined)? "demo":query.stream; | 88 | var stream = (query.stream == undefined)? "demo":query.stream; |
| @@ -25,8 +25,8 @@ | @@ -25,8 +25,8 @@ | ||
| 25 | <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> | 25 | <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> |
| 26 | <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li> | 26 | <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li> |
| 27 | <li class="active"><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li> | 27 | <li class="active"><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li> |
| 28 | - <li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li> | ||
| 29 | - <li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li> | 28 | + <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>--> |
| 29 | + <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>--> | ||
| 30 | <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> | 30 | <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> |
| 31 | </ul> | 31 | </ul> |
| 32 | </div> | 32 | </div> |
| @@ -24,8 +24,8 @@ | @@ -24,8 +24,8 @@ | ||
| 24 | <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> | 24 | <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> |
| 25 | <li class="active"><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li> | 25 | <li class="active"><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li> |
| 26 | <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li> | 26 | <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li> |
| 27 | - <li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li> | ||
| 28 | - <li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li> | 27 | + <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>--> |
| 28 | + <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>--> | ||
| 29 | <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> | 29 | <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> |
| 30 | </ul> | 30 | </ul> |
| 31 | </div> | 31 | </div> |
| @@ -35,8 +35,8 @@ | @@ -35,8 +35,8 @@ | ||
| 35 | <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> | 35 | <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> |
| 36 | <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li> | 36 | <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li> |
| 37 | <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li> | 37 | <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li> |
| 38 | - <li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li> | ||
| 39 | - <li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li> | 38 | + <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>--> |
| 39 | + <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>--> | ||
| 40 | <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> | 40 | <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> |
| 41 | </ul> | 41 | </ul> |
| 42 | </div> | 42 | </div> |
| @@ -21,8 +21,8 @@ | @@ -21,8 +21,8 @@ | ||
| 21 | <li class="active"><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> | 21 | <li class="active"><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> |
| 22 | <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li> | 22 | <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li> |
| 23 | <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li> | 23 | <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li> |
| 24 | - <li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li> | ||
| 25 | - <li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li> | 24 | + <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>--> |
| 25 | + <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>--> | ||
| 26 | <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> | 26 | <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> |
| 27 | </ul> | 27 | </ul> |
| 28 | </div> | 28 | </div> |
| @@ -21,8 +21,8 @@ | @@ -21,8 +21,8 @@ | ||
| 21 | <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> | 21 | <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> |
| 22 | <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li> | 22 | <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li> |
| 23 | <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li> | 23 | <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li> |
| 24 | - <li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li> | ||
| 25 | - <li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li> | 24 | + <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>--> |
| 25 | + <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>--> | ||
| 26 | <li class="active"><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> | 26 | <li class="active"><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> |
| 27 | </ul> | 27 | </ul> |
| 28 | </div> | 28 | </div> |
-
请 注册 或 登录 后发表评论