Move audio messages to their own file.

content/renderer/media/audio_renderer_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/audio_renderer_impl.h"
 
 #include <math.h>
 
-#include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/common/audio_messages.h"
 #include "content/renderer/render_view.h"
 #include "media/base/filter_host.h"
 
 namespace {
 
 // We will try to fill 200 ms worth of audio samples in each packet. A round
 // trip latency for IPC messages are typically 10 ms, this should give us
 // plenty of time to avoid clicks.
 const int kMillisecondsPerPacket = 200;
 
@@ skipping 180 matching lines @@
     base::AutoLock auto_lock(lock_);
     DCHECK(!pending_request_);
     pending_request_ = true;
     request_buffers_state_ = buffers_state;
   }
 
   // Try to fill in the fulfill the packet request.
   NotifyPacketReadyTask();
 }
 
-void AudioRendererImpl::OnStateChanged(
-    const ViewMsg_AudioStreamState_Params& state) {
+void AudioRendererImpl::OnStateChanged(AudioStreamState state) {
   DCHECK(MessageLoop::current() == io_loop_);
 
   base::AutoLock auto_lock(lock_);
   if (stopped_)
     return;
 
-  switch (state.state) {
-    case ViewMsg_AudioStreamState_Params::kError:
+  switch (state) {
+    case kAudioStreamError:
       // We receive this error if we counter an hardware error on the browser
       // side. We can proceed with ignoring the audio stream.
       // TODO(hclam): We need more handling of these kind of error. For example
       // re-try creating the audio output stream on the browser side or fail
       // nicely and report to demuxer that the whole audio stream is discarded.
       host()->DisableAudioRenderer();
       break;
     // TODO(hclam): handle these events.
-    case ViewMsg_AudioStreamState_Params::kPlaying:
-    case ViewMsg_AudioStreamState_Params::kPaused:
+    case kAudioStreamPlaying:
+    case kAudioStreamPaused:
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void AudioRendererImpl::OnVolume(double volume) {
   // TODO(hclam): decide whether we need to report the current volume to
   // pipeline.
 }
 
 void AudioRendererImpl::CreateStreamTask(const AudioParameters& audio_params) {
   DCHECK(MessageLoop::current() == io_loop_);
 
   base::AutoLock auto_lock(lock_);
   if (stopped_)
     return;
 
   // Make sure we don't call create more than once.
   DCHECK_EQ(0, stream_id_);
   stream_id_ = filter_->AddDelegate(this);
   io_loop_->AddDestructionObserver(this);
 
-  ViewHostMsg_Audio_CreateStream_Params params;
-  params.params = audio_params;
+  AudioParameters params_to_send(audio_params);
+  // Let the browser choose packet size.
+  params_to_send.samples_per_packet = 0;
 
-  // Let the browser choose packet size.
-  params.params.samples_per_packet = 0;
-
-  filter_->Send(new ViewHostMsg_CreateAudioStream(0, stream_id_, params,
-                                                  false));
+  filter_->Send(new AudioHostMsg_CreateStream(
+      0, stream_id_, params_to_send, false));
 }
 
 void AudioRendererImpl::PlayTask() {
   DCHECK(MessageLoop::current() == io_loop_);
 
-  filter_->Send(new ViewHostMsg_PlayAudioStream(0, stream_id_));
+  filter_->Send(new AudioHostMsg_PlayStream(0, stream_id_));
 }
 
 void AudioRendererImpl::PauseTask() {
   DCHECK(MessageLoop::current() == io_loop_);
 
-  filter_->Send(new ViewHostMsg_PauseAudioStream(0, stream_id_));
+  filter_->Send(new AudioHostMsg_PauseStream(0, stream_id_));
 }
 
 void AudioRendererImpl::SeekTask() {
   DCHECK(MessageLoop::current() == io_loop_);
 
   // We have to pause the audio stream before we can flush.
-  filter_->Send(new ViewHostMsg_PauseAudioStream(0, stream_id_));
-  filter_->Send(new ViewHostMsg_FlushAudioStream(0, stream_id_));
+  filter_->Send(new AudioHostMsg_PauseStream(0, stream_id_));
+  filter_->Send(new AudioHostMsg_FlushStream(0, stream_id_));
 }
 
 void AudioRendererImpl::DestroyTask() {
   DCHECK(MessageLoop::current() == io_loop_);
 
   // Make sure we don't call destroy more than once.
   DCHECK_NE(0, stream_id_);
   filter_->RemoveDelegate(stream_id_);
-  filter_->Send(new ViewHostMsg_CloseAudioStream(0, stream_id_));
+  filter_->Send(new AudioHostMsg_CloseStream(0, stream_id_));
   io_loop_->RemoveDestructionObserver(this);
   stream_id_ = 0;
 }
 
 void AudioRendererImpl::SetVolumeTask(double volume) {
   DCHECK(MessageLoop::current() == io_loop_);
 
   base::AutoLock auto_lock(lock_);
   if (stopped_)
     return;
-  filter_->Send(new ViewHostMsg_SetAudioVolume(0, stream_id_, volume));
+  filter_->Send(new AudioHostMsg_SetVolume(0, stream_id_, volume));
 }
 
 void AudioRendererImpl::NotifyPacketReadyTask() {
   DCHECK(MessageLoop::current() == io_loop_);
 
   base::AutoLock auto_lock(lock_);
   if (stopped_)
     return;
   if (pending_request_ && GetPlaybackRate() > 0.0f) {
     DCHECK(shared_memory_.get());
@@ skipping 22 matching lines @@
       request_delay = base::TimeDelta::FromMicroseconds(
           static_cast<int64>(ceil(request_delay.InMicroseconds() *
                                   GetPlaybackRate())));
     }
 
     uint32 filled = FillBuffer(static_cast<uint8*>(shared_memory_->memory()),
                                shared_memory_size_, request_delay,
                                request_buffers_state_.pending_bytes == 0);
     pending_request_ = false;
     // Then tell browser process we are done filling into the buffer.
-    filter_->Send(
-        new ViewHostMsg_NotifyAudioPacketReady(0, stream_id_, filled));
+    filter_->Send(new AudioHostMsg_NotifyPacketReady(0, stream_id_, filled));
   }
 }
 
 void AudioRendererImpl::WillDestroyCurrentMessageLoop() {
   DCHECK(MessageLoop::current() == io_loop_);
 
   // We treat the IO loop going away the same as stopping.
   base::AutoLock auto_lock(lock_);
   if (stopped_)
     return;
 
   stopped_ = true;
   DestroyTask();
 }