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 243 matching lines @@
       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());
+  }
+
+  if (entry->playing() != is_playing) {

[mmenke, 2014/09/18 14:12:42]

Suggest making a method:

AudioRendererHost::UpdatePlayingStreams(entry, is_playing) or somesuch, and move
this entire code block there (including the initial if statement).  Then can use
it in DeleteEntry, too.

     // TODO(dalecurtis): See about using AudioStreamMonitor instead.

[aiolos (Not reviewing), 2014/09/18 01:13:24]

Dale, I wasn't quite sure where this TODO should go. Should I move it?

[DaleCurtis, 2014/09/18 17:51:23]

Hmm, I guess it's not actually all that clear. You can just remove it.

[aiolos (Not reviewing), 2014/09/18 21:46:47]

Done.

-    if (entry->playing()) {
-      entry->set_playing(false);
+    entry->set_playing(is_playing);
+    if (is_playing) {
+      base::AtomicRefCountInc(&num_playing_streams_);
+    } else {
       base::AtomicRefCountDec(&num_playing_streams_);
     }
+    if (ResourceDispatcherHostImpl::Get()) {
+      BrowserThread::PostTask(

[DaleCurtis, 2014/09/18 17:51:23]

Does this need to be a PostTask? You're already on the IO thread.

[aiolos (Not reviewing), 2014/09/18 21:46:47]

Done.

+          BrowserThread::IO,
+          FROM_HERE,
+          base::Bind(
+              &ResourceDispatcherHostImpl::OnAudioRenderHostStreamStateChanged,
+              base::Unretained(ResourceDispatcherHostImpl::Get()),
+              render_process_id_, entry->render_view_id(), is_playing));

[mmenke, 2014/09/18 14:12:42]

Can't we have multiple playing streams per RenderView?

[DaleCurtis, 2014/09/18 17:51:24]

Yeah, this should probably just return HasActiveAudio() instead of is_playing.

[aiolos (Not reviewing), 2014/09/18 21:46:47]

Changed to check that we're actually changing the active audio state to avoid
extraneous signals as well.

+    }
   }
 }
 
 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) {
@@ skipping 148 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())
+  if (entry->playing()) {
     base::AtomicRefCountDec(&num_playing_streams_);
+    if (ResourceDispatcherHostImpl::Get()) {
+      BrowserThread::PostTask(
+          BrowserThread::IO,
+          FROM_HERE,
+          base::Bind(
+              &ResourceDispatcherHostImpl::OnAudioRenderHostStreamStateChanged,
+              base::Unretained(ResourceDispatcherHostImpl::Get()),
+              render_process_id_, entry->render_view_id(), false));

[mmenke, 2014/09/18 14:12:42]

Same here - if we have two playing entries for a single render view, this
doesn't work.

[DaleCurtis, 2014/09/18 17:51:23]

Ditto.

[aiolos (Not reviewing), 2014/09/18 21:46:48]

Done.

+    }
+  }
 }
 
 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;
 }
 
 bool AudioRendererHost::HasActiveAudio() {
   return !base::AtomicRefCountIsZero(&num_playing_streams_);
 }
 
 }  // namespace content