Log actual streams, not output controllers.

media/audio/audio_output_dispatcher_impl.cc

 // Copyright (c) 2012 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 "media/audio/audio_output_dispatcher_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_output_proxy.h"
 
+#include "content/browser/media/media_internals.h"
+
 namespace media {
 
+static int g_stream_id = 0;
+static std::map<void*, int> g_stream_id_map;
+
 AudioOutputDispatcherImpl::AudioOutputDispatcherImpl(
     AudioManager* audio_manager,
     const AudioParameters& params,
     const std::string& output_device_id,
     const std::string& input_device_id,
     const base::TimeDelta& close_delay)
     : AudioOutputDispatcher(audio_manager, params, output_device_id,
           input_device_id),
       pause_delay_(base::TimeDelta::FromMicroseconds(
           2 * params.frames_per_buffer() * base::Time::kMicrosecondsPerSecond /
@@ skipping 42 matching lines @@
   DCHECK_GT(paused_proxies_, 0u);
   --paused_proxies_;
 
   close_timer_.Reset();
 
   double volume = 0;
   stream_proxy->GetVolume(&volume);
   physical_stream->SetVolume(volume);
   physical_stream->Start(callback);
   proxy_to_physical_map_[stream_proxy] = physical_stream;
+
+  audio_manager_->GetMediaInternals()->OnSetAudioStreamPlaying(
+      this, g_stream_id_map[physical_stream], true);
+
   return true;
 }
 
 void AudioOutputDispatcherImpl::StopStream(AudioOutputProxy* stream_proxy) {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
   AudioStreamMap::iterator it = proxy_to_physical_map_.find(stream_proxy);
   DCHECK(it != proxy_to_physical_map_.end());
   AudioOutputStream* physical_stream = it->second;
   proxy_to_physical_map_.erase(it);
 
   physical_stream->Stop();
 
   ++paused_proxies_;
 
   pausing_streams_.push_front(physical_stream);
 
+  audio_manager_->GetMediaInternals()->OnSetAudioStreamPlaying(
+      this, g_stream_id_map[physical_stream], false);
+
   // Don't recycle stream until two buffers worth of time has elapsed.
   message_loop_->PostDelayedTask(
       FROM_HERE,
       base::Bind(&AudioOutputDispatcherImpl::StopStreamTask,
                  weak_this_.GetWeakPtr()),
       pause_delay_);
 }
 
 void AudioOutputDispatcherImpl::StreamVolumeSet(AudioOutputProxy* stream_proxy,
                                                 double volume) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   AudioStreamMap::iterator it = proxy_to_physical_map_.find(stream_proxy);
   if (it != proxy_to_physical_map_.end()) {
     AudioOutputStream* physical_stream = it->second;
     physical_stream->SetVolume(volume);
+  audio_manager_->GetMediaInternals()->OnSetAudioStreamVolume(
+      this, g_stream_id_map[physical_stream], volume);
   }
 }
 
 void AudioOutputDispatcherImpl::StopStreamTask() {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
   if (pausing_streams_.empty())
     return;
 
   AudioOutputStream* stream = pausing_streams_.back();
   pausing_streams_.pop_back();
   idle_streams_.push_back(stream);
   close_timer_.Reset();
 }
 
+void AudioOutputDispatcherImpl::LogCloseStream(AudioOutputStream* stream) {
+    audio_manager_->GetMediaInternals()->OnSetAudioStreamStatus(
+          this, g_stream_id_map[stream], "closed");
+    audio_manager_->GetMediaInternals()->OnDeleteAudioStream(
+          this, g_stream_id_map[stream]);
+}
+
 void AudioOutputDispatcherImpl::CloseStream(AudioOutputProxy* stream_proxy) {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
   while (!pausing_streams_.empty()) {
     idle_streams_.push_back(pausing_streams_.back());
     pausing_streams_.pop_back();
   }
 
   DCHECK_GT(paused_proxies_, 0u);
   paused_proxies_--;
 
   while (idle_streams_.size() > paused_proxies_) {
     idle_streams_.back()->Close();
+    LogCloseStream(idle_streams_.back());
     idle_streams_.pop_back();
   }
 }
 
 void AudioOutputDispatcherImpl::Shutdown() {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
   // Cancel any pending tasks to close paused streams or create new ones.
   weak_this_.InvalidateWeakPtrs();
 
   // No AudioOutputProxy objects should hold a reference to us when we get
   // to this stage.
   DCHECK(HasOneRef()) << "Only the AudioManager should hold a reference";
 
   AudioOutputStreamList::iterator it = idle_streams_.begin();
-  for (; it != idle_streams_.end(); ++it)
+  for (; it != idle_streams_.end(); ++it) {
     (*it)->Close();
+    LogCloseStream(*it);
+  }
   idle_streams_.clear();
 
   it = pausing_streams_.begin();
-  for (; it != pausing_streams_.end(); ++it)
+  for (; it != pausing_streams_.end(); ++it) {
     (*it)->Close();
+    LogCloseStream(*it);
+  }
   pausing_streams_.clear();
 }
 
 bool AudioOutputDispatcherImpl::CreateAndOpenStream() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   AudioOutputStream* stream = audio_manager_->MakeAudioOutputStream(
       params_, output_device_id_, input_device_id_);
   if (!stream)
     return false;
 
   if (!stream->Open()) {
     stream->Close();
     return false;
   }
+
+  g_stream_id_map[stream] = g_stream_id;
+  audio_manager_->GetMediaInternals()->OnAudioStreamCreated(
+      this, g_stream_id++, params_, input_device_id_);
+
   idle_streams_.push_back(stream);
   return true;
 }
 
 // This method is called by |close_timer_|.
 void AudioOutputDispatcherImpl::ClosePendingStreams() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   while (!idle_streams_.empty()) {
     idle_streams_.back()->Close();
+    LogCloseStream(idle_streams_.back());
     idle_streams_.pop_back();
   }
 }
 
 }  // namespace media