胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
b628b5e7 1 parent 4c325261

fix bug of dar and fs size.

内嵌 并排对比
正在显示 1 个修改的文件 包含 10 行增加 和 6 行删除
@@ -127,12 +127,16 @@ @@ -127,12 +127,16 @@
127 // start the normal player with HLS supported. 127 // start the normal player with HLS supported.
128 remote_player = new SrsPlayer("remote_player", 430, 185); 128 remote_player = new SrsPlayer("remote_player", 430, 185);
129 remote_player.on_player_ready = function() { 129 remote_player.on_player_ready = function() {
  130 + remote_player.set_bt(0.8);
  131 + remote_player.set_fs("screen", 100);
130 }; 132 };
131 remote_player.start(); 133 remote_player.start();
132 134
133 // start the realtime player. 135 // start the realtime player.
134 realtime_player = new SrsPlayer("realtime_player", 430, 185); 136 realtime_player = new SrsPlayer("realtime_player", 430, 185);
135 realtime_player.on_player_ready = function() { 137 realtime_player.on_player_ready = function() {
  138 + realtime_player.set_bt(0.8);
  139 + realtime_player.set_fs("screen", 100);
136 }; 140 };
137 realtime_player.start(); 141 realtime_player.start();
138 }); 142 });
@@ -408,11 +412,11 @@ @@ -408,11 +412,11 @@
408 <div class="span6"> 412 <div class="span6">
409 <div class="accordion-group"> 413 <div class="accordion-group">
410 <div class="accordion-heading"> 414 <div class="accordion-heading">
411 - <span class="accordion-toggle" data-toggle="collapse" href="#collapseOne"> 415 + <span class="accordion-toggle" data-toggle="collapse" href="#collapse1">
412 <strong>本地摄像头</strong> 416 <strong>本地摄像头</strong>
413 </span> 417 </span>
414 </div> 418 </div>
415 - <div id="collapseOne" class="accordion-body collapse in"> 419 + <div id="collapse1" class="accordion-body collapse in">
416 <div class="accordion-inner"> 420 <div class="accordion-inner">
417 <div id="local_publisher"></div> 421 <div id="local_publisher"></div>
418 </div> 422 </div>
@@ -422,14 +426,14 @@ @@ -422,14 +426,14 @@
422 <div class="span6"> 426 <div class="span6">
423 <div class="accordion-group"> 427 <div class="accordion-group">
424 <div class="accordion-heading"> 428 <div class="accordion-heading">
425 - <span class="accordion-toggle" data-toggle="collapse" href="#collapseTwo"> 429 + <span class="accordion-toggle" data-toggle="collapse" href="#collapse2">
426 <strong>远程服务器</strong> 430 <strong>远程服务器</strong>
427 <a id="remote_tips" href="#" data-toggle="tooltip" data-placement="top" title=""> 431 <a id="remote_tips" href="#" data-toggle="tooltip" data-placement="top" title="">
428 黑屏<img src="img/tooltip.png"/> 432 黑屏<img src="img/tooltip.png"/>
429 </a> 433 </a>
430 </span> 434 </span>
431 </div> 435 </div>
432 - <div id="collapseTwo" class="accordion-body collapse in"> 436 + <div id="collapse2" class="accordion-body collapse in">
433 <div class="accordion-inner"> 437 <div class="accordion-inner">
434 <div id="remote_player"></div> 438 <div id="remote_player"></div>
435 </div> 439 </div>
@@ -443,14 +447,14 @@ @@ -443,14 +447,14 @@
443 <div class="span6"> 447 <div class="span6">
444 <div class="accordion-group"> 448 <div class="accordion-group">
445 <div class="accordion-heading"> 449 <div class="accordion-heading">
446 - <span class="accordion-toggle" data-toggle="collapse" href="#collapseOne"> 450 + <span class="accordion-toggle" data-toggle="collapse" href="#collapse3">
447 <strong>远程服务器</strong> 451 <strong>远程服务器</strong>
448 <a id="low_latecy_tips" href="#" data-toggle="tooltip" data-placement="top" title=""> 452 <a id="low_latecy_tips" href="#" data-toggle="tooltip" data-placement="top" title="">
449 低延时<img src="img/tooltip.png"/> 453 低延时<img src="img/tooltip.png"/>
450 </a> 454 </a>
451 </span> 455 </span>
452 </div> 456 </div>
453 - <div id="collapseOne" class="accordion-body collapse in"> 457 + <div id="collapse3" class="accordion-body collapse in">
454 <div class="accordion-inner"> 458 <div class="accordion-inner">
455 <div id="realtime_player"></div> 459 <div id="realtime_player"></div>
456 </div> 460 </div>