Backed out changeset 4e90c48f2617 (bug 1339246) for media test failure in test_peerConnection_addtrack_removetrack_events.html

media/webrtc/signaling/src/media-conduit/VideoConduit.cpp

@@ -271,11 +271,9 @@ bool WebrtcVideoConduit::SetLocalSSRCs(const std::vector<unsigned int> & aSSRCs)
     return false;
   }
 
-  MutexAutoLock lock(mCodecMutex);
-  // On the next StartTransmitting() or ConfigureSendMediaCodec, force
-  // building a new SendStream to switch SSRCs.
-  DeleteSendStream();
   if (wasTransmitting) {
+    MutexAutoLock lock(mCodecMutex);
+    DeleteSendStream();
     if (StartTransmitting() != kMediaConduitNoError) {
       return false;
     }

media/webrtc/signaling/src/media-conduit/VideoConduit.h

@@ -457,7 +457,7 @@ private:
   //Local database of currently applied receive codecs
   nsTArray<UniquePtr<VideoCodecConfig>> mRecvCodecList;
 
-  // protects mCurSendCodecConfig, mInReconfig,mVideoSend/RecvStreamStats, mSend/RecvStreams
+  // protects mCurrSendCodecConfig, mInReconfig,mVideoSend/RecvStreamStats, mSend/RecvStreams
   Mutex mCodecMutex;
   nsAutoPtr<VideoCodecConfig> mCurSendCodecConfig;
   bool mInReconfig;