kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 09:36:46 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anthony Minessale
2016-09-27 12:04:23 -05:00
parent e41ae3709a
commit 73e460e1f5
4 changed files with 76 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
html5/verto/verto_communicator/src/vertoService/services/vertoService.js
View File

@@ -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,