Mojofication of the Chrome Audio Rendering Prototype

content/renderer/media/audio_message_filter.cc

Index: content/renderer/media/audio_message_filter.cc
diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc
index 7ecf9b164140ffa8da08ad93e010e3600ae836de..d31d66af8981dfb8e20fe6d4b9ad308140979ad6 100644
--- a/content/renderer/media/audio_message_filter.cc
+++ b/content/renderer/media/audio_message_filter.cc
@@ -105,15 +105,21 @@ void AudioMessageFilter::AudioOutputIPCImpl::CreateStream(
   DCHECK(!stream_created_);
   if (stream_id_ == kStreamIDNotSet)
     stream_id_ = filter_->delegates_.Add(delegate);
-
-  filter_->Send(
-      new AudioHostMsg_CreateStream(stream_id_, render_frame_id_, params));
+  LOG(ERROR) << "test CreateStream " << stream_id_;
+  content::AudioOutputClient* audio_output_client =
+      content::AudioOutputClient::Get();
+  audio_output_client->CreateStream(stream_id_, render_frame_id_, params);
+  LOG(ERROR) << "test CreateStream " << stream_id_;
   stream_created_ = true;
 }
 
 void AudioMessageFilter::AudioOutputIPCImpl::PlayStream() {
   DCHECK(stream_created_);
-  filter_->Send(new AudioHostMsg_PlayStream(stream_id_));
+
+  content::AudioOutputClient* audio_output_client_ =
+      content::AudioOutputClient::Get();
+  audio_output_client_->PlayStream(GetAudioOutputStream());
+  // filter_->Send(new AudioHostMsg_PlayStream(stream_id_));
 }
 
 void AudioMessageFilter::AudioOutputIPCImpl::PauseStream() {
@@ -122,12 +128,17 @@ void AudioMessageFilter::AudioOutputIPCImpl::PauseStream() {
 }
 
 void AudioMessageFilter::AudioOutputIPCImpl::CloseStream() {
+  LOG(ERROR) << "test CloseStream " << stream_id_;
   DCHECK(filter_->io_task_runner_->BelongsToCurrentThread());
   DCHECK_NE(stream_id_, kStreamIDNotSet);
-  filter_->Send(new AudioHostMsg_CloseStream(stream_id_));
   filter_->delegates_.Remove(stream_id_);
   stream_id_ = kStreamIDNotSet;
   stream_created_ = false;
+  LOG(ERROR) << "test CloseStream " << stream_id_;
+  content::AudioOutputClient* audio_output_client_ =
+      content::AudioOutputClient::Get();
+  audio_output_client_->CloseStream(stream_id_);
+  LOG(ERROR) << "test CloseStream " << stream_id_;
 }
 
 void AudioMessageFilter::AudioOutputIPCImpl::SetVolume(double volume) {
@@ -149,7 +160,7 @@ bool AudioMessageFilter::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AudioMessageFilter, message)
     IPC_MESSAGE_HANDLER(AudioMsg_NotifyDeviceAuthorized, OnDeviceAuthorized)
-    IPC_MESSAGE_HANDLER(AudioMsg_NotifyStreamCreated, OnStreamCreated)
+    // IPC_MESSAGE_HANDLER(AudioMsg_NotifyStreamCreated, OnStreamCreated)
     IPC_MESSAGE_HANDLER(AudioMsg_NotifyStreamStateChanged, OnStreamStateChanged)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -197,11 +208,14 @@ void AudioMessageFilter::OnDeviceAuthorized(
 }
 
 void AudioMessageFilter::OnStreamCreated(
+    mojom::AudioOutputStreamPtr* stream,
     int stream_id,
     base::SharedMemoryHandle handle,
     base::SyncSocket::TransitDescriptor socket_descriptor,
     uint32_t length) {
   DCHECK(io_task_runner_->BelongsToCurrentThread());
+  AudioOutputClient* audio_output_client_;
+  audio_output_client_ = AudioOutputClient::Get();
 
   WebRtcLogMessage(base::StringPrintf(
       "AMF::OnStreamCreated. stream_id=%d",
@@ -218,7 +232,8 @@ void AudioMessageFilter::OnStreamCreated(
     base::SyncSocket socket(socket_handle);
     return;
   }
-  delegate->OnStreamCreated(handle, socket_handle, length);
+  delegate->getIPC()->SetAudioOutputStream(stream);
+  delegate->OnStreamCreated(stream, handle, socket_handle, length);
 }
 
 void AudioMessageFilter::OnStreamStateChanged(