Merge branch 'master' into add-to-3rd

Author: jianjunz

source/agent/conference/conference.js

@@ -1016,6 +1016,18 @@ var Conference = function (rpcClient, selfRpcId) {
       data: subDesc.data,
       legacy: subDesc.legacy,
     };
+    if (rtcSubInfo.legacy) {
+      // For legacy simulcast rid subscription
+      rtcSubInfo.tracks.forEach((subTrack) => {
+        if (subTrack.simulcastRid) {
+          const trackFrom = streams[subTrack.from].media.tracks.find((t) =>
+            (t.type === subTrack.type && t.rid === subTrack.simulcastRid));
+          if (trackFrom && trackFrom.id) {
+            subTrack.from = trackFrom.id;
+          }
+        }
+      });
+    }
     return rtcSubInfo;
   };
 

source/agent/webrtc/sdpInfo.js

@@ -175,7 +175,7 @@ class SdpInfo {
       }
       const payloadList = mediaInfo.payloads.toString().split(' ');
       if (selectedPayload !== -1) {
-        payloadList.unshift(selectedPayload);
+        payloadList.unshift(selectedPayload.toString());
       }
       mediaInfo.payloads = payloadList
         .filter((p) => relatedPayloads.has(parseInt(p)))
@@ -265,7 +265,7 @@ class SdpInfo {
       }
       const payloadList = mediaInfo.payloads.toString().split(' ');
       if (selectedPayload !== -1) {
-        payloadList.unshift(selectedPayload);
+        payloadList.unshift(selectedPayload.toString());
       }
       mediaInfo.payloads = payloadList
         .filter((p) => relatedPayloads.has(parseInt(p)))

source/portal/versions/portalDataAdapter.js

@@ -95,6 +95,7 @@ const AdatperV1_1 = {
           mid: subReq.media.tracks.length.toString(),
           from: data.media.video.from,
           parameters: data.media.video.parameters,
+          simulcastRid: data.media.video.simulcastRid,
         });
       }
       return subReq;