Backed out changeset bc29a87b7aaf (bug 1303419) for MediaEngineWebRTCAudio.cpp assertions. FIREFOX_50_0b1_BUILD2 FIREFOX_50_0b1_RELEASE
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 20 Sep 2016 18:56:32 -0400
changeset 416067 91faf7ec36cd18a8ebdc0e2edac966e5bbb15da2
parent 416066 0f6fde2a7f7a523638f8658409ba6cf010b78601
child 416068 847b1c4baee9115cd324e973926e1782d2e0a121
child 422299 eb11246a0e01ac22ccb15dff47616d9e7e6d5dc2
push id30020
push userbmo:rail@mozilla.com
push dateWed, 21 Sep 2016 11:05:27 +0000
bugs1303419
milestone50.0
backs outbc29a87b7aafe77a186051eb8d0b9453d49ce433
Backed out changeset bc29a87b7aaf (bug 1303419) for MediaEngineWebRTCAudio.cpp assertions.
dom/media/webrtc/MediaEngineWebRTCAudio.cpp
--- a/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
+++ b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
@@ -815,20 +815,17 @@ MediaEngineWebRTCMicrophoneSource::Shutd
   }
 
   while (mRegisteredHandles.Length()) {
     MOZ_ASSERT(mState == kAllocated || mState == kStopped);
     Deallocate(nullptr); // XXX Extend concurrent constraints code to mics.
   }
 
   FreeChannel();
-  MOZ_ASSERT(sChannelsOpen > 0);
-  if (--sChannelsOpen == 0) {
-    DeInitEngine();
-  }
+  DeInitEngine();
 
   mAudioInput = nullptr;
 }
 
 typedef int16_t sample;
 
 void
 MediaEngineWebRTCMicrophoneSource::Process(int channel,