正在显示
3 个修改的文件
包含
8 行增加
和
2 行删除
| @@ -158,7 +158,7 @@ function srs_get_player_width() { return srs_get_player_modal() - 30; } | @@ -158,7 +158,7 @@ function srs_get_player_width() { return srs_get_player_modal() - 30; } | ||
| 158 | function srs_get_player_height() { return srs_get_player_width() * 9 / 19; } | 158 | function srs_get_player_height() { return srs_get_player_width() * 9 / 19; } |
| 159 | 159 | ||
| 160 | // to query the swf anti cache. | 160 | // to query the swf anti cache. |
| 161 | -function srs_get_version_code() { return "1.3"; } | 161 | +function srs_get_version_code() { return "1.5"; } |
| 162 | // get the default vhost for players. | 162 | // get the default vhost for players. |
| 163 | function srs_get_player_vhost() { return "players"; } | 163 | function srs_get_player_vhost() { return "players"; } |
| 164 | // get the stream published to vhost, | 164 | // get the stream published to vhost, |
| @@ -516,7 +516,6 @@ | @@ -516,7 +516,6 @@ | ||
| 516 | </div> | 516 | </div> |
| 517 | </div> | 517 | </div> |
| 518 | </div> | 518 | </div> |
| 519 | - <hr> | ||
| 520 | <footer> | 519 | <footer> |
| 521 | <p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team © 2013</a></p> | 520 | <p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team © 2013</a></p> |
| 522 | </footer> | 521 | </footer> |
| @@ -30,6 +30,10 @@ | @@ -30,6 +30,10 @@ | ||
| 30 | $("#audio_modal").modal({show:true}); | 30 | $("#audio_modal").modal({show:true}); |
| 31 | }); | 31 | }); |
| 32 | 32 | ||
| 33 | + $("#remote_tips").tooltip({ | ||
| 34 | + title: "为了支持HLS输出,FLASH编码器输出的流需要经过转码(VP6=>H264,MP3=>aac),所以会黑屏较长时间,请耐心等待" | ||
| 35 | + }); | ||
| 36 | + | ||
| 33 | $("#btn_publish").click(on_user_publish); | 37 | $("#btn_publish").click(on_user_publish); |
| 34 | 38 | ||
| 35 | // for publish, we use randome stream name. | 39 | // for publish, we use randome stream name. |
| @@ -405,6 +409,9 @@ | @@ -405,6 +409,9 @@ | ||
| 405 | <div class="accordion-heading"> | 409 | <div class="accordion-heading"> |
| 406 | <span class="accordion-toggle" data-toggle="collapse" href="#collapseTwo"> | 410 | <span class="accordion-toggle" data-toggle="collapse" href="#collapseTwo"> |
| 407 | <strong>远程服务器</strong> | 411 | <strong>远程服务器</strong> |
| 412 | + <a id="remote_tips" href="#" data-toggle="tooltip" data-placement="top" title=""> | ||
| 413 | + 黑屏<img src="img/tooltip.png"/> | ||
| 414 | + </a> | ||
| 408 | </span> | 415 | </span> |
| 409 | </div> | 416 | </div> |
| 410 | <div id="collapseTwo" class="accordion-body collapse in"> | 417 | <div id="collapseTwo" class="accordion-body collapse in"> |
-
请 注册 或 登录 后发表评论