external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

remove jwplayer and osmf

Browse source
This commit is contained in:
winlin 2016-03-19 22:09:36 +08:00
parent d9f1ced732
commit d7a28059ed
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
trunk/research/players/js/srs.page.js
View file

@ -3,7 +3,7 @@
////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////
// to query the swf anti cache. // 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. * player specified size.
@ -56,7 +56,7 @@ function build_default_rtmp_url() {
var schema = (query.schema == undefined)? "rtmp":query.schema; var schema = (query.schema == undefined)? "rtmp":query.schema;
var server = (query.server == undefined)? window.location.hostname:query.server; 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 vhost = (query.vhost == undefined)? window.location.hostname:query.vhost;
var app = (query.app == undefined)? "live":query.app; var app = (query.app == undefined)? "live":query.app;
var stream = (query.stream == undefined)? "demo":query.stream; 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 schema = (query.schema == undefined)? "rtmp":query.schema;
var server = (query.server == undefined)? window.location.hostname:query.server; 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 vhost = (query.vhost == undefined)? window.location.hostname:query.vhost;
var app = (query.app == undefined)? "live":query.app; var app = (query.app == undefined)? "live":query.app;
var stream = (query.stream == undefined)? "demo":query.stream; var stream = (query.stream == undefined)? "demo":query.stream;

4
trunk/research/players/srs_bwt.html
View file

@ -25,8 +25,8 @@
<li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> <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_chat" href="srs_chat.html">SRS会议</a></li>
<li class="active"><a id="nav_srs_bwt" href="srs_bwt.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_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</a></li>-->
<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li> <!--<li><a id="nav_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
<li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
</ul> </ul>
</div> </div>

4
trunk/research/players/srs_chat.html
View file

@ -24,8 +24,8 @@
<li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> <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 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_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</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_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
<li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
</ul> </ul>
</div> </div>

4
trunk/research/players/srs_player.html
View file

@ -35,8 +35,8 @@
<li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> <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_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_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</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_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
<li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
</ul> </ul>
</div> </div>

4
trunk/research/players/srs_publisher.html
View file

@ -21,8 +21,8 @@
<li class="active"><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> <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_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_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</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_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
<li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> <li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
</ul> </ul>
</div> </div>

4
trunk/research/players/vlc.html
View file

@ -21,8 +21,8 @@
<li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li> <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_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_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>
<li><a id="nav_jwplayer6" href="jwplayer6.html">JWPlayer6播放器</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_osmf" href="osmf.html">AdobeOSMF播放器</a></li>-->
<li class="active"><a id="nav_vlc" href="vlc.html">VLC播放器</a></li> <li class="active"><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>
</ul> </ul>
</div> </div>