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

Conflicts:
	html5/verto/js/src/jquery.FSRTC.js
	html5/verto/video_demo-live_canvas/js/verto-min.js
	html5/verto/video_demo/js/verto-min.js

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

@@ -475,29 +475,16 @@
 	    audio = false;
 	} else {
 	    audio = {
-		//mandatory: {},
-		//optional: []
-            advanced: []
 	    };
 
+	    if (obj.options.audioParams) {
+	        audio = obj.options.audioParams;
+            }
+
 	    if (obj.options.useMic !== "any") {
 		//audio.optional = [{sourceId: obj.options.useMic}]
 		audio.deviceId = {exact: obj.options.useMic};
 	    }
-
-	    //FIXME
-	    if (obj.options.audioParams) {
-		for (var key in obj.options.audioParams) {
-		    var con = {};
-		    //con[key] = obj.options.audioParams[key];
-		    if (obj.options.audioParams[key]) {
-			con.exact = key;
-			audio.advanced.push(con);
-		    }
-		}
-	    }
-
-
 	}
 
 	if (obj.options.useVideo && obj.options.localVideo) {
@@ -519,19 +506,31 @@
 	delete obj.options.videoParams.vertoBestFrameRate;
 
 	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});
+	    if (!obj.options.useCamera && !!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 can share an entire screen.");
+
+		video = {
+		    width: {min: obj.options.videoParams.minWidth, max: obj.options.videoParams.maxWidth},
+		    height: {min: obj.options.videoParams.minHeight, max: obj.options.videoParams.maxHeight},
+		    mediaSource: dowin ? "window" : "screen"
+		}
+	    } else {
+		var opt = [];
+		if (obj.options.useCamera) {
+		    opt.push({sourceId: obj.options.useCamera});
+		}
+		
+		if (bestFrameRate) {
+		    opt.push({minFrameRate: bestFrameRate});
+		    opt.push({maxFrameRate: bestFrameRate});
+		}
+		
+		video = {
+		    mandatory: obj.options.videoParams,
+		    optional: opt		
+		};
 	    }
-
-	    video = {
-		mandatory: obj.options.videoParams,
-		optional: opt		
-	    };
 	} else {
 
 	    video = {
@@ -588,6 +587,8 @@
 	    
 	    if (screen) {
 		self.constraints.offerToReceiveVideo = false;
+		self.constraints.offerToReceiveAudio = false;
+		self.constraints.offerToSendAudio = false;
 	    }
 	    
             self.peer = FSRTCPeerConnection({
@@ -632,12 +633,13 @@
             getUserMedia({
 		constraints: {
                     audio: mediaParams.audio,
-                video: mediaParams.video
+                    video: mediaParams.video
 		},
 		video: mediaParams.useVideo,
 		onsuccess: onSuccess,
 		onerror: onError
             });
+
 	} else {
 	    onSuccess(null);
 	}

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

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

html5/verto/verto_communicator/src/vertoService/services/vertoService.js

@@ -886,22 +886,22 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
 	  }
 
 
-        console.log('share screen from plugin');
+        console.log('share screen from plugin ' + storage.data.selectedShare);
 
-        getScreenId(function(error, sourceId, screen_constraints) {
+        var screenfunc = function(error, sourceId, screen_constraints) {
 
           if(error) {
             $rootScope.$emit('ScreenShareExtensionStatus', error);
             return;
           }
 
-          var call = data.instance.newCall({
+          var share_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,
-            videoParams: screen_constraints.video.mandatory,
+            videoParams: screen_constraints ? screen_constraints.video.mandatory : {},
             useVideo: true,
             screenShare: true,
             dedEnc: storage.data.useDedenc,
@@ -913,7 +913,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
           });
 
           // Override onStream callback in $.FSRTC instance
-          call.rtc.options.callbacks.onStream = function(rtc, stream) {
+          share_call.rtc.options.callbacks.onStream = function(rtc, stream) {
             if(stream) {
               var StreamTrack = stream.getVideoTracks()[0];
               StreamTrack.addEventListener('ended', stopSharing);
@@ -930,16 +930,19 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
             }
           };
 
-          data.shareCall = call;
+          data.shareCall = share_call;
 
           console.log('shareCall', data);
 
           data.mutedMic = false;
           data.mutedVideo = false;
+        };
 
-          that.refreshDevices();
-
-        });
+	  if (!!navigator.mozGetUserMedia) {
+	      screenfunc();
+	  } else {
+              getScreenId(screenfunc);
+	  }
 
       },
 

html5/verto/video_demo/verto.js

@@ -908,7 +908,7 @@ function doshare(on) {
 
 
     console.log("Attempting Screen Capture....");
-    getScreenId(function (error, sourceId, screen_constraints) {
+    var sharefunc = function(error, sourceId, screen_constraints) {
 	
 
 
@@ -918,15 +918,22 @@ function doshare(on) {
             caller_id_number: $("#cid").val() + " (screen)",
 	    outgoingBandwidth: outgoingBandwidth,
 	    incomingBandwidth: incomingBandwidth,
-	    videoParams: screen_constraints.video.mandatory,
+	    videoParams: screen_constraints ? screen_constraints.video.mandatory : {},
             useVideo: true,
 	    screenShare: true,
 	    dedEnc: $("#use_dedenc").is(':checked'),
 	    mirrorInput: $("#mirror_input").is(':checked')
 	});
 
-    });
+    };
 
+    if (!!navigator.mozGetUserMedia) {
+	sharefunc();
+    } else {
+	getScreenId(sharefunc);
+    }
+
+    
 
 
     //$("#main_info").html("Trying");

src/mod/applications/mod_conference/mod_conference.c

@@ -2218,6 +2218,8 @@ SWITCH_STANDARD_APP(conference_function)
 
 	if (switch_channel_test_flag(channel, CF_VIDEO_ONLY)) {
 		while(conference_utils_member_test_flag((&member), MFLAG_RUNNING) && switch_channel_ready(channel)) {
+			switch_frame_t *read_frame;
+			switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
 			switch_yield(100000);
 		}
 	} else {