Bug 1502766 - Part 1 (beta only): Pass enough args to NrIceCtx::Create. r=mjf a=RyanVM
authorByron Campen [:bwc] <docfaraday@gmail.com>
Mon, 29 Oct 2018 11:13:29 -0500
changeset 500976 7749a380827aa8308975c4c2429dfe0c4e23bdc2
parent 500975 3fcac75fdb784833724bad75d88fb13378b95eeb
child 500977 c89f12000b079c50362ce52e661e3c5e24836a11
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmjf, RyanVM
bugs1502766
milestone64.0
Bug 1502766 - Part 1 (beta only): Pass enough args to NrIceCtx::Create. r=mjf a=RyanVM
media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
@@ -366,23 +366,23 @@ nsresult PeerConnectionMedia::Init(const
   nsresult rv = InitProxy();
   NS_ENSURE_SUCCESS(rv, rv);
 
   bool ice_tcp = Preferences::GetBool("media.peerconnection.ice.tcp", false);
 
   // setup the stun local addresses IPC async call
   InitLocalAddrs();
 
-  NrIceCtx::InitializeGlobals(mParent->GetAllowIceLoopback(),
-      ice_tcp,
-      mParent->GetAllowIceLinkLocal());
-
   // TODO(ekr@rtfm.com): need some way to set not offerer later
   // Looks like a bug in the NrIceCtx API.
-  mIceCtx = NrIceCtx::Create("PC:" + mParentName,
+  mIceCtx = NrIceCtx::Create(
+      "PC:" + mParentName,
+      mParent->GetAllowIceLoopback(),
+      ice_tcp,
+      mParent->GetAllowIceLinkLocal(),
       toNrIcePolicy(aConfiguration.mIceTransportPolicy));
   if(!mIceCtx) {
     CSFLogError(LOGTAG, "%s: Failed to create Ice Context", __FUNCTION__);
     return NS_ERROR_FAILURE;
   }
 
   std::vector<NrIceStunServer> stunServers;
   std::vector<NrIceTurnServer> turnServers;