Commits http://codereview.chromium.org/7157001/.

content/browser/renderer_host/media/audio_renderer_host.cc

 // Copyright (c) 2011 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/browser/renderer_host/media/audio_renderer_host.h"
 
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
 #include "content/browser/renderer_host/media/audio_common.h"
 #include "content/browser/renderer_host/media/audio_sync_reader.h"
 #include "content/browser/renderer_host/media/media_observer.h"
 #include "content/browser/resource_context.h"
 #include "content/common/media/audio_messages.h"
 #include "ipc/ipc_logging.h"
 
 
 AudioRendererHost::AudioEntry::AudioEntry()
-    : render_view_id(0),
-      stream_id(0),
+    : stream_id(0),
       pending_buffer_request(false),
       pending_close(false) {
 }
 
 AudioRendererHost::AudioEntry::~AudioEntry() {}
 
 ///////////////////////////////////////////////////////////////////////////////
 // AudioRendererHost implementations.
 AudioRendererHost::AudioRendererHost(
     const content::ResourceContext* resource_context)
@@ skipping 106 matching lines @@
 
     // If we failed to prepare the sync socket for the renderer then we fail
     // the construction of audio stream.
     if (!reader->PrepareForeignSocketHandle(peer_handle(),
                                             &foreign_socket_handle)) {
       DeleteEntryOnError(entry);
       return;
     }
 
     Send(new AudioMsg_NotifyLowLatencyStreamCreated(
-        entry->render_view_id, entry->stream_id, foreign_memory_handle,
+        entry->stream_id, foreign_memory_handle,
         foreign_socket_handle, entry->shared_memory.created_size()));
     return;
   }
 
   // The normal audio stream has created, send a message to the renderer
   // process.
   Send(new AudioMsg_NotifyStreamCreated(
-      entry->render_view_id, entry->stream_id, foreign_memory_handle,
+      entry->stream_id, foreign_memory_handle,
       entry->shared_memory.created_size()));
 }
 
 void AudioRendererHost::DoSendPlayingMessage(
     media::AudioOutputController* controller) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupByController(controller);
   if (!entry)
     return;
 
   Send(new AudioMsg_NotifyStreamStateChanged(
-    entry->render_view_id, entry->stream_id, kAudioStreamPlaying));
+    entry->stream_id, kAudioStreamPlaying));
 }
 
 void AudioRendererHost::DoSendPausedMessage(
     media::AudioOutputController* controller) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupByController(controller);
   if (!entry)
     return;
 
   Send(new AudioMsg_NotifyStreamStateChanged(
-      entry->render_view_id, entry->stream_id, kAudioStreamPaused));
+      entry->stream_id, kAudioStreamPaused));
 }
 
 void AudioRendererHost::DoRequestMoreData(
     media::AudioOutputController* controller,
     AudioBuffersState buffers_state) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // If we already have a pending request then return.
   AudioEntry* entry = LookupByController(controller);
   if (!entry || entry->pending_buffer_request)
     return;
 
   DCHECK(!entry->controller->LowLatencyMode());
   entry->pending_buffer_request = true;
   Send(new AudioMsg_RequestPacket(
-      entry->render_view_id, entry->stream_id, buffers_state));
+      entry->stream_id, buffers_state));
 }
 
 void AudioRendererHost::DoHandleError(media::AudioOutputController* controller,
                                       int error_code) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupByController(controller);
   if (!entry)
     return;
 
