add local properties for pushing codec type to presence

JitsiConference.js

@@ -332,7 +332,6 @@ JitsiConference.prototype._init = function(options = {}) {
     this.room = this.xmpp.createRoom(
         this.options.name, {
             ...config,
-            preferredCodec: this.codecSelection.getPreferredCodec(),
             statsId: this._statsCurrentId
         },
         JitsiConference.resourceCreator
@@ -503,6 +502,9 @@ JitsiConference.prototype._init = function(options = {}) {
         this.setLocalParticipantProperty(
             'region', config.deploymentInfo.userRegion);
     }
+
+    // Publish the codec type to presence.
+    this.setLocalParticipantProperty('codecType', this.codecSelection.getPreferredCodec());
 };
 
 /**

modules/RTC/CodecSelection.js

@@ -115,8 +115,25 @@ export class CodecSelection {
         const disabledCodec = this.disabledCodec && this._isCodecSupported(this.disabledCodec)
             ? this.disabledCodec
             : null;
+        let codec = preferredCodec;
 
-        mediaSession.setVideoCodecs(preferredCodec, disabledCodec);
+        // For a new endpoint joining the call, JitsiConferenceEvents.USER_JOINED event is received before the
+        // media session is created, the supported codecs for all the remote endpoints in the call need to be
+        // compared here before setting the codec on the peerconnection.
+        if (!mediaSession.isP2P) {
+            const remoteParticipants = this.conference.getParticipants().map(participant => participant.getId());
+
+            for (const remote of remoteParticipants) {
+                const peerMediaInfo = mediaSession.signalingLayer.getPeerMediaInfo(remote, MediaType.VIDEO);
+
+                if (peerMediaInfo && peerMediaInfo.codecType && peerMediaInfo.codecType !== preferredCodec) {
+                    this.nonPreferredParticipants.push(remote);
+                    codec = peerMediaInfo.codecType;
+                }
+            }
+        }
+
+        mediaSession.setVideoCodecs(codec, disabledCodec);
     }
 
     /**

modules/RTC/MockClasses.js

@@ -35,14 +35,6 @@ export class MockPeerConnection {
         return Promise.resolve(/* answer */{});
     }
 
-    /**
-     * {@link TraceablePeerConnection.getConfiguredVideoCodec}.
-     *
-     * @returns {CodecMimeType}
-     */
-    getConfiguredVideoCodec() {
-        return 'vp8';
-    }
 
     /**
      * {@link TraceablePeerConnection.setLocalDescription}.

modules/xmpp/ChatRoom.js

@@ -166,9 +166,6 @@ export default class ChatRoom extends Listenable {
         // here.
         this.addVideoInfoToPresence(false);
 
-        // Set the default codec.
-        this.addCodecInfoToPresence(options.preferredCodec);
-
         if (options.deploymentInfo && options.deploymentInfo.userRegion) {
             this.presMap.nodes.push({
                 'tagName': 'region',
@@ -1559,37 +1556,6 @@ export default class ChatRoom extends Listenable {
         this.sendPresence();
     }
 
-    /**
-     * Add the codec key to the presence map.
-     *
-     * @param {string} codec - the mime type of the codec that needs to be
-     * published via presence to other users in the conference.
-     *
-     * @returns {void}
-     */
-    addCodecInfoToPresence(codec) {
-        this.addToPresence(
-            'codecType',
-            {
-                attributes: { 'xmlns': 'http://jitsi.org/jitmeet/codec' },
-                value: codec.toString()
-            });
-    }
-
-    /**
-     * Adds the codec key to presence map and sends the presence info
-     * to the room.
-     *
-     * @param {string} codec - the mime type of the codec that needs to be
-     * published via presence to other users in the conference.
-     *
-     * @returns {void}
-     */
-    sendCodecInfoPresence(codec) {
-        this.addCodecInfoToPresence(codec);
-        this.sendPresence();
-    }
-
     /**
      * Obtains the info about given media advertised in the MUC presence of
      * the participant identified by the given endpoint JID.
@@ -1619,7 +1585,7 @@ export default class ChatRoom extends Listenable {
             mutedNode = filterNodeFromPresenceJSON(pres, 'audiomuted');
         } else if (mediaType === MediaType.VIDEO) {
             mutedNode = filterNodeFromPresenceJSON(pres, 'videomuted');
-            const codecTypeNode = filterNodeFromPresenceJSON(pres, 'codecType');
+            const codecTypeNode = filterNodeFromPresenceJSON(pres, 'jitsi_participant_codecType');
             const videoTypeNode = filterNodeFromPresenceJSON(pres, 'videoType');
 
             if (videoTypeNode.length > 0) {

modules/xmpp/JingleSessionPC.js

@@ -1816,20 +1816,11 @@ export default class JingleSessionPC extends JingleSession {
             sdp: remoteSdp
         });
 
-        const promise = this.isInitiator
-            ? this._initiatorRenegotiate(remoteDescription)
-            : this._responderRenegotiate(remoteDescription);
-
-        return promise.then(() => {
-            // Publish the codec info to the other endpoints in the conference if it has changed
-            // as a result of the renegotiation (only on current active session).
-            const codec = this.peerconnection.getConfiguredVideoCodec();
-
-            if (this.currentCodec !== codec && this._localVideoActive) {
-                this.room.sendCodecInfoPresence(codec);
-                this.currentCodec = codec;
-            }
-        });
+        if (this.isInitiator) {
+            return this._initiatorRenegotiate(remoteDescription);
+        }
+
+        return this._responderRenegotiate(remoteDescription);
     }
 
     /**

modules/xmpp/MockClasses.js

@@ -13,12 +13,6 @@ export class MockChatRoom {
      */
     addPresenceListener() {
     }
-
-    /**
-     * {@link ChatRoom.sendCodecInfoPresence}.
-     */
-    sendCodecInfoPresence() {
-    }
 }
 
 /**