Bug 1474808 - MediaPipeline set description even when there is no DOM Track draft
authorNico Grunbaum
Tue, 10 Jul 2018 22:54:10 -0700
changeset 816929 68da260436e79d41bce71ceabfd6d99dd71ff5bd
parent 816164 9302fd8c95c05e5a5cd295dde3bbdac2d58d6256
push id115884
push userna-g@nostrum.com
push dateWed, 11 Jul 2018 16:06:23 +0000
bugs1474808
milestone63.0a1
Bug 1474808 - MediaPipeline set description even when there is no DOM Track Early bailout was preventing mDescription from getting set in MediaPipeline::SetTransport. MozReview-Commit-ID: HIIva7R3fLe
media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
@@ -1385,25 +1385,24 @@ MediaPipelineTransmit::SetDescription()
   std::string description;
   description = mPc + "| ";
   description += mConduit->type() == MediaSessionConduit::AUDIO
                     ? "Transmit audio["
                     : "Transmit video[";
 
   if (!mDomTrack) {
     description += "no track]";
-    return;
+  } else {
+    nsString nsTrackId;
+    mDomTrack->GetId(nsTrackId);
+    std::string trackId(NS_ConvertUTF16toUTF8(nsTrackId).get());
+    description += trackId;
+    description += "]";
   }
 
-  nsString nsTrackId;
-  mDomTrack->GetId(nsTrackId);
-  std::string trackId(NS_ConvertUTF16toUTF8(nsTrackId).get());
-  description += trackId;
-  description += "]";
-
   RUN_ON_THREAD(
     mStsThread,
     WrapRunnable(RefPtr<MediaPipeline>(this),
                  &MediaPipelineTransmit::SetDescription_s,
                  description),
     NS_DISPATCH_NORMAL);
 }