@@ skipping 14 matching lines @@
     IPC_MESSAGE_HANDLER(AudioHostMsg_NotifyPacketReady, OnNotifyPacketReady)
     IPC_MESSAGE_HANDLER(AudioHostMsg_GetVolume, OnGetVolume)
     IPC_MESSAGE_HANDLER(AudioHostMsg_SetVolume, OnSetVolume)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
 
   return handled;
 }
 
 void AudioRendererHost::OnCreateStream(
-    const IPC::Message& msg, int stream_id,
-    const AudioParameters& params, bool low_latency) {
+    int stream_id, const AudioParameters& params, bool low_latency) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(LookupById(msg.routing_id(), stream_id) == NULL);
+  DCHECK(LookupById(stream_id) == NULL);
 
   AudioParameters audio_params(params);
 
   // Select the hardware packet size if not specified.
   if (!audio_params.samples_per_packet) {
     audio_params.samples_per_packet = SelectSamplesPerPacket(audio_params);
   }
   uint32 packet_size = audio_params.GetPacketSize();
 
   scoped_ptr<AudioEntry> entry(new AudioEntry());
   // Create the shared memory and share with the renderer process.
   if (!entry->shared_memory.CreateAndMapAnonymous(packet_size)) {
     // If creation of shared memory failed then send an error message.
-    SendErrorMessage(msg.routing_id(), stream_id);
+    SendErrorMessage(stream_id);
     return;
   }
 
   if (low_latency) {
     // If this is the low latency mode, we need to construct a SyncReader first.
     scoped_ptr<AudioSyncReader> reader(
         new AudioSyncReader(&entry->shared_memory));
 
     // Then try to initialize the sync reader.
     if (!reader->Init()) {
-      SendErrorMessage(msg.routing_id(), stream_id);
+      SendErrorMessage(stream_id);
       return;
     }
 
     // If we have successfully created the SyncReader then assign it to the
     // entry and construct an AudioOutputController.
     entry->reader.reset(reader.release());
     entry->controller =
         media::AudioOutputController::CreateLowLatency(this, audio_params,
                                                        entry->reader.get());
   } else {
     // The choice of buffer capacity is based on experiment.
     entry->controller =
         media::AudioOutputController::Create(this, audio_params,
                                              3 * packet_size);
   }
 
   if (!entry->controller) {
-    SendErrorMessage(msg.routing_id(), stream_id);
+    SendErrorMessage(stream_id);
     return;
   }
 
   // If we have created the controller successfully create a entry and add it
   // to the map.
-  entry->render_view_id = msg.routing_id();
   entry->stream_id = stream_id;
-
-  audio_entries_.insert(std::make_pair(
-      AudioEntryId(msg.routing_id(), stream_id),
-      entry.release()));
+  audio_entries_.insert(std::make_pair(stream_id, entry.release()));
   resource_context_->media_observer()->OnSetAudioStreamStatus(
-      this, msg.routing_id(), stream_id, "created");
+      this, stream_id, "created");
 }
 
-void AudioRendererHost::OnPlayStream(const IPC::Message& msg, int stream_id) {
+void AudioRendererHost::OnPlayStream(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  AudioEntry* entry = LookupById(msg.routing_id(), stream_id);
+  AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
-    SendErrorMessage(msg.routing_id(), stream_id);
+    SendErrorMessage(stream_id);
     return;
   }
 
   entry->controller->Play();
   resource_context_->media_observer()->OnSetAudioStreamPlaying(
-      this, msg.routing_id(), stream_id, true);
+      this, stream_id, true);
 }
 
-void AudioRendererHost::OnPauseStream(const IPC::Message& msg, int stream_id) {
+void AudioRendererHost::OnPauseStream(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  AudioEntry* entry = LookupById(msg.routing_id(), stream_id);
+  AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
-    SendErrorMessage(msg.routing_id(), stream_id);
+    SendErrorMessage(stream_id);
     return;
   }
 
   entry->controller->Pause();
   resource_context_->media_observer()->OnSetAudioStreamPlaying(
-      this, msg.routing_id(), stream_id, false);
+      this, stream_id, false);
 }
 
-void AudioRendererHost::OnFlushStream(const IPC::Message& msg, int stream_id) {
+void AudioRendererHost::OnFlushStream(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  AudioEntry* entry = LookupById(msg.routing_id(), stream_id);
+  AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
-    SendErrorMessage(msg.routing_id(), stream_id);
+    SendErrorMessage(stream_id);
     return;
   }
 
   entry->controller->Flush();
   resource_context_->media_observer()->OnSetAudioStreamStatus(
-      this, msg.routing_id(), stream_id, "flushed");
+      this, stream_id, "flushed");
 }
 
-void AudioRendererHost::OnCloseStream(const IPC::Message& msg, int stream_id) {
+void AudioRendererHost::OnCloseStream(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   resource_context_->media_observer()->OnSetAudioStreamStatus(
-      this, msg.routing_id(), stream_id, "closed");
+      this, stream_id, "closed");
 
-  AudioEntry* entry = LookupById(msg.routing_id(), stream_id);
+  AudioEntry* entry = LookupById(stream_id);
 
   if (entry)
     CloseAndDeleteStream(entry);
 }
 
