提交 4bab51e3 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-9242 fix screen share for chrome to work in VC with additional camera

上级 2ea20cca
......@@ -520,8 +520,17 @@
if (obj.options.screenShare) {
// fix for chrome to work for now, will need to change once we figure out how to do this in a non-mandatory style constraint.
var opt = [];
opt.push({sourceId: obj.options.useCamera});
if (bestFrameRate) {
opt.push({minFrameRate: bestFrameRate});
opt.push({maxFrameRate: bestFrameRate});
}
video = {
mandatory: obj.options.videoParams
mandatory: obj.options.videoParams,
optional: opt
};
} else {
......
......@@ -824,9 +824,63 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
},
screenshare: function(destination, callback) {
console.log('share screen video');
var that = this;
var that = this;
if (storage.data.selectedShare !== "screen") {
console.log('share screen from device ' + storage.data.selectedShare);
var call = data.instance.newCall({
destination_number: destination + "-screen",
caller_id_name: data.name + " (Screen)",
caller_id_number: data.login + " (screen)",
outgoingBandwidth: storage.data.outgoingBandwidth,
incomingBandwidth: storage.data.incomingBandwidth,
useCamera: storage.data.selectedShare,
useVideo: true,
screenShare: true,
dedEnc: storage.data.useDedenc,
mirrorInput: storage.data.mirrorInput,
userVariables: {
email : storage.data.email,
avatar: "http://gravatar.com/avatar/" + md5(storage.data.email) + ".png?s=600"
}
});
// Override onStream callback in $.FSRTC instance
call.rtc.options.callbacks.onStream = function(rtc, stream) {
if(stream) {
var StreamTrack = stream.getVideoTracks()[0];
StreamTrack.addEventListener('ended', stopSharing);
// (stream.getVideoTracks()[0]).onended = stopSharing;
}
console.log("screenshare started");
function stopSharing() {
if(that.data.shareCall) {
that.screenshareHangup();
console.log("screenshare ended");
}
}
};
data.shareCall = call;
console.log('shareCall', data);
data.mutedMic = false;
data.mutedVideo = false;
that.refreshDevices();
return;
}
console.log('share screen from plugin');
getScreenId(function(error, sourceId, screen_constraints) {
......@@ -842,7 +896,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
outgoingBandwidth: storage.data.outgoingBandwidth,
incomingBandwidth: storage.data.incomingBandwidth,
videoParams: screen_constraints.video.mandatory,
useVideo: storage.data.useVideo,
useVideo: true,
screenShare: true,
dedEnc: storage.data.useDedenc,
mirrorInput: storage.data.mirrorInput,
......
This diff was suppressed by a .gitattributes entry.
......@@ -1091,6 +1091,13 @@ function refresh_devices()
pop_select("#usecamera","verto_demo_camera_selected", tmp);
}
var tmp;
tmp = $.cookie("verto_demo_share_selected") || "false";
if (tmp) {
$('#useshare option[value=' + tmp + ']').prop('selected', 'selected').change();
pop_select("#useshare","verto_demo_share_selected", tmp);
}
tmp = $.cookie("verto_demo_mic_selected") || "false";
if (tmp) {
$('#usemic option[value=' + tmp + ']').prop('selected', 'selected').change();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论