Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(687)

Side by Side Diff: content/browser/renderer_host/media/audio_renderer_host.cc

Issue 562273008: Add audio signal to the ResourceScheduler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/media/audio_renderer_host.h" 5 #include "content/browser/renderer_host/media/audio_renderer_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/logging.h"
9 #include "base/memory/shared_memory.h" 10 #include "base/memory/shared_memory.h"
10 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
11 #include "base/process/process.h" 12 #include "base/process/process.h"
12 #include "content/browser/browser_main_loop.h" 13 #include "content/browser/browser_main_loop.h"
14 #include "content/browser/loader/resource_dispatcher_host_impl.h"
13 #include "content/browser/media/audio_stream_monitor.h" 15 #include "content/browser/media/audio_stream_monitor.h"
14 #include "content/browser/media/capture/audio_mirroring_manager.h" 16 #include "content/browser/media/capture/audio_mirroring_manager.h"
15 #include "content/browser/media/media_internals.h" 17 #include "content/browser/media/media_internals.h"
16 #include "content/browser/renderer_host/media/audio_input_device_manager.h" 18 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
17 #include "content/browser/renderer_host/media/audio_sync_reader.h" 19 #include "content/browser/renderer_host/media/audio_sync_reader.h"
18 #include "content/browser/renderer_host/media/media_stream_manager.h" 20 #include "content/browser/renderer_host/media/media_stream_manager.h"
19 #include "content/common/media/audio_messages.h" 21 #include "content/common/media/audio_messages.h"
20 #include "content/public/browser/content_browser_client.h" 22 #include "content/public/browser/content_browser_client.h"
21 #include "content/public/browser/media_observer.h" 23 #include "content/public/browser/media_observer.h"
22 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 is_playing ? media::AudioOutputIPCDelegate::kPlaying 268 is_playing ? media::AudioOutputIPCDelegate::kPlaying
267 : media::AudioOutputIPCDelegate::kPaused)); 269 : media::AudioOutputIPCDelegate::kPaused));
268 270
269 if (is_playing) { 271 if (is_playing) {
270 AudioStreamMonitor::StartMonitoringStream( 272 AudioStreamMonitor::StartMonitoringStream(
271 render_process_id_, 273 render_process_id_,
272 entry->render_frame_id(), 274 entry->render_frame_id(),
273 entry->stream_id(), 275 entry->stream_id(),
274 base::Bind(&media::AudioOutputController::ReadCurrentPowerAndClip, 276 base::Bind(&media::AudioOutputController::ReadCurrentPowerAndClip,
275 entry->controller())); 277 entry->controller()));
276 // TODO(dalecurtis): See about using AudioStreamMonitor instead.
277 if (!entry->playing()) {
278 entry->set_playing(true);
279 base::AtomicRefCountInc(&num_playing_streams_);
280 }
281 } else { 278 } else {
282 AudioStreamMonitor::StopMonitoringStream( 279 AudioStreamMonitor::StopMonitoringStream(
283 render_process_id_, entry->render_frame_id(), entry->stream_id()); 280 render_process_id_, entry->render_frame_id(), entry->stream_id());
284 // TODO(dalecurtis): See about using AudioStreamMonitor instead.
285 if (entry->playing()) {
286 entry->set_playing(false);
287 base::AtomicRefCountDec(&num_playing_streams_);
288 }
289 } 281 }
282 UpdateNumPlayingStreams(entry, is_playing);
290 } 283 }
291 284
292 RenderViewHost::AudioOutputControllerList 285 RenderViewHost::AudioOutputControllerList
293 AudioRendererHost::DoGetOutputControllers(int render_view_id) const { 286 AudioRendererHost::DoGetOutputControllers(int render_view_id) const {
294 DCHECK_CURRENTLY_ON(BrowserThread::IO); 287 DCHECK_CURRENTLY_ON(BrowserThread::IO);
295 288
296 RenderViewHost::AudioOutputControllerList controllers; 289 RenderViewHost::AudioOutputControllerList controllers;
297 AudioEntryMap::const_iterator it = audio_entries_.begin(); 290 for (AudioEntryMap::const_iterator it = audio_entries_.begin();
298 for (; it != audio_entries_.end(); ++it) { 291 it != audio_entries_.end();
292 ++it) {
299 AudioEntry* entry = it->second; 293 AudioEntry* entry = it->second;
300 if (entry->render_view_id() == render_view_id) 294 if (entry->render_view_id() == render_view_id)
301 controllers.push_back(entry->controller()); 295 controllers.push_back(entry->controller());
302 } 296 }
303 297
304 return controllers; 298 return controllers;
305 } 299 }
306 300
307 /////////////////////////////////////////////////////////////////////////////// 301 ///////////////////////////////////////////////////////////////////////////////
308 // IPC Messages handler 302 // IPC Messages handler
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 mirroring_manager_->RemoveDiverter(controller); 441 mirroring_manager_->RemoveDiverter(controller);
448 controller->Close( 442 controller->Close(
449 base::Bind(&AudioRendererHost::DeleteEntry, this, base::Passed(&entry))); 443 base::Bind(&AudioRendererHost::DeleteEntry, this, base::Passed(&entry)));
450 audio_log_->OnClosed(stream_id); 444 audio_log_->OnClosed(stream_id);
451 } 445 }
452 446
453 void AudioRendererHost::DeleteEntry(scoped_ptr<AudioEntry> entry) { 447 void AudioRendererHost::DeleteEntry(scoped_ptr<AudioEntry> entry) {
454 DCHECK_CURRENTLY_ON(BrowserThread::IO); 448 DCHECK_CURRENTLY_ON(BrowserThread::IO);
455 AudioStreamMonitor::StopMonitoringStream( 449 AudioStreamMonitor::StopMonitoringStream(
456 render_process_id_, entry->render_frame_id(), entry->stream_id()); 450 render_process_id_, entry->render_frame_id(), entry->stream_id());
457 if (entry->playing()) 451 UpdateNumPlayingStreams(entry.get(), false);
458 base::AtomicRefCountDec(&num_playing_streams_);
459 } 452 }
460 453
461 void AudioRendererHost::ReportErrorAndClose(int stream_id) { 454 void AudioRendererHost::ReportErrorAndClose(int stream_id) {
462 DCHECK_CURRENTLY_ON(BrowserThread::IO); 455 DCHECK_CURRENTLY_ON(BrowserThread::IO);
463 456
464 // Make sure this isn't a stray callback executing after the stream has been 457 // Make sure this isn't a stray callback executing after the stream has been
465 // closed, so error notifications aren't sent after clients believe the stream 458 // closed, so error notifications aren't sent after clients believe the stream
466 // is closed. 459 // is closed.
467 if (!LookupById(stream_id)) 460 if (!LookupById(stream_id))
468 return; 461 return;
469 462
470 SendErrorMessage(stream_id); 463 SendErrorMessage(stream_id);
471 464
472 audio_log_->OnError(stream_id); 465 audio_log_->OnError(stream_id);
473 OnCloseStream(stream_id); 466 OnCloseStream(stream_id);
474 } 467 }
475 468
476 AudioRendererHost::AudioEntry* AudioRendererHost::LookupById(int stream_id) { 469 AudioRendererHost::AudioEntry* AudioRendererHost::LookupById(int stream_id) {
477 DCHECK_CURRENTLY_ON(BrowserThread::IO); 470 DCHECK_CURRENTLY_ON(BrowserThread::IO);
478 471
479 AudioEntryMap::const_iterator i = audio_entries_.find(stream_id); 472 AudioEntryMap::const_iterator i = audio_entries_.find(stream_id);
480 return i != audio_entries_.end() ? i->second : NULL; 473 return i != audio_entries_.end() ? i->second : NULL;
481 } 474 }
482 475
476 void AudioRendererHost::UpdateNumPlayingStreams(AudioEntry* entry,
477 bool is_playing) {
478 DCHECK_CURRENTLY_ON(BrowserThread::IO);
479 if (entry->playing() == is_playing)
480 return;
481
482 bool should_alert_resource_scheduler;
483 if (is_playing) {
484 should_alert_resource_scheduler =
485 !RenderViewHasActiveAudio(entry->render_view_id());
486 entry->set_playing(true);
487 base::AtomicRefCountInc(&num_playing_streams_);
488 } else {
489 entry->set_playing(false);
490 should_alert_resource_scheduler =
491 !RenderViewHasActiveAudio(entry->render_view_id());
492 base::AtomicRefCountDec(&num_playing_streams_);
493 }
494
495 if (should_alert_resource_scheduler && ResourceDispatcherHostImpl::Get()) {
496 ResourceDispatcherHostImpl::Get()->OnAudioRenderHostStreamStateChanged(
497 render_process_id_, entry->render_view_id(), is_playing);
498 }
499 }
500
483 bool AudioRendererHost::HasActiveAudio() { 501 bool AudioRendererHost::HasActiveAudio() {
484 return !base::AtomicRefCountIsZero(&num_playing_streams_); 502 return !base::AtomicRefCountIsZero(&num_playing_streams_);
485 } 503 }
486 504
505 bool AudioRendererHost::RenderViewHasActiveAudio(int render_view_id) const {
506 for (AudioEntryMap::const_iterator it = audio_entries_.begin();
507 it != audio_entries_.end();
508 ++it) {
509 AudioEntry* entry = it->second;
510 if (entry->render_view_id() == render_view_id && entry->playing())
511 return true;
512 }
513 return false;
514 }
515
487 } // namespace content 516 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/audio_renderer_host.h ('k') | content/browser/renderer_host/render_view_host_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698