Bug 1276569. Part 2 - merge StartUnlocked() with Start() r=kinetik. draft 1276569_fix_AudioStream
authorJW Wang <jwwang@mozilla.com>
Mon, 30 May 2016 16:05:30 +0800
branch1276569_fix_AudioStream
changeset 372890 c8fb5f479ba61f9763b64cc0a90a1c29ff8e0e0d
parent 372889 806b4eff3b6e43964bb6fd8d9e7a735a6bcfa5e6
child 372891 f160904cb14800d5b9123b0e421a2ae8836556c5
push id19619
push userjwwang@mozilla.com
push dateMon, 30 May 2016 13:01:55 +0000
reviewerskinetik
bugs1276569
milestone49.0a1
Bug 1276569. Part 2 - merge StartUnlocked() with Start() r=kinetik. MozReview-Commit-ID: DuEXdkvt7je
dom/media/AudioStream.cpp
dom/media/AudioStream.h
--- a/dom/media/AudioStream.cpp
+++ b/dom/media/AudioStream.cpp
@@ -411,24 +411,16 @@ AudioStream::SetVolume(double aVolume)
     NS_WARNING("Could not change volume on cubeb stream.");
   }
 }
 
 void
 AudioStream::Start()
 {
   MonitorAutoLock mon(mMonitor);
-  StartUnlocked();
-}
-
-void
-AudioStream::StartUnlocked()
-{
-  mMonitor.AssertCurrentThreadOwns();
-
   if (mState == INITIALIZED) {
     mState = STARTED;
     int r;
     {
       MonitorAutoUnlock mon(mMonitor);
       r = cubeb_stream_start(mCubebStream.get());
       // DataCallback might be called before we exit this scope
       // if cubeb_stream_start() succeeds. mState must be set to STARTED
--- a/dom/media/AudioStream.h
+++ b/dom/media/AudioStream.h
@@ -335,18 +335,16 @@ private:
 
   // Return true if audio frames are valid (correct sampling rate and valid
   // channel count) otherwise false.
   bool IsValidAudioFormat(Chunk* aChunk);
 
   void GetUnprocessed(AudioBufferWriter& aWriter);
   void GetTimeStretched(AudioBufferWriter& aWriter);
 
-  void StartUnlocked();
-
   // The monitor is held to protect all access to member variables.
   Monitor mMonitor;
 
   // Input rate in Hz (characteristic of the media being played)
   uint32_t mInRate;
   // Output rate in Hz (characteristic of the playback rate)
   uint32_t mOutRate;
   uint32_t mChannels;