Bug 1276569. Part 2 - merge StartUnlocked() with Start() r=kinetik.
MozReview-Commit-ID: DuEXdkvt7je
--- 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;