Bug 1670856: Don't switch gathering to complete state with no streams. r=bwc
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Tue, 20 Oct 2020 16:22:55 +0000
changeset 553795 597e66664b6715fb64026095bc592dd279bdc077
parent 553794 c061dfcf1598aece0fe343783b351d0a280bf67d
child 553796 9e4bc6105c62b6ee012e52ba2720d55ea11cf764
push id129053
push usernohlmeier@mozilla.com
push dateWed, 21 Oct 2020 03:35:53 +0000
treeherderautoland@9e4bc6105c62 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwc
bugs1670856
milestone84.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1670856: Don't switch gathering to complete state with no streams. r=bwc Differential Revision: https://phabricator.services.mozilla.com/D93310
dom/media/webrtc/jsapi/MediaTransportHandler.cpp
--- a/dom/media/webrtc/jsapi/MediaTransportHandler.cpp
+++ b/dom/media/webrtc/jsapi/MediaTransportHandler.cpp
@@ -695,29 +695,17 @@ void MediaTransportHandlerSTS::StartIceG
 
         if (stunAddrs.Length()) {
           mIceCtx->SetStunAddrs(stunAddrs);
         }
 
         // Start gathering, but only if there are streams
         if (!mIceCtx->GetStreams().empty()) {
           mIceCtx->StartGathering(aDefaultRouteOnly, aObfuscateHostAddresses);
-          return;
         }
-
-        CSFLogWarn(
-            LOGTAG,
-            "%s: No streams to start gathering on. Can happen with rollback",
-            __FUNCTION__);
-
-        // If there are no streams, we're probably in a situation where we've
-        // rolled back while still waiting for our proxy configuration to come
-        // back. Make sure content knows that the rollback has stuck wrt
-        // gathering.
-        OnGatheringStateChange(dom::RTCIceGatheringState::Complete);
       },
       [](const std::string& aError) {});
 }
 
 void MediaTransportHandlerSTS::StartIceChecks(
     bool aIsControlling, const std::vector<std::string>& aIceOptions) {
   mInitPromise->Then(
       mStsThread, __func__,