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

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: Removed an unnecessary atomic operation Created 5 years, 5 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 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 DCHECK_CURRENTLY_ON(BrowserThread::IO); 644 DCHECK_CURRENTLY_ON(BrowserThread::IO);
645 if (entry->playing() == is_playing) 645 if (entry->playing() == is_playing)
646 return; 646 return;
647 647
648 bool should_alert_resource_scheduler; 648 bool should_alert_resource_scheduler;
649 if (is_playing) { 649 if (is_playing) {
650 should_alert_resource_scheduler = 650 should_alert_resource_scheduler =
651 !RenderFrameHasActiveAudio(entry->render_frame_id()); 651 !RenderFrameHasActiveAudio(entry->render_frame_id());
652 entry->set_playing(true); 652 entry->set_playing(true);
653 base::AtomicRefCountInc(&num_playing_streams_); 653 base::AtomicRefCountInc(&num_playing_streams_);
654
655 // If it's the first audio stream to start for this renderer.
DaleCurtis 2015/06/29 22:44:23 Comment doesn't add much value, explain why instea
sebsg 2015/07/02 12:58:08 Done.
656 if (base::AtomicRefCountIsOne(&num_playing_streams_)) {
657 RenderProcessHost* render_process_host =
658 RenderProcessHost::FromID(render_process_id_);
659
660 BrowserThread::PostTask(
661 BrowserThread::UI, FROM_HERE,
662 base::Bind(&RenderProcessHost::AudioStarted,
663 base::Unretained(render_process_host)));
gab 2015/06/30 13:41:40 base::Unretained() here is incorrect because there
DaleCurtis 2015/06/30 16:34:35 Oops, thanks for catching this. The last method is
sebsg 2015/07/02 12:58:08 Done.
sebsg 2015/07/02 12:58:08 Done.
664 }
654 } else { 665 } else {
655 entry->set_playing(false); 666 entry->set_playing(false);
656 should_alert_resource_scheduler = 667 should_alert_resource_scheduler =
657 !RenderFrameHasActiveAudio(entry->render_frame_id()); 668 !RenderFrameHasActiveAudio(entry->render_frame_id());
658 base::AtomicRefCountDec(&num_playing_streams_); 669
670 // If it was the last audio stream playing for this renderer.
DaleCurtis 2015/06/29 22:44:23 Ditto.
sebsg 2015/07/02 12:58:08 Done.
671 if (!base::AtomicRefCountDec(&num_playing_streams_)) {
672 RenderProcessHost* render_process_host =
673 RenderProcessHost::FromID(render_process_id_);
674
675 BrowserThread::PostTask(
676 BrowserThread::UI, FROM_HERE,
677 base::Bind(&RenderProcessHost::AudioStopped,
678 base::Unretained(render_process_host)));
679 }
659 } 680 }
660 681
661 if (should_alert_resource_scheduler && ResourceDispatcherHostImpl::Get()) { 682 if (should_alert_resource_scheduler && ResourceDispatcherHostImpl::Get()) {
662 BrowserThread::PostTaskAndReplyWithResult( 683 BrowserThread::PostTaskAndReplyWithResult(
663 BrowserThread::UI, FROM_HERE, 684 BrowserThread::UI, FROM_HERE,
664 base::Bind(&RenderFrameIdToRenderViewId, render_process_id_, 685 base::Bind(&RenderFrameIdToRenderViewId, render_process_id_,
665 entry->render_frame_id()), 686 entry->render_frame_id()),
666 base::Bind(&NotifyResourceDispatcherOfAudioStateChange, 687 base::Bind(&NotifyResourceDispatcherOfAudioStateChange,
667 render_process_id_, is_playing)); 688 render_process_id_, is_playing));
668 } 689 }
669 } 690 }
670 691
671 bool AudioRendererHost::HasActiveAudio() { 692 bool AudioRendererHost::HasActiveAudio() {
672 return !base::AtomicRefCountIsZero(&num_playing_streams_); 693 return !base::AtomicRefCountIsZero(&num_playing_streams_);
673 } 694 }
674 695
675 bool AudioRendererHost::RenderFrameHasActiveAudio(int render_frame_id) const { 696 bool AudioRendererHost::RenderFrameHasActiveAudio(int render_frame_id) const {
676 for (AudioEntryMap::const_iterator it = audio_entries_.begin(); 697 for (AudioEntryMap::const_iterator it = audio_entries_.begin();
677 it != audio_entries_.end(); 698 it != audio_entries_.end();
678 ++it) { 699 ++it) {
679 AudioEntry* entry = it->second; 700 AudioEntry* entry = it->second;
680 if (entry->render_frame_id() == render_frame_id && entry->playing()) 701 if (entry->render_frame_id() == render_frame_id && entry->playing())
681 return true; 702 return true;
682 } 703 }
683 return false; 704 return false;
684 } 705 }
685 706
686 } // namespace content 707 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698