From d7a28059edc0ceed39e5af63c1f766a184d817dd Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 19 Mar 2016 22:09:36 +0800
Subject: [PATCH] remove jwplayer and osmf

---
 trunk/research/players/js/srs.page.js     | 6 +++---
 trunk/research/players/srs_bwt.html       | 4 ++--
 trunk/research/players/srs_chat.html      | 4 ++--
 trunk/research/players/srs_player.html    | 4 ++--
 trunk/research/players/srs_publisher.html | 4 ++--
 trunk/research/players/vlc.html           | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
index 179b65099..04dd2366b 100755
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -3,7 +3,7 @@
 //////////////////////////////////////////////////////////////////////////////////
 
 // to query the swf anti cache.
-function srs_get_version_code() { return "1.28"; }
+function srs_get_version_code() { return "1.29"; }
 
 /**
 * player specified size.
@@ -56,7 +56,7 @@ function build_default_rtmp_url() {
 
     var schema = (query.schema == undefined)? "rtmp":query.schema;
     var server = (query.server == undefined)? window.location.hostname:query.server;
-    var port = (query.port == undefined)? 1935:query.port;
+    var port = (query.port == undefined)? schema=="http"?80:1935:query.port;
     var vhost = (query.vhost == undefined)? window.location.hostname:query.vhost;
     var app = (query.app == undefined)? "live":query.app;
     var stream = (query.stream == undefined)? "demo":query.stream;
@@ -82,7 +82,7 @@ function build_default_publish_rtmp_url() {
 
     var schema = (query.schema == undefined)? "rtmp":query.schema;
     var server = (query.server == undefined)? window.location.hostname:query.server;
-    var port = (query.port == undefined)? 1935:query.port;
+    var port = (query.port == undefined)? schema=="http"?80:1935:query.port;
     var vhost = (query.vhost == undefined)? window.location.hostname:query.vhost;
     var app = (query.app == undefined)? "live":query.app;
     var stream = (query.stream == undefined)? "demo":query.stream;
diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html
index 01e2b113e..75b9b7b74 100644
--- a/trunk/research/players/srs_bwt.html
+++ b/trunk/research/players/srs_bwt.html
@@ -25,8 +25,8 @@
                     <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
                     <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
                     <li class="active"><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
-                    <li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>
-                    <li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>
+                    <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>-->
+                    <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
                     <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
                 </ul>
             </div>
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index ea862aec6..99c3a9608 100644
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -24,8 +24,8 @@
                     <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
                     <li class="active"><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
                     <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
-                    <li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>
-                    <li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>
+                    <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>-->
+                    <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
                     <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
                 </ul>
             </div>
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html
index 7e07c6732..b2225eca1 100755
--- a/trunk/research/players/srs_player.html
+++ b/trunk/research/players/srs_player.html
@@ -35,8 +35,8 @@
                     <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
                     <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
                     <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
-                    <li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>
-                    <li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>
+                    <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>-->
+                    <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
                     <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
                 </ul>
             </div>
diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html
index 52757987b..a83b40267 100644
--- a/trunk/research/players/srs_publisher.html
+++ b/trunk/research/players/srs_publisher.html
@@ -21,8 +21,8 @@
                     <li class="active"><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
                     <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
                     <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
-                    <li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>
-                    <li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>
+                    <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>-->
+                    <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
                     <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
                 </ul>
             </div>
diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html
index dba724c56..2e4356a70 100644
--- a/trunk/research/players/vlc.html
+++ b/trunk/research/players/vlc.html
@@ -21,8 +21,8 @@
                     <li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>
                     <li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>
                     <li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
-                    <li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>
-                    <li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>
+                    <!--<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>-->
+                    <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
                     <li class="active"><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
                 </ul>
             </div>