feat(p2p): refactor p2p configuration options

Also add a preferH264 option for P2P.

JitsiConference.js

@@ -45,14 +45,14 @@ const logger = getLogger(__filename);
  * @param {number} [options.config.avgRtpStatsN=15] how many samples are to be
  * collected by {@link AvgRTPStatsReporter}, before arithmetic mean is
  * calculated and submitted to the analytics module.
- * @param {boolean} [options.config.enableP2P] when set to <tt>true</tt>
+ * @param {boolean} [options.config.p2p.enabled] when set to <tt>true</tt>
  * the peer to peer mode will be enabled. It means that when there are only 2
  * participants in the conference an attempt to make direct connection will be
  * made. If the connection succeeds the conference will stop sending data
  * through the JVB connection and will use the direct one instead.
- * @param {number} [options.config.backToP2PDelay=5] a delay given in seconds,
- * before the conference switches back to P2P, after the 3rd participant has
- * left the room.
+ * @param {number} [options.config.p2p.backToP2PDelay=5] a delay given in
+ * seconds, before the conference switches back to P2P, after the 3rd
+ * participant has left the room.
  * @param {number} [options.config.channelLastN=-1] The requested amount of
  * videos are going to be delivered after the value is in effect. Set to -1 for
  * unlimited or all available videos.
@@ -151,7 +151,8 @@ export default function JitsiConference(options) {
      */
     this.deferredStartP2PTask = null;
 
-    const delay = parseInt(options.config.backToP2PDelay, 10);
+    const delay
+        = parseInt(options.config.p2p && options.config.p2p.backToP2PDelay, 10);
 
     /**
      * A delay given in seconds, before the conference switches back to P2P
@@ -2298,7 +2299,8 @@ JitsiConference.prototype._suspendMediaTransferForJvbConnection = function() {
  * @private
  */
 JitsiConference.prototype._maybeStartOrStopP2P = function(userLeftEvent) {
-    if (!this.options.config.enableP2P || !RTCBrowserType.isP2PSupported()) {
+    if (!(RTCBrowserType.isP2PSupported()
+            && this.options.config.p2p && this.options.config.p2p.enabled)) {
         logger.info('Auto P2P disabled');
 
         return;

modules/xmpp/JingleSessionPC.js

@@ -244,7 +244,10 @@ export default class JingleSessionPC extends JingleSession {
                 {
                     disableSimulcast: this.room.options.disableSimulcast,
                     disableRtx: this.room.options.disableRtx,
-                    preferH264: this.room.options.preferH264
+                    preferH264: this.isP2P
+                        ? this.room.options.p2p
+                            && this.room.options.p2p.preferH264
+                        : this.room.options.preferH264
                 });
 
         this.peerconnection.onicecandidate = ev => {

modules/xmpp/xmpp.js

@@ -443,8 +443,11 @@ export default class XMPP extends Listenable {
      *
      */
     _initStrophePlugins() {
+        const p2pStunServers = this.options.p2p
+            && this.options.p2p.enabled && this.options.p2p.stunServers;
+
         initEmuc(this);
-        initJingle(this, this.eventEmitter, this.options.p2pStunServers);
+        initJingle(this, this.eventEmitter, p2pStunServers);
         initStropheUtil();
         initPing(this);
         initRayo();