diff --git a/dom/media/AudioSink.cpp b/dom/media/AudioSink.cpp index 71b0b643f22e..d932943d36b0 100644 --- a/dom/media/AudioSink.cpp +++ b/dom/media/AudioSink.cpp @@ -36,13 +36,7 @@ AudioSink::AudioSink(MediaQueue& aAudioQueue, , mLastGoodPosition(0) , mInfo(aInfo) , mChannel(aChannel) - , mVolume(1.0) - , mPlaybackRate(1.0) - , mPreservesPitch(false) , mStopAudioThread(false) - , mSetVolume(false) - , mSetPlaybackRate(false) - , mSetPreservesPitch(false) , mPlaying(true) { } @@ -226,7 +220,6 @@ AudioSink::InitializeAudioStream() ReentrantMonitorAutoEnter mon(GetReentrantMonitor()); mAudioStream = audioStream; - UpdateStreamSettings(); return NS_OK; } @@ -290,8 +283,6 @@ AudioSink::IsPlaybackContinuing() return false; } - UpdateStreamSettings(); - return true; } @@ -450,40 +441,6 @@ AudioSink::PlayFromAudioQueue() return audio->mFrames; } -void -AudioSink::UpdateStreamSettings() -{ - AssertCurrentThreadInMonitor(); - - bool setVolume = mSetVolume; - bool setPlaybackRate = mSetPlaybackRate; - bool setPreservesPitch = mSetPreservesPitch; - double volume = mVolume; - double playbackRate = mPlaybackRate; - bool preservesPitch = mPreservesPitch; - - mSetVolume = false; - mSetPlaybackRate = false; - mSetPreservesPitch = false; - - { - ReentrantMonitorAutoExit exit(GetReentrantMonitor()); - if (setVolume) { - mAudioStream->SetVolume(volume); - } - - if (setPlaybackRate && - NS_FAILED(mAudioStream->SetPlaybackRate(playbackRate))) { - NS_WARNING("Setting the playback rate failed in AudioSink."); - } - - if (setPreservesPitch && - NS_FAILED(mAudioStream->SetPreservesPitch(preservesPitch))) { - NS_WARNING("Setting the pitch preservation failed in AudioSink."); - } - } -} - void AudioSink::StartAudioStreamPlaybackIfNeeded() { diff --git a/dom/media/AudioSink.h b/dom/media/AudioSink.h index 8a3cd36f80f6..ab3e5b3b4cde 100644 --- a/dom/media/AudioSink.h +++ b/dom/media/AudioSink.h @@ -114,8 +114,6 @@ private: // audio data to the audio hardware. Called on the audio thread. uint32_t PlayFromAudioQueue(); - void UpdateStreamSettings(); - // If we have already written enough frames to the AudioStream, start the // playback. void StartAudioStreamPlaybackIfNeeded(); @@ -172,16 +170,8 @@ private: dom::AudioChannel mChannel; - double mVolume; - double mPlaybackRate; - bool mPreservesPitch; - bool mStopAudioThread; - bool mSetVolume; - bool mSetPlaybackRate; - bool mSetPreservesPitch; - bool mPlaying; MozPromiseHolder mEndPromise;