FS-7509: add some more bandwidth control features

This commit is contained in:
Anthony Minessale
2015-03-05 10:45:57 -06:00
committed by Michael Jerris
parent 1857da8a54
commit c9cccd519a
6 changed files with 84 additions and 19 deletions

View File

@@ -115,8 +115,7 @@
<span class="sharediv">
<button data-inline="true" id="smallerbtn">Smaller - </button>
<button data-inline="true" id="biggerbtn">Bigger +</button>
<button data-inline="true" id="fullbtn">Full Screen</button>
<button data-inline="true" id="nofullbtn">Exit Full Screen</button>
<button data-inline="true" id="fullbtn">Enter Full Screen</button>
<button data-inline="true" id="vmutebtn">Toggle Video Mute</button>
</span>
@@ -418,6 +417,8 @@ if ($('#devices').is(':visible')) {
</fieldset>
</div><br clear="all"><br>
<label><input id="use_dedenc" type="checkbox" value="foo" > Use Dedicated Remote Encoder</label>
<label><input id="mirror_input" type="checkbox" value="foo" >Scale Remote Video To Match Camera</label>
<br><br>
<center><button data-inline="true" id="refreshbtn">Refresh Device List</button>
<button data-inline="true" id="hidedevices" onclick="$('#devices').hide();$('#showdevices').show()">Save Device Settings</button>

View File

@@ -521,17 +521,6 @@ var is_full = false;
var usrto;
function noop() { return; }
$("#nofullbtn").click(function() {
if (document.webkitFullscreenEnabled) {
document.webkitExitFullscreen();
} else if (document.mozFullScreenEnabled) {
document.mozExitFullScreen();
}
});
function on_full(which)
{
is_full = which;
@@ -558,7 +547,18 @@ $(document).on('webkitfullscreenchange mozfullscreenchange fullscreenchange MSFu
$("#fullbtn").click(function() {
full_screen("fs");
if (!is_full) {
full_screen("fs");
$("#fullbtn").text("Exit Full Screen");
} else {
$("#fullbtn").text("Enter Full Screen");
if (document.webkitFullscreenEnabled) {
document.webkitExitFullscreen();
} else if (document.mozFullScreenEnabled) {
document.mozExitFullScreen();
}
}
// $("#mod1").css("position", "absolute").css("z-index", "2");
@@ -597,7 +597,9 @@ function docall() {
useVideo: check_vid(),
useStereo: $("#use_stereo").is(':checked'),
useCamera: $("#usecamera").find(":selected").val(),
useMic: $("#usemic").find(":selected").val()
useMic: $("#usemic").find(":selected").val(),
dedEnc: $("#use_dedenc").is(':checked'),
mirrorInput: $("#mirror_input").is(':checked')
});
}
@@ -630,7 +632,9 @@ function doshare(on) {
incomingBandwidth: incomingBandwidth,
useCamera: sharedev,
useVideo: true,
screenShare: true
screenShare: true,
dedEnc: $("#use_dedenc").is(':checked'),
mirrorInput: $("#mirror_input").is(':checked')
});
return;
@@ -650,7 +654,9 @@ function doshare(on) {
incomingBandwidth: incomingBandwidth,
videoParams: screen_constraints.video.mandatory,
useVideo: true,
screenShare: true
screenShare: true,
dedEnc: $("#use_dedenc").is(':checked'),
mirrorInput: $("#mirror_input").is(':checked')
});
});
@@ -805,6 +811,40 @@ function init() {
});
});
tmp = $.cookie("verto_demo_dedenc_checked") || "false";
$.cookie("verto_demo_dedenc_checked", tmp, {
expires: 365
});
$("#use_dedenc").prop("checked", tmp === "true").change(function(e) {
tmp = $("#use_dedenc").is(':checked');
if (!tmp && $("#mirror_input").is(':checked')) {
$("#mirror_input").click();
}
$.cookie("verto_demo_dedenc_checked", tmp ? "true" : "false", {
expires: 365
});
});
tmp = $.cookie("verto_demo_mirror_input_checked") || "false";
$.cookie("verto_demo_mirror_input_checked", tmp, {
expires: 365
});
$("#mirror_input").prop("checked", tmp === "true").change(function(e) {
tmp = $("#mirror_input").is(':checked');
if (tmp && !$("#use_dedenc").is(':checked')) {
$("#use_dedenc").click();
}
$.cookie("verto_demo_mirror_input_checked", tmp ? "true" : "false", {
expires: 365
});
});
//
outgoingBandwidth = $.cookie("verto_demo_outgoingBandwidth") || "default";
$.cookie("verto_demo_outgoingBandwidth", outgoingBandwidth, {