Backed out changeset cdfaa36dcd55 (bug 1503536) for perma assertion failure at media/webrtc/MediaEngineWebRTCAudio.cpp a=backout
authorGurzau Raul <rgurzau@mozilla.com>
Tue, 06 Nov 2018 11:51:57 +0200
changeset 444538 53647b724d3bbc77055bd9167fa125c5d52e4eda
parent 444435 9f9a9234959f114825f58beee0cffbab82d0bb29
child 444539 e160f0a60e4fc9cc6e77dd57644d74d4c6cc88dd
push id34996
push userrgurzau@mozilla.com
push dateTue, 06 Nov 2018 09:53:23 +0000
treeherdermozilla-central@e160f0a60e4f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1503536
milestone65.0a1
backs outcdfaa36dcd55da6b543d548dc45c54a468ed4506
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
Backed out changeset cdfaa36dcd55 (bug 1503536) for perma assertion failure at media/webrtc/MediaEngineWebRTCAudio.cpp a=backout
dom/media/webrtc/MediaEngineWebRTCAudio.cpp
dom/media/webrtc/MediaEngineWebRTCAudio.h
--- a/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
+++ b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
@@ -198,18 +198,16 @@ MediaEngineWebRTCMicrophoneSource::Recon
          this,
          name.Data()));
     Stop(nullptr);
     return NS_ERROR_UNEXPECTED;
   }
 
   ApplySettings(outputPrefs);
 
-  mCurrentPrefs = outputPrefs;
-
   return NS_OK;
 }
 
 void
 MediaEngineWebRTCMicrophoneSource::Pull(
   const RefPtr<const AllocationHandle>&,
   const RefPtr<SourceMediaStream>& aStream,
   TrackID aTrackID,
@@ -493,18 +491,16 @@ MediaEngineWebRTCMicrophoneSource::Alloc
     media::NewRunnableFrom([that, prefs = outputPrefs]() mutable {
       that->mSettings->mEchoCancellation.Value() = prefs.mAecOn;
       that->mSettings->mAutoGainControl.Value() = prefs.mAgcOn;
       that->mSettings->mNoiseSuppression.Value() = prefs.mNoiseOn;
       that->mSettings->mChannelCount.Value() = prefs.mChannels;
       return NS_OK;
     }));
 
-  mCurrentPrefs = outputPrefs;
-
   return rv;
 }
 
 nsresult
 MediaEngineWebRTCMicrophoneSource::Deallocate(
   const RefPtr<const AllocationHandle>&)
 {
   AssertIsOnOwningThread();
@@ -670,18 +666,16 @@ MediaEngineWebRTCMicrophoneSource::Start
           that->mInputProcessing, StartStopMessage::Start));
       }
 
       that->mStream->OpenAudioInput(deviceID, that->mInputProcessing);
 
       return NS_OK;
     }));
 
-  ApplySettings(mCurrentPrefs);
-
   MOZ_ASSERT(mState != kReleased);
   mState = kStarted;
 
   return NS_OK;
 }
 
 nsresult
 MediaEngineWebRTCMicrophoneSource::Stop(const RefPtr<const AllocationHandle>&)
--- a/dom/media/webrtc/MediaEngineWebRTCAudio.h
+++ b/dom/media/webrtc/MediaEngineWebRTCAudio.h
@@ -131,19 +131,16 @@ private:
   // Constructed on the MediaManager thread, and then only ever accessed on the
   // main thread.
   const nsMainThreadPtrHandle<media::Refcountable<dom::MediaTrackSettings>>
     mSettings;
 
   // Current state of the resource for this source.
   MediaEngineSourceState mState;
 
-  // The current preferences for the APM's various processing stages.
-  MediaEnginePrefs mCurrentPrefs;
-
   // The SourecMediaStream on which to append data for this microphone. Set in
   // SetTrack as part of the initialization, and nulled in ::Deallocate.
   RefPtr<SourceMediaStream> mStream;
 
   // See note at the top of this class.
   RefPtr<AudioInputProcessing> mInputProcessing;
 };