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

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

Issue 1214883004: Fixed the audio backgrounding bug (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Implemented nick's suggestion Created 5 years, 4 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/logging.h"
10 #include "base/memory/shared_memory.h" 10 #include "base/memory/shared_memory.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 bool is_playing, 54 bool is_playing,
55 int render_view_id) { 55 int render_view_id) {
56 DCHECK_CURRENTLY_ON(BrowserThread::IO); 56 DCHECK_CURRENTLY_ON(BrowserThread::IO);
57 if (render_view_id == MSG_ROUTING_NONE || !ResourceDispatcherHostImpl::Get()) 57 if (render_view_id == MSG_ROUTING_NONE || !ResourceDispatcherHostImpl::Get())
58 return; 58 return;
59 59
60 ResourceDispatcherHostImpl::Get()->OnAudioRenderHostStreamStateChanged( 60 ResourceDispatcherHostImpl::Get()->OnAudioRenderHostStreamStateChanged(
61 render_process_id, render_view_id, is_playing); 61 render_process_id, render_view_id, is_playing);
62 } 62 }
63 63
64 void NotifyRenderProcessHostThatAudioStateChanged(int render_process_id) {
65 DCHECK_CURRENTLY_ON(BrowserThread::UI);
66
67 RenderProcessHost* render_process_host =
68 RenderProcessHost::FromID(render_process_id);
69
70 if (render_process_host)
71 render_process_host->AudioStateChanged();
72 }
73
64 } // namespace 74 } // namespace
65 75
66 class AudioRendererHost::AudioEntry 76 class AudioRendererHost::AudioEntry
67 : public media::AudioOutputController::EventHandler { 77 : public media::AudioOutputController::EventHandler {
68 public: 78 public:
69 AudioEntry(AudioRendererHost* host, 79 AudioEntry(AudioRendererHost* host,
70 int stream_id, 80 int stream_id,
71 int render_frame_id, 81 int render_frame_id,
72 const media::AudioParameters& params, 82 const media::AudioParameters& params,
73 const std::string& output_device_id, 83 const std::string& output_device_id,
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 DCHECK_CURRENTLY_ON(BrowserThread::IO); 654 DCHECK_CURRENTLY_ON(BrowserThread::IO);
645 if (entry->playing() == is_playing) 655 if (entry->playing() == is_playing)
646 return; 656 return;
647 657
648 bool should_alert_resource_scheduler; 658 bool should_alert_resource_scheduler;
649 if (is_playing) { 659 if (is_playing) {
650 should_alert_resource_scheduler = 660 should_alert_resource_scheduler =
651 !RenderFrameHasActiveAudio(entry->render_frame_id()); 661 !RenderFrameHasActiveAudio(entry->render_frame_id());
652 entry->set_playing(true); 662 entry->set_playing(true);
653 base::AtomicRefCountInc(&num_playing_streams_); 663 base::AtomicRefCountInc(&num_playing_streams_);
664
665 // Inform the renderer host when audio starts playing for the first time.
gab 2015/08/04 19:40:24 s/renderer host/RenderProcessHost/
sebsg 2015/08/06 21:11:47 Done.
666 if (base::AtomicRefCountIsOne(&num_playing_streams_)) {
667 BrowserThread::PostTask(
668 BrowserThread::UI, FROM_HERE,
669 base::Bind(&NotifyRenderProcessHostThatAudioStateChanged,
670 render_process_id_));
671 }
654 } else { 672 } else {
655 entry->set_playing(false); 673 entry->set_playing(false);
656 should_alert_resource_scheduler = 674 should_alert_resource_scheduler =
657 !RenderFrameHasActiveAudio(entry->render_frame_id()); 675 !RenderFrameHasActiveAudio(entry->render_frame_id());
658 base::AtomicRefCountDec(&num_playing_streams_); 676
677 // Inform the renderer when there is no more audio playing.
gab 2015/08/04 19:40:24 s/renderer/RenderProcessHost/
sebsg 2015/08/06 21:11:47 Done.
678 if (!base::AtomicRefCountDec(&num_playing_streams_)) {
679 BrowserThread::PostTask(
680 BrowserThread::UI, FROM_HERE,
681 base::Bind(&NotifyRenderProcessHostThatAudioStateChanged,
682 render_process_id_));
683 }
659 } 684 }
660 685
661 if (should_alert_resource_scheduler && ResourceDispatcherHostImpl::Get()) { 686 if (should_alert_resource_scheduler && ResourceDispatcherHostImpl::Get()) {
662 BrowserThread::PostTaskAndReplyWithResult( 687 BrowserThread::PostTaskAndReplyWithResult(
663 BrowserThread::UI, FROM_HERE, 688 BrowserThread::UI, FROM_HERE,
664 base::Bind(&RenderFrameIdToRenderViewId, render_process_id_, 689 base::Bind(&RenderFrameIdToRenderViewId, render_process_id_,
665 entry->render_frame_id()), 690 entry->render_frame_id()),
666 base::Bind(&NotifyResourceDispatcherOfAudioStateChange, 691 base::Bind(&NotifyResourceDispatcherOfAudioStateChange,
667 render_process_id_, is_playing)); 692 render_process_id_, is_playing));
668 } 693 }
669 } 694 }
670 695
671 bool AudioRendererHost::HasActiveAudio() { 696 bool AudioRendererHost::HasActiveAudio() {
672 return !base::AtomicRefCountIsZero(&num_playing_streams_); 697 return !base::AtomicRefCountIsZero(&num_playing_streams_);
673 } 698 }
674 699
675 bool AudioRendererHost::RenderFrameHasActiveAudio(int render_frame_id) const { 700 bool AudioRendererHost::RenderFrameHasActiveAudio(int render_frame_id) const {
676 for (AudioEntryMap::const_iterator it = audio_entries_.begin(); 701 for (AudioEntryMap::const_iterator it = audio_entries_.begin();
677 it != audio_entries_.end(); 702 it != audio_entries_.end();
678 ++it) { 703 ++it) {
679 AudioEntry* entry = it->second; 704 AudioEntry* entry = it->second;
680 if (entry->render_frame_id() == render_frame_id && entry->playing()) 705 if (entry->render_frame_id() == render_frame_id && entry->playing())
681 return true; 706 return true;
682 } 707 }
683 return false; 708 return false;
684 } 709 }
685 710
686 } // namespace content 711 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698