Bug 986764: release all webrtc sub-modules before deleting engine r=gcp

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

@@ -112,6 +112,17 @@ WebrtcAudioConduit::~WebrtcAudioConduit()
     mOtherDirection->mShutDown = true;
     mVoiceEngine = nullptr;
   } else {
+    // We shouldn't delete the VoiceEngine until all these are released!
+    // And we can't use a Scoped ptr, since the order is arbitrary
+    mPtrVoENetwork = nullptr;
+    mPtrVoEBase = nullptr;
+    mPtrVoECodec = nullptr;
+    mPtrVoEXmedia = nullptr;
+    mPtrVoEProcessing = nullptr;
+    mPtrVoEVideoSync = nullptr;
+    mPtrVoERTP_RTCP = nullptr;
+    mPtrRTP = nullptr;
+
     // only one opener can call Delete.  Have it be the last to close.
     if(mVoiceEngine)
     {

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

@@ -116,7 +116,16 @@ WebrtcVideoConduit::~WebrtcVideoConduit()
     // let other side we terminated the channel
     mOtherDirection->mShutDown = true;
     mVideoEngine = nullptr;
- } else {
+  } else {
+    // We can't delete the VideoEngine until all these are released!
+    // And we can't use a Scoped ptr, since the order is arbitrary
+    mPtrViEBase = nullptr;
+    mPtrViECapture = nullptr;
+    mPtrViECodec = nullptr;
+    mPtrViENetwork = nullptr;
+    mPtrViERender = nullptr;
+    mPtrRTP = nullptr;
+
     // only one opener can call Delete.  Have it be the last to close.
     if(mVideoEngine)
     {