kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-24 19:52:35 +00:00
Code Issues Projects Releases Wiki Activity

FS-10360: [freeswitch-core,verto.js] FireFox Screen Sharing

Browse Source
This commit is contained in:
Anthony Minessale 2017-06-02 12:34:40 -05:00
parent 6b3cef9df2
commit b6a740a4cc
2 changed files with 15 additions and 5 deletions

13
html5/verto/js/src/jquery.FSRTC.js

@ -506,9 +506,9 @@
delete obj.options.videoParams.vertoBestFrameRate; delete obj.options.videoParams.vertoBestFrameRate;
if (obj.options.screenShare) { 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. if (!obj.options.useCamera && !!navigator.mozGetUserMedia) {
if (!!navigator.mozGetUserMedia) { //This is an issue, only FireFox needs to ask this additional question if its screen or window we need a better way
var dowin = window.confirm("Do you want to share an application window? If not you will share a screen."); var dowin = window.confirm("Do you want to share an application window? If not you can share an entire screen.");
video = { video = {
width: {min: obj.options.videoParams.minWidth, max: obj.options.videoParams.maxWidth}, width: {min: obj.options.videoParams.minWidth, max: obj.options.videoParams.maxWidth},
@ -517,7 +517,9 @@
} }
} else { } else {
var opt = []; var opt = [];
opt.push({sourceId: obj.options.useCamera}); if (obj.options.useCamera) {
opt.push({sourceId: obj.options.useCamera});
}
if (bestFrameRate) { if (bestFrameRate) {
opt.push({minFrameRate: bestFrameRate}); opt.push({minFrameRate: bestFrameRate});
@ -585,6 +587,8 @@
if (screen) { if (screen) {
self.constraints.offerToReceiveVideo = false; self.constraints.offerToReceiveVideo = false;
self.constraints.offerToReceiveAudio = false;
self.constraints.offerToSendAudio = false;
} }
self.peer = FSRTCPeerConnection({ self.peer = FSRTCPeerConnection({
@ -635,6 +639,7 @@
onsuccess: onSuccess, onsuccess: onSuccess,
onerror: onError onerror: onError
}); });
} else { } else {
onSuccess(null); onSuccess(null);
} }

7
html5/verto/js/src/jquery.verto.js

@ -1922,7 +1922,7 @@
useVideo: verto.options.useVideo, useVideo: verto.options.useVideo,
useStereo: verto.options.useStereo, useStereo: verto.options.useStereo,
screenShare: false, screenShare: false,
useCamera: verto.options.deviceParams.useCamera, useCamera: false,
useMic: verto.options.deviceParams.useMic, useMic: verto.options.deviceParams.useMic,
useSpeak: verto.options.deviceParams.useSpeak, useSpeak: verto.options.deviceParams.useSpeak,
tag: verto.options.tag, tag: verto.options.tag,
@ -1931,6 +1931,11 @@
videoParams: verto.options.videoParams videoParams: verto.options.videoParams
}, params); }, params);
if (!dialog.params.screenShare) {
dialog.params.useCamera = verto.options.deviceParams.useCamera;
}
dialog.verto = verto; dialog.verto = verto;
dialog.direction = direction; dialog.direction = direction;
dialog.lastState = null; dialog.lastState = null;