-void AudioRendererHost::OnSetVolume(const IPC::Message& msg, int stream_id,
-                                    double volume) {
+void AudioRendererHost::OnSetVolume(int stream_id, double volume) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  AudioEntry* entry = LookupById(msg.routing_id(), stream_id);
+  AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
-    SendErrorMessage(msg.routing_id(), stream_id);
+    SendErrorMessage(stream_id);
     return;
   }
 
   // Make sure the volume is valid.
   if (volume < 0 || volume > 1.0)
     return;
   entry->controller->SetVolume(volume);
   resource_context_->media_observer()->OnSetAudioStreamVolume(
-      this, msg.routing_id(), stream_id, volume);
+      this, stream_id, volume);
 }
 
-void AudioRendererHost::OnGetVolume(const IPC::Message& msg, int stream_id) {
+void AudioRendererHost::OnGetVolume(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   NOTREACHED() << "This message shouldn't be received";
 }
 
-void AudioRendererHost::OnNotifyPacketReady(
-    const IPC::Message& msg, int stream_id, uint32 packet_size) {
+void AudioRendererHost::OnNotifyPacketReady(int stream_id, uint32 packet_size) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  AudioEntry* entry = LookupById(msg.routing_id(), stream_id);
+  AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
-    SendErrorMessage(msg.routing_id(), stream_id);
+    SendErrorMessage(stream_id);
     return;
   }
 
   DCHECK(!entry->controller->LowLatencyMode());
   CHECK(packet_size <= entry->shared_memory.created_size());
 
   if (!entry->pending_buffer_request) {
     NOTREACHED() << "Buffer received but no such pending request";
   }
   entry->pending_buffer_request = false;
 
   // Enqueue the data to media::AudioOutputController.
   entry->controller->EnqueueData(
       reinterpret_cast<uint8*>(entry->shared_memory.memory()),
       packet_size);
 }
 
-void AudioRendererHost::SendErrorMessage(int32 render_view_id,
-                                         int32 stream_id) {
-  Send(new AudioMsg_NotifyStreamStateChanged(
-      render_view_id, stream_id, kAudioStreamError));
+void AudioRendererHost::SendErrorMessage(int32 stream_id) {
+  Send(new AudioMsg_NotifyStreamStateChanged(stream_id, kAudioStreamError));
 }
 
 void AudioRendererHost::DeleteEntries() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   for (AudioEntryMap::iterator i = audio_entries_.begin();
        i != audio_entries_.end(); ++i) {
     CloseAndDeleteStream(i->second);
   }
 }
@@ skipping 12 matching lines @@
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &AudioRendererHost::DeleteEntry, entry));
 }
 
 void AudioRendererHost::DeleteEntry(AudioEntry* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Delete the entry when this method goes out of scope.
   scoped_ptr<AudioEntry> entry_deleter(entry);
 
-  // Erase the entry from the map.
-  audio_entries_.erase(
-      AudioEntryId(entry->render_view_id, entry->stream_id));
+  // Erase the entry identified by |stream_id| from the map.
+  audio_entries_.erase(entry->stream_id);
 
   // Notify the media observer.
   resource_context_->media_observer()->OnDeleteAudioStream(
-      this, entry->render_view_id, entry->stream_id);
+      this, entry->stream_id);
 }
 
 void AudioRendererHost::DeleteEntryOnError(AudioEntry* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Sends the error message first before we close the stream because
   // |entry| is destroyed in DeleteEntry().
-  SendErrorMessage(entry->render_view_id, entry->stream_id);
+  SendErrorMessage(entry->stream_id);
 
   resource_context_->media_observer()->OnSetAudioStreamStatus(
-      this, entry->render_view_id, entry->stream_id, "error");
+      this, entry->stream_id, "error");
   CloseAndDeleteStream(entry);
 }
 
-AudioRendererHost::AudioEntry* AudioRendererHost::LookupById(
-    int route_id, int stream_id) {
+AudioRendererHost::AudioEntry* AudioRendererHost::LookupById(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  AudioEntryMap::iterator i = audio_entries_.find(
-      AudioEntryId(route_id, stream_id));
+  AudioEntryMap::iterator i = audio_entries_.find(stream_id);
   if (i != audio_entries_.end() && !i->second->pending_close)
     return i->second;
   return NULL;
 }
 
 AudioRendererHost::AudioEntry* AudioRendererHost::LookupByController(
     media::AudioOutputController* controller) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Iterate the map of entries.
   // TODO(hclam): Implement a faster look up method.
   for (AudioEntryMap::iterator i = audio_entries_.begin();
        i != audio_entries_.end(); ++i) {
     if (!i->second->pending_close && controller == i->second->controller.get())
       return i->second;
   }
   return NULL;
 }