Add audio signal to the ResourceScheduler.

content/browser/renderer_host/media/audio_renderer_host.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 "content/browser/renderer_host/media/audio_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/shared_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/process/process.h"
 #include "content/browser/browser_main_loop.h"
+#include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/media/audio_stream_monitor.h"
 #include "content/browser/media/capture/audio_mirroring_manager.h"
 #include "content/browser/media/media_internals.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
 #include "content/browser/renderer_host/media/audio_sync_reader.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/common/media/audio_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/media_observer.h"
 #include "content/public/common/content_switches.h"
@@ skipping 227 matching lines @@
 
   Send(new AudioMsg_NotifyStreamCreated(
       entry->stream_id(), foreign_memory_handle, socket_descriptor,
       entry->shared_memory()->requested_size()));
 }
 
 void AudioRendererHost::DoNotifyStreamStateChanged(int stream_id,
                                                    bool is_playing) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-  AudioEntry* const entry = LookupById(stream_id);
+  AudioEntry* const entry(LookupById(stream_id));
   if (!entry)
     return;
 
   Send(new AudioMsg_NotifyStreamStateChanged(
       stream_id,
       is_playing ? media::AudioOutputIPCDelegate::kPlaying
                  : media::AudioOutputIPCDelegate::kPaused));
 
   if (is_playing) {
     AudioStreamMonitor::StartMonitoringStream(
         render_process_id_,
         entry->render_frame_id(),
         entry->stream_id(),
         base::Bind(&media::AudioOutputController::ReadCurrentPowerAndClip,
                    entry->controller()));
-    // TODO(dalecurtis): See about using AudioStreamMonitor instead.
-    if (!entry->playing()) {
-      entry->set_playing(true);
-      base::AtomicRefCountInc(&num_playing_streams_);
-    }
   } else {
     AudioStreamMonitor::StopMonitoringStream(
         render_process_id_, entry->render_frame_id(), entry->stream_id());
-    // TODO(dalecurtis): See about using AudioStreamMonitor instead.
-    if (entry->playing()) {
-      entry->set_playing(false);
-      base::AtomicRefCountDec(&num_playing_streams_);
-    }
   }
+  UpdateNumPlayingStreams(entry, is_playing);
 }
 
 RenderViewHost::AudioOutputControllerList
 AudioRendererHost::DoGetOutputControllers(int render_view_id) const {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   RenderViewHost::AudioOutputControllerList controllers;
   AudioEntryMap::const_iterator it = audio_entries_.begin();
   for (; it != audio_entries_.end(); ++it) {
     AudioEntry* entry = it->second;
@@ skipping 147 matching lines @@
     mirroring_manager_->RemoveDiverter(controller);
   controller->Close(
       base::Bind(&AudioRendererHost::DeleteEntry, this, base::Passed(&entry)));
   audio_log_->OnClosed(stream_id);
 }
 
 void AudioRendererHost::DeleteEntry(scoped_ptr<AudioEntry> entry) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   AudioStreamMonitor::StopMonitoringStream(
       render_process_id_, entry->render_frame_id(), entry->stream_id());
-  if (entry->playing())
-    base::AtomicRefCountDec(&num_playing_streams_);
+  UpdateNumPlayingStreams(entry.get(), false);
 }
 
 void AudioRendererHost::ReportErrorAndClose(int stream_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // Make sure this isn't a stray callback executing after the stream has been
   // closed, so error notifications aren't sent after clients believe the stream
   // is closed.
   if (!LookupById(stream_id))
     return;
 
   SendErrorMessage(stream_id);
 
   audio_log_->OnError(stream_id);
   OnCloseStream(stream_id);
 }
 
 AudioRendererHost::AudioEntry* AudioRendererHost::LookupById(int stream_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   AudioEntryMap::const_iterator i = audio_entries_.find(stream_id);
   return i != audio_entries_.end() ? i->second : NULL;
 }
 
+void AudioRendererHost::UpdateNumPlayingStreams(AudioEntry* entry,
+                                                bool is_playing) {
+  if (entry->playing() != is_playing) {
+    entry->set_playing(is_playing);
+    if (is_playing) {

[DaleCurtis, 2014/09/19 00:42:39]

no {} for single line statements.

[aiolos (Not reviewing), 2014/09/19 00:52:46]

Done.

+      base::AtomicRefCountInc(&num_playing_streams_);
+    } else {
+      base::AtomicRefCountDec(&num_playing_streams_);
+    }
+
+    if (is_playing || !RenderViewHasActiveAudio(entry->render_view_id())) {
+      DCHECK_CURRENTLY_ON(BrowserThread::IO);

[DaleCurtis, 2014/09/19 00:42:38]

Why here? Can this just go at the top like elsewhere?

[aiolos (Not reviewing), 2014/09/19 00:52:46]

Done.

+      ResourceDispatcherHostImpl::Get()->OnAudioRenderHostStreamStateChanged(
+          render_process_id_, entry->render_view_id(), is_playing);
+    }
+  }
+}
+
 bool AudioRendererHost::HasActiveAudio() {
   return !base::AtomicRefCountIsZero(&num_playing_streams_);
 }
 
+bool AudioRendererHost::RenderViewHasActiveAudio(int render_view_id) {
+  AudioEntryMap::const_iterator it = audio_entries_.begin();

[DaleCurtis, 2014/09/19 00:42:39]

Assign within for?

[aiolos (Not reviewing), 2014/09/19 00:52:45]

Done. Also changed another iterator in the code that followed the same pattern.

+  for (; it != audio_entries_.end(); ++it) {
+    AudioEntry* entry = it->second;
+    if (entry->render_view_id() == render_view_id && entry->playing()) {

[DaleCurtis, 2014/09/19 00:42:39]

No {} again.

[aiolos (Not reviewing), 2014/09/19 00:52:45]

Done.

+      return true;
+    }
+  }
+  return false;
+}
+
 }  // namespace content