Bug 807012 - Signaling - reorder initiialization of CallControlManagerImpl r=jesup
authorEthan Hugg <ethanhugg@gmail.com>
Mon, 17 Dec 2012 11:01:32 -0800
changeset 125422 2ac511266b2cded3484994810ac38da0a3f0e6eb
parent 125421 34d54961cd14b7d75410653493f6e30b5c8cbed5
child 125423 852237e60012814caca184adb2692127eeb94f81
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs807012
milestone20.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 807012 - Signaling - reorder initiialization of CallControlManagerImpl r=jesup
media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp
@@ -99,18 +99,18 @@ nsresult PeerConnectionCtx::Initialize()
   //codecMask |= VCM_CODEC_RESOURCE_H264;
   codecMask |= VCM_CODEC_RESOURCE_VP8;
   //codecMask |= VCM_CODEC_RESOURCE_I420;
   mCCM->setVideoCodecs(codecMask);
 
   if (!mCCM->startSDPMode())
     return NS_ERROR_FAILURE;
 
+  mDevice = mCCM->getActiveDevice();
   mCCM->addCCObserver(this);
-  mDevice = mCCM->getActiveDevice();
   NS_ENSURE_TRUE(mDevice.get(), NS_ERROR_FAILURE);
   ChangeSipccState(PeerConnectionImpl::kStarting);
   return NS_OK;
 }
 
 nsresult PeerConnectionCtx::Cleanup() {
   CSFLogDebug(logTag, "%s", __FUNCTION__);