Bug 1117295 - Don't finish the source stream in MediaEngineDefault::Stop due to racy behavior. r=jesup, a=sledru
authorAndreas Pehrson <pehrsons@gmail.com>
Thu, 29 Jan 2015 09:12:54 +0800
changeset 243627 89994d9c2522
parent 243626 f3b474a7e351
child 243628 63e9ce6a9a45
push id4420
push userryanvm@gmail.com
push date2015-02-02 16:43 +0000
treeherdermozilla-beta@e98376bbdf79 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, sledru
bugs1117295
milestone36.0
Bug 1117295 - Don't finish the source stream in MediaEngineDefault::Stop due to racy behavior. r=jesup, a=sledru
dom/media/webrtc/MediaEngineDefault.cpp
--- a/dom/media/webrtc/MediaEngineDefault.cpp
+++ b/dom/media/webrtc/MediaEngineDefault.cpp
@@ -160,17 +160,16 @@ MediaEngineDefaultVideoSource::Stop(Sour
   if (!mTimer) {
     return NS_ERROR_FAILURE;
   }
 
   mTimer->Cancel();
   mTimer = nullptr;
 
   aSource->EndTrack(aID);
-  aSource->Finish();
 
   mState = kStopped;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 MediaEngineDefaultVideoSource::Notify(nsITimer* aTimer)
 {
@@ -397,17 +396,16 @@ MediaEngineDefaultAudioSource::Stop(Sour
   if (!mTimer) {
     return NS_ERROR_FAILURE;
   }
 
   mTimer->Cancel();
   mTimer = nullptr;
 
   aSource->EndTrack(aID);
-  aSource->Finish();
 
   mState = kStopped;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 MediaEngineDefaultAudioSource::Notify(nsITimer* aTimer)
 {