Remove unused flush operation from Chromium audio.

BUG=151051,114697
TBR=cdn

Review URL: https://codereview.chromium.org/14234023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194401 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 18 insertions, 46 deletions

diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index 1d5f78e..28f0113 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -89,11 +89,6 @@ void AudioOutputController::Pause() {
       &AudioOutputController::DoPause, this));
 }
 
-void AudioOutputController::Flush() {
-  message_loop_->PostTask(FROM_HERE, base::Bind(
-      &AudioOutputController::DoFlush, this));
-}
-
 void AudioOutputController::Close(const base::Closure& closed_task) {
   DCHECK(!closed_task.is_null());
   message_loop_->PostTaskAndReply(FROM_HERE, base::Bind(
@@ -239,12 +234,6 @@ void AudioOutputController::DoPause() {
   handler_->OnPaused();
 }
 
-void AudioOutputController::DoFlush() {
-  DCHECK(message_loop_->BelongsToCurrentThread());
-
-  // TODO(hclam): Actually flush the audio device.
-}
-
 void AudioOutputController::DoClose() {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h
index 3f158a5..0a83bae 100644
--- a/media/audio/audio_output_controller.h
+++ b/media/audio/audio_output_controller.h
@@ -122,10 +122,6 @@ class MEDIA_EXPORT AudioOutputController
   // Pause this audio output stream.
   void Pause();
 
-  // Discard all audio data buffered in this output stream. This method only
-  // has effect when the stream is paused.
-  void Flush();
-
   // Closes the audio output stream. The state is changed and the resources
   // are freed on the audio manager thread. closed_task is executed after that.
   // Callbacks (EventHandler and SyncReader) must exist until closed_task is
@@ -188,7 +184,6 @@ class MEDIA_EXPORT AudioOutputController
   void DoPlay();
   void PollAndStartIfDataReady();
   void DoPause();
-  void DoFlush();
   void DoClose();
   void DoSetVolume(double volume);
   void DoReportError();
diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
index b0eb318..98a75ee 100644
--- a/media/audio/audio_output_device.cc
+++ b/media/audio/audio_output_device.cc
@@ -89,9 +89,9 @@ void AudioOutputDevice::Play() {
       base::Bind(&AudioOutputDevice::PlayOnIOThread, this));
 }
 
-void AudioOutputDevice::Pause(bool flush) {
+void AudioOutputDevice::Pause() {
   message_loop()->PostTask(FROM_HERE,
-      base::Bind(&AudioOutputDevice::PauseOnIOThread, this, flush));
+      base::Bind(&AudioOutputDevice::PauseOnIOThread, this));
 }
 
 bool AudioOutputDevice::SetVolume(double volume) {
@@ -126,16 +126,11 @@ void AudioOutputDevice::PlayOnIOThread() {
   }
 }
 
-void AudioOutputDevice::PauseOnIOThread(bool flush) {
+void AudioOutputDevice::PauseOnIOThread() {
   DCHECK(message_loop()->BelongsToCurrentThread());
   if (state_ == PLAYING) {
     ipc_->PauseStream(stream_id_);
-    if (flush)
-      ipc_->FlushStream(stream_id_);
     state_ = PAUSED;
-  } else {
-    // Note that |flush| isn't relevant here since this is the case where
-    // the stream is first starting.
   }
   play_on_start_ = false;
 }
diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h
index 28a7098..26137ca 100644
--- a/media/audio/audio_output_device.h
+++ b/media/audio/audio_output_device.h
@@ -83,7 +83,7 @@ class MEDIA_EXPORT AudioOutputDevice
   virtual void Start() OVERRIDE;
   virtual void Stop() OVERRIDE;
   virtual void Play() OVERRIDE;
-  virtual void Pause(bool flush) OVERRIDE;
+  virtual void Pause() OVERRIDE;
   virtual bool SetVolume(double volume) OVERRIDE;
 
   // Methods called on IO thread ----------------------------------------------
@@ -125,7 +125,7 @@ class MEDIA_EXPORT AudioOutputDevice
   // sends IPC messages on that thread.
   void CreateStreamOnIOThread(const AudioParameters& params);
   void PlayOnIOThread();
-  void PauseOnIOThread(bool flush);
+  void PauseOnIOThread();
   void ShutDownOnIOThread();
   void SetVolumeOnIOThread(double volume);
 
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc
index 5668687..fe601d8 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -58,7 +58,6 @@ class MockAudioOutputIPC : public AudioOutputIPC {
   MOCK_METHOD1(CloseStream, void(int stream_id));
   MOCK_METHOD2(SetVolume, void(int stream_id, double volume));
   MOCK_METHOD1(PauseStream, void(int stream_id));
-  MOCK_METHOD1(FlushStream, void(int stream_id));
 };
 
 // Creates a copy of a SyncSocket handle that we can give to AudioOutputDevice.
diff --git a/media/audio/audio_output_ipc.h b/media/audio/audio_output_ipc.h
index 894ece5..7b7c0b2 100644
--- a/media/audio/audio_output_ipc.h
+++ b/media/audio/audio_output_ipc.h
@@ -83,11 +83,6 @@ class MEDIA_EXPORT AudioOutputIPC {
   // AudioOutputController::Pause().
   virtual void PauseStream(int stream_id) = 0;
 
-  // "Flushes" the audio device. This should generate a call to
-  // AudioOutputController::Flush().
-  // TODO(tommi): This is currently neither implemented nor called.  Remove?
-  virtual void FlushStream(int stream_id) = 0;
-
   // Closes the audio stream and deletes the matching AudioOutputController
   // instance.  Prior to deleting the AudioOutputController object, a call to
   // AudioOutputController::Close must be made.
diff --git a/media/audio/null_audio_sink.cc b/media/audio/null_audio_sink.cc
index 40db453..aa69c5c 100644
--- a/media/audio/null_audio_sink.cc
+++ b/media/audio/null_audio_sink.cc
@@ -54,7 +54,7 @@ void NullAudioSink::Play() {
   playing_ = true;
 }
 
-void NullAudioSink::Pause(bool /* flush */) {
+void NullAudioSink::Pause() {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
   if (!playing_)
diff --git a/media/audio/null_audio_sink.h b/media/audio/null_audio_sink.h
index 37022b7..0724146 100644
--- a/media/audio/null_audio_sink.h
+++ b/media/audio/null_audio_sink.h
@@ -29,7 +29,7 @@ class MEDIA_EXPORT NullAudioSink
                           RenderCallback* callback) OVERRIDE;
   virtual void Start() OVERRIDE;
   virtual void Stop() OVERRIDE;
-  virtual void Pause(bool flush) OVERRIDE;
+  virtual void Pause() OVERRIDE;
   virtual void Play() OVERRIDE;
   virtual bool SetVolume(double volume) OVERRIDE;
 
diff --git a/media/base/audio_renderer_mixer.cc b/media/base/audio_renderer_mixer.cc
index cb9b022..1a0417a 100644
--- a/media/base/audio_renderer_mixer.cc
+++ b/media/base/audio_renderer_mixer.cc
@@ -66,7 +66,7 @@ int AudioRendererMixer::Render(AudioBus* audio_bus,
   if (!mixer_inputs_.empty()) {
     last_play_time_ = now;
   } else if (now - last_play_time_ >= pause_delay_ && playing_) {
-    audio_sink_->Pause(false);
+    audio_sink_->Pause();
     playing_ = false;
   }
 
diff --git a/media/base/audio_renderer_mixer_input.cc b/media/base/audio_renderer_mixer_input.cc
index 569b126..2c476f0 100644
--- a/media/base/audio_renderer_mixer_input.cc
+++ b/media/base/audio_renderer_mixer_input.cc
@@ -62,7 +62,7 @@ void AudioRendererMixerInput::Play() {
   playing_ = true;
 }
 
-void AudioRendererMixerInput::Pause(bool /* flush */) {
+void AudioRendererMixerInput::Pause() {
   DCHECK(initialized_);
 
   if (!playing_)
diff --git a/media/base/audio_renderer_mixer_input.h b/media/base/audio_renderer_mixer_input.h
index a08b108..139904a 100644
--- a/media/base/audio_renderer_mixer_input.h
+++ b/media/base/audio_renderer_mixer_input.h
@@ -30,7 +30,7 @@ class MEDIA_EXPORT AudioRendererMixerInput
   virtual void Start() OVERRIDE;
   virtual void Stop() OVERRIDE;
   virtual void Play() OVERRIDE;
-  virtual void Pause(bool flush) OVERRIDE;
+  virtual void Pause() OVERRIDE;
   virtual bool SetVolume(double volume) OVERRIDE;
   virtual void Initialize(const AudioParameters& params,
                           AudioRendererSink::RenderCallback* renderer) OVERRIDE;
diff --git a/media/base/audio_renderer_mixer_input_unittest.cc b/media/base/audio_renderer_mixer_input_unittest.cc
index ad13db1..021285b 100644
--- a/media/base/audio_renderer_mixer_input_unittest.cc
+++ b/media/base/audio_renderer_mixer_input_unittest.cc
@@ -97,7 +97,7 @@ TEST_F(AudioRendererMixerInputTest, StartPlayPauseStopPlaying) {
   mixer_input_->Start();
   mixer_input_->Play();
   EXPECT_DOUBLE_EQ(ProvideInput(), 1);
-  mixer_input_->Pause(false);
+  mixer_input_->Pause();
   mixer_input_->Play();
   EXPECT_DOUBLE_EQ(ProvideInput(), 1);
   mixer_input_->Stop();
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc
index 317dea3..8680b78 100644
--- a/media/base/audio_renderer_mixer_unittest.cc
+++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -246,7 +246,7 @@ class AudioRendererMixerTest
 
     // Pause() all even numbered mixer inputs and ensure we get the right value.
     for (size_t i = 0; i < mixer_inputs_.size(); i += 2)
-      mixer_inputs_[i]->Pause(false);
+      mixer_inputs_[i]->Pause();
     for (int i = 0; i < kMixerCycles; ++i)
       ASSERT_TRUE(RenderAndValidateAudioData(mixer_inputs_.size() / 2));
 
@@ -415,7 +415,7 @@ TEST_P(AudioRendererMixerBehavioralTest, MixerPausesStream) {
   mixer_->set_pause_delay_for_testing(kPauseTime);
 
   base::WaitableEvent pause_event(true, false);
-  EXPECT_CALL(*sink_, Pause(testing::_))
+  EXPECT_CALL(*sink_, Pause())
       .Times(2).WillRepeatedly(SignalEvent(&pause_event));
   InitializeInputs(1);
 
@@ -433,7 +433,7 @@ TEST_P(AudioRendererMixerBehavioralTest, MixerPausesStream) {
   mixer_inputs_[0]->Start();
   EXPECT_CALL(*sink_, Play());
   mixer_inputs_[0]->Play();
-  mixer_inputs_[0]->Pause(false);
+  mixer_inputs_[0]->Pause();
 
   // Ensure once the input is paused the sink eventually pauses.
   start_time = base::Time::Now();
diff --git a/media/base/audio_renderer_sink.h b/media/base/audio_renderer_sink.h
index 51e6c1f..0d3c6c7 100644
--- a/media/base/audio_renderer_sink.h
+++ b/media/base/audio_renderer_sink.h
@@ -58,7 +58,7 @@ class AudioRendererSink
   virtual void Stop() = 0;
 
   // Pauses playback.
-  virtual void Pause(bool flush) = 0;
+  virtual void Pause() = 0;
 
   // Resumes playback after calling Pause().
   virtual void Play() = 0;
diff --git a/media/base/mock_audio_renderer_sink.h b/media/base/mock_audio_renderer_sink.h
index c9a4d61..00a4092 100644
--- a/media/base/mock_audio_renderer_sink.h
+++ b/media/base/mock_audio_renderer_sink.h
@@ -17,7 +17,7 @@ class MockAudioRendererSink : public AudioRendererSink {
 
   MOCK_METHOD0(Start, void());
   MOCK_METHOD0(Stop, void());
-  MOCK_METHOD1(Pause, void(bool flush));
+  MOCK_METHOD0(Pause, void());
   MOCK_METHOD0(Play, void());
   MOCK_METHOD1(SetVolume, bool(double volume));
 
diff --git a/media/filters/audio_renderer_impl.cc b/media/filters/audio_renderer_impl.cc
index bae0ec8..fd0a410 100644
--- a/media/filters/audio_renderer_impl.cc
+++ b/media/filters/audio_renderer_impl.cc
@@ -103,7 +103,7 @@ void AudioRendererImpl::Pause(const base::Closure& callback) {
 void AudioRendererImpl::DoPause() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK(sink_);
-  sink_->Pause(false);
+  sink_->Pause();
 }
 
 void AudioRendererImpl::Flush(const base::Closure& callback) {
@@ -176,8 +176,7 @@ void AudioRendererImpl::Preroll(base::TimeDelta time,
     AttemptRead_Locked();
   }
 
-  // Pause and flush the stream when we preroll to a new location.
-  sink_->Pause(true);
+  sink_->Pause();
 }
 
 void AudioRendererImpl::Initialize(const scoped_refptr<DemuxerStream>& stream,