Merge pull request #165 from deleolajide/ofmeet-version-0.0.9

ofmeet plugin version 0.0.9

src/plugins/ofmeet/changelog.html

@@ -49,6 +49,13 @@
     Openfire Meetings Plugin Changelog
 </h1>
 
+<p><b>0.0.9</b> -- Jan 26th, 2015</p>
+
+<ul>
+    <li>Fixed error when webcam is not available</li>
+    <li>Jitsi Videobridge server code refresh</li>
+</ul>
+
 <p><b>0.0.8</b> -- Jan 16th, 2015</p>
 
 <ul>

src/plugins/ofmeet/plugin.xml

@@ -5,8 +5,8 @@
     <name>Openfire Meetings</name>
     <description>Provides high quality, scalable video conferences using Jitsi Meet and Jitsi Videobridge</description>
     <author>Ignite Realtime</author>
-    <version>0.0.8</version>
-    <date>01/16/2015</date>
+    <version>0.0.9</version>
+    <date>01/26/2015</date>
     <minServerVersion>3.9.9</minServerVersion>
     
     <adminconsole>

src/plugins/ofmeet/src/java/org/jitsi/impl/protocol/xmpp/ChatMemberImpl.java

@@ -9,9 +9,12 @@ package org.jitsi.impl.protocol.xmpp;
 import net.java.sip.communicator.impl.protocol.jabber.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import net.java.sip.communicator.service.protocol.globalstatus.*;
 import org.jitsi.protocol.xmpp.*;
-
+import org.jitsi.util.*;
+import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smackx.muc.*;
+import org.jivesoftware.smackx.packet.*;
 
 /**
  * Stripped Smack implementation of {@link ChatRoomMember}.
@@ -21,6 +24,11 @@ import org.jivesoftware.smackx.muc.*;
 public class ChatMemberImpl
     implements XmppChatMember
 {
+    /**
+     * The logger.
+     */
+    private final static Logger logger = Logger.getLogger(ChatMemberImpl.class);
+
     /**
      * The MUC nickname used by this member.
      */
@@ -112,6 +120,37 @@ public class ChatMemberImpl
         return this.role;
     }
 
+    /**
+     * Reset cached user role so that it will be refreshed when {@link
+     * #getRole()} is called.
+     */
+    void resetCachedRole()
+    {
+        this.role = null;
+    }
+
+    void processPresence(Presence presence)
+    {
+        MUCUser mucUser
+            = (MUCUser) presence.getExtension(
+                    "x", "http://jabber.org/protocol/muc#user");
+
+        String jid = mucUser.getItem().getJid();
+
+        if (StringUtils.isNullOrEmpty(jabberId))
+        {
+            logger.info(Thread.currentThread()+
+                "JID: " + jid + " received for: " + getContactAddress());
+
+            jabberId = mucUser.getItem().getJid();
+        }
+        else if(!jid.equals(jabberId))
+        {
+            logger.warn(
+                "Different jid received in presence: " + presence.toXML());
+        }
+    }
+
     @Override
     public void setRole(ChatRoomMemberRole role)
     {
@@ -119,13 +158,14 @@ public class ChatMemberImpl
     }
 
     @Override
-    public String getJabberID()
+    public PresenceStatus getPresenceStatus()
     {
-        return jabberId;
+        return GlobalStatusEnum.ONLINE;
     }
 
-    void setJabberID(String jabberId)
+    @Override
+    public String getJabberID()
     {
-        this.jabberId = jabberId;
+        return jabberId;
     }
 }

src/plugins/ofmeet/src/java/org/jitsi/impl/protocol/xmpp/OperationSetMeetToolsImpl.java

@@ -23,6 +23,12 @@ public class OperationSetMeetToolsImpl
 
     }
 
+    @Override
+    public void removeSupportedFeature(String s)
+    {
+
+    }
+
     @Override
     public void sendPresenceExtension(ChatRoom chatRoom,
                                       PacketExtension extension)

src/plugins/ofmeet/src/java/org/jitsi/videobridge/openfire/Config.java

@@ -109,7 +109,7 @@ public class Config extends HttpServlet
 			String resolution 			= JiveGlobals.getProperty("org.jitsi.videobridge.ofmeet.resolution", "360");
 			String audioMixer			= JiveGlobals.getProperty("org.jitsi.videobridge.ofmeet.audio.mixer", "false");
 			String audioBandwidth 		= JiveGlobals.getProperty("org.jitsi.videobridge.ofmeet.audio.bandwidth", "128");
-			String videoBandwidth 		= JiveGlobals.getProperty("org.jitsi.videobridge.ofmeet.video.bandwidth", "2048");
+			String videoBandwidth 		= JiveGlobals.getProperty("org.jitsi.videobridge.ofmeet.video.bandwidth", "4096");
 			String useNicks 			= JiveGlobals.getProperty("org.jitsi.videobridge.ofmeet.usenicks", "false");
 			String useIPv6 				= JiveGlobals.getProperty("org.jitsi.videobridge.ofmeet.useipv6", "false");
 			String useStunTurn 			= JiveGlobals.getProperty("org.jitsi.videobridge.ofmeet.use.stunturn", "false");

src/plugins/ofmeet/src/libs/strophe/strophe.jingle.adapter.js

@@ -726,10 +726,13 @@ function getUserMediaWithConstraints(um, success_callback, failure_callback, res
             }
             break;
     }
-    if (constraints.video.mandatory.minWidth)
-        constraints.video.mandatory.maxWidth = constraints.video.mandatory.minWidth;
-    if (constraints.video.mandatory.minHeight)
-        constraints.video.mandatory.maxHeight = constraints.video.mandatory.minHeight;
+    if (constraints.video)
+    {
+	    if (constraints.video.mandatory.minWidth)
+		constraints.video.mandatory.maxWidth = constraints.video.mandatory.minWidth;
+	    if (constraints.video.mandatory.minHeight)
+		constraints.video.mandatory.maxHeight = constraints.video.mandatory.minHeight;
+    }
 
     if (bandwidth) { // doesn't work currently, see webrtc issue 1846
         if (!constraints.video) constraints.video = {mandatory: {}, optional: []};//same behaviour as true

src/plugins/ofmeet/src/simulcast.js

@@ -569,10 +569,13 @@ NativeSimulcastSender.prototype._appendSimulcastGroup = function (lines) {
         simSSRC = this._generateRandomSSRC();
         ssrcGroup.push(simSSRC);
 
-        sb.splice.apply(sb, [sb.length, 0].concat(
-            [["a=ssrc:", simSSRC, " cname:", videoSources.base.cname].join(''),
-                ["a=ssrc:", simSSRC, " msid:", videoSources.base.msid].join('')]
-        ));
+	if (videoSources.base) 
+	{
+		sb.splice.apply(sb, [sb.length, 0].concat(
+		    [["a=ssrc:", simSSRC, " cname:", videoSources.base.cname].join(''),
+			["a=ssrc:", simSSRC, " msid:", videoSources.base.msid].join('')]
+		));
+	}
 
         this.logger.info(['Generated substream ', i, ' with SSRC ', simSSRC, '.'].join(''));