Merge remote-tracking branch 'upstream/master'

debian/jitsi-meet-tokens.postinst

@@ -74,11 +74,6 @@ case "$1" in
                 if [ -x "/etc/init.d/prosody" ]; then
                     invoke-rc.d prosody restart
                 fi
-
-                echo "This package requires BOSH Prosody module to be patched !"
-                echo "Use the following command, after this package has been installed and"
-                echo "after every prosody-trunk upgrade:"
-                echo "sudo patch -N /usr/lib/prosody/modules/mod_bosh.lua /usr/share/jitsi-meet/prosody-plugins/mod_bosh.lua.patch"
             else
                 echo "Failed apply auto-config to $PROSODY_HOST_CONFIG which most likely comes from not supported version of jitsi-meet"
             fi

modules/RTC/LocalStream.js

@@ -73,9 +73,7 @@ LocalStream.prototype.setMute = function (mute)
     var isAudio = this.isAudioStream();
     var eventType = isAudio ? RTCEvents.AUDIO_MUTE : RTCEvents.VIDEO_MUTE;
 
-    // Temporarily disable completely turning off the camera because of
-    // simulcast.
-    if (true || (window.location.protocol != "https:" && this.isGUMStream) ||
+    if ((window.location.protocol != "https:" && this.isGUMStream) ||
         (isAudio && this.isGUMStream) || this.videoType === "screen" ||
         // FIXME FF does not support 'removeStream' method used to mute
         RTCBrowserType.isFirefox()) {

modules/xmpp/JingleSessionPC.js

@@ -1274,14 +1274,6 @@ JingleSessionPC.prototype.notifyMySSRCUpdate = function (old_sdp, new_sdp) {
  * contrast to an automatic decision made by the application logic)
  */
 JingleSessionPC.prototype.setVideoMute = function (mute, callback, options) {
-
-    // Temporarily disable completely turning off the camera because of
-    // simulcast.
-    APP.RTC.localVideo.setMute(mute);
-    callback(mute);
-    return;
-
-    /*
     var byUser;
 
     if (options) {
@@ -1319,7 +1311,6 @@ JingleSessionPC.prototype.setVideoMute = function (mute, callback, options) {
         console.log("SDPs", oldSdp, newSdp);
         self.notifyMySSRCUpdate(oldSdp, newSdp);
     });
-    */
 };
 
 JingleSessionPC.prototype.hardMuteVideo = function (muted) {

modules/xmpp/strophe.ping.js

@@ -3,9 +3,9 @@
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
 
 /**
- * Ping every 20 sec
+ * Ping every 10 sec
  */
-var PING_INTERVAL = 20000;
+var PING_INTERVAL = 10000;
 
 /**
  * Ping timeout error after 15 sec of waiting.

prosody-plugins/mod_bosh.lua.patch

@@ -1,12 +0,0 @@
---- /usr/lib/prosody/modules/mod_bosh.lua	2015-12-16 14:28:34.000000000 -0600
-+++ /usr/lib/prosody/modules/mod_bosh.lua	2015-12-22 10:45:59.818197967 -0600
-@@ -294,6 +294,9 @@
- 
- 		session.log("debug", "BOSH session created for request from %s", session.ip);
- 		log("info", "New BOSH session, assigned it sid '%s'", sid);
-+		
-+		hosts[session.host].events.fire_event(
-+			"bosh-session", { session = session, request = request });
- 
- 		-- Send creation response
- 		local creating_session = true;