Fix Simulcast with new SDP parser (#1089)

lynckia · Dec 11, 2017 · dd6cc6c · dd6cc6c
1 parent ac9b138
commit dd6cc6c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/erizo/src/erizo/SdpInfo.cpp b/erizo/src/erizo/SdpInfo.cpp
@@ -767,12 +767,19 @@ namespace erizo {
         }
         if (parts[1] == kSimulcastGroup) {
           ELOG_DEBUG("Detected SIM group, size: %lu", parts.size());
+          std::vector<uint32_t> old_video_ssrc_list;
+          if (video_ssrc_list.size() > 0) {
+            old_video_ssrc_list = video_ssrc_list;
+            video_ssrc_list.clear();
+          }
           std::for_each(parts.begin() + 2, parts.end(), [this] (std::string &part){
-              uint32_t parsed_ssrc = strtoul(part.c_str(), nullptr, 10);
-              ELOG_DEBUG("maybeAddSsrc video SIM, ssrc %u", parsed_ssrc);
-              maybeAddSsrcToList(parsed_ssrc);
-              });
-
+            uint32_t parsed_ssrc = strtoul(part.c_str(), nullptr, 10);
+            ELOG_DEBUG("maybeAddSsrc video SIM, ssrc %u", parsed_ssrc);
+            maybeAddSsrcToList(parsed_ssrc);
+          });
+          for (uint32_t ssrc : old_video_ssrc_list) {
+            maybeAddSsrcToList(ssrc);
+          }
         } else if (parts[1] == kFidGroup) {
           int number_of_ssrcs = parts.size() - 2;
           if (number_of_ssrcs != 2) {

diff --git a/erizo_controller/common/semanticSdp/MediaInfo.js b/erizo_controller/common/semanticSdp/MediaInfo.js
@@ -3,9 +3,10 @@ const Direction = require('./Direction');
 const DirectionWay = require('./DirectionWay');
 
 class MediaInfo {
-  constructor(id, type) {
+  constructor(id, port, type) {
     this.id = id;
     this.type = type;
+    this.port = port;
     this.direction = Direction.SENDRECV;
     this.extensions = new Map();
     this.codecs = new Map();
@@ -19,7 +20,7 @@ class MediaInfo {
   }
 
   clone() {
-    const cloned = new MediaInfo(this.id, this.type);
+    const cloned = new MediaInfo(this.id, this.port, this.type);
     cloned.setDirection(this.direction);
     cloned.setBitrate(this.bitrate);
     cloned.setConnection(this.connection);
@@ -53,6 +54,7 @@ class MediaInfo {
   plain() {
     const plain = {
       id: this.id,
+      port: this.port,
       type: this.type,
       connection: this.connection,
       direction: Direction.toString(this.direction),
@@ -89,6 +91,10 @@ class MediaInfo {
     return this.type;
   }
 
+  getPort() {
+    return this.port;
+  }
+
   getId() {
     return this.id;
   }
@@ -202,7 +208,7 @@ class MediaInfo {
   }
 
   answer(supported) {
-    const answer = new MediaInfo(this.id, this.type);
+    const answer = new MediaInfo(this.id, this.port, this.type);
 
     answer.setDirection(Direction.reverse(this.direction));
 

diff --git a/erizo_controller/common/semanticSdp/SDPInfo.js b/erizo_controller/common/semanticSdp/SDPInfo.js
@@ -235,7 +235,7 @@ class SDPInfo {
     this.medias.forEach((media) => {
       const md = {
         type: media.getType(),
-        port: 9,
+        port: media.getPort(),
         protocol: 'UDP/TLS/RTP/SAVPF',
         fmtp: [],
         rtp: [],
@@ -751,7 +751,8 @@ SDPInfo.process = (sdp) => {
   sdp.media.forEach((md) => {
     const media = md.type;
     const mid = md.mid;
-    const mediaInfo = new MediaInfo(mid, media);
+    const port = md.port;
+    const mediaInfo = new MediaInfo(mid, port, media);
     mediaInfo.setXGoogleFlag(md.xGoogleFlag);
     mediaInfo.rtcp = md.rtcp;
     mediaInfo.setConnection(md.connection);