Refine closing media section in SDP (#830)

Author: starwarfan

source/agent/webrtc/index.js

@@ -88,7 +88,7 @@ module.exports = function (rpcClient, selfRpcId, parentRpcId, clusterWorkerIP) {
                 rid: trackInfo.rid,
                 active: true,
             };
-            log.warn('notifyTrackUpdate', controller, publicTrackId, updateInfo);
+            log.debug('notifyTrackUpdate', controller, publicTrackId, updateInfo);
             notifyTrackUpdate(controller, transportId, updateInfo);
 
         } else if (trackInfo.type === 'track-removed') {
@@ -350,7 +350,7 @@ module.exports = function (rpcClient, selfRpcId, parentRpcId, clusterWorkerIP) {
         if (conn) {
             promises = tracks.map(trackId => new Promise((resolve, reject) => {
                 if (mediaTracks.has(trackId)) {
-                    log.warn('got on off track:', trackId);
+                    log.debug('got on off track:', trackId);
                     mediaTracks.get(trackId).onTrackControl(
                         'av', direction, action, resolve, reject);
                 } else {

source/agent/webrtc/sdpInfo.js

@@ -24,7 +24,7 @@ class SdpInfo {
     this.obj = transform.parse(str);
     this.obj.media.forEach((media, i) => {
       if (media.mid === undefined) {
-        log.info(`Media ${i} missing mid`);
+        log.warn(`Media ${i} missing mid`);
         media.mid = -1;
       }
     });
@@ -366,12 +366,22 @@ class SdpInfo {
     });
   }
 
+  filterMedia(mids) {
+    this.obj.media = mids.map((mid) => {
+      const media = this.media(mid);
+      if (!media) {
+        log.warn(`Media ${i} missing mid`);
+      }
+      return media;
+    });
+  }
+
   isMediaClosed(mid) {
     const mediaInfo = this.media(mid);
     if (!mediaInfo) {
       return true;
     }
-    if (mediaInfo.port === 0 && mediaInfo.direction === 'inactive') {
+    if (mediaInfo.direction === 'inactive') {
       return true;
     }
     return false;
@@ -380,8 +390,10 @@ class SdpInfo {
   closeMedia(mid) {
     const mediaInfo = this.media(mid);
     if (mediaInfo) {
+      if (!mediaInfo.candidates) {
+        mediaInfo.port = 0;
+      }
       mediaInfo.direction = 'inactive';
-      mediaInfo.port = 0;
       delete mediaInfo.ext;
       delete mediaInfo.ssrcs;
       delete mediaInfo.ssrcGroups;

source/agent/webrtc/wrtcConnection.js

@@ -80,7 +80,6 @@ class WrtcStream extends EventEmitter {
         this.audioFramePacketizer = new AudioFramePacketizer(audio.mid, audio.midExtId);
         this.audioFramePacketizer.bindTransport(wrtc.getMediaStream(id));
         if (this.owner) {
-          log.warn('set owner!!!', this.owner);
           this.audioFramePacketizer.setOwner(this.owner);
         }
       }
@@ -276,6 +275,9 @@ module.exports = function (spec, on_status, on_track) {
         op.enabled = false;
         destroyTransport(mid);
         ret = true;
+        if (localSdp) {
+          localSdp.closeMedia(mid);
+        }
       }
     });
     if (msidMap.has(operationId)) {
@@ -442,6 +444,7 @@ module.exports = function (spec, on_status, on_track) {
     if (!operationMap.has(mid)) {
       log.warn(`MID ${mid} in offer has no mapped operations (disabled)`);
       remoteSdp.closeMedia(mid);
+      localSdp.closeMedia(mid);
       return;
     }
     if (operationMap.get(mid).sdpDirection !== remoteSdp.mediaDirection(mid)) {
@@ -498,7 +501,6 @@ module.exports = function (spec, on_status, on_track) {
     } else {
       // Later offer
       const laterSdp = new SdpInfo(sdp);
-      const changedMids = laterSdp.compareMedia(remoteSdp);
       const addedMids = [];
       const removedMids = [];
 
@@ -539,7 +541,10 @@ module.exports = function (spec, on_status, on_track) {
         // Should already be destroyed by 'removeTrackOperation'
         // destroyTransport(mid);
       }
-      localSdp.setBundleMids(remoteSdp.bundleMids());
+      remoteSdp.filterMedia(laterSdp.mids());
+      localSdp.filterMedia(laterSdp.mids());
+      remoteSdp.setBundleMids(laterSdp.bundleMids());
+      localSdp.setBundleMids(laterSdp.bundleMids());
       // Produce answer
       const message = localSdp.toString();
       log.debug('Answer SDP', message);