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

Unified Diff: content/browser/media/session/audio_focus_manager.cc

Issue 2291163002: Let MediaSession store duck state instead of volume multiplier (Closed)
Patch Set: addressed Anton's comments Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/media/session/audio_focus_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/session/audio_focus_manager.cc
diff --git a/content/browser/media/session/audio_focus_manager.cc b/content/browser/media/session/audio_focus_manager.cc
index c3589efeea5e5d651d32ecaf8909b409a736f293..4ff3491de482542efe4781d46d153e896df8eef4 100644
--- a/content/browser/media/session/audio_focus_manager.cc
+++ b/content/browser/media/session/audio_focus_manager.cc
@@ -9,13 +9,6 @@
namespace content {
-namespace {
-
-const double kDuckingVolumeMultiplier = 0.2;
-const double kDefaultVolumeMultiplier = 1.0;
-
-} // anonymous namespace
-
AudioFocusManager::AudioFocusEntry::AudioFocusEntry(
WebContents* web_contents,
AudioFocusManager* audio_focus_manager,
@@ -93,18 +86,14 @@ void AudioFocusManager::MaybeStartDucking() const {
if (TransientMayDuckEntriesCount() != 1 || !focus_entry_)
return;
- // TODO(mlamouri): add StartDuck to MediaSession.
- MediaSession::Get(focus_entry_->web_contents())
- ->SetVolumeMultiplier(kDuckingVolumeMultiplier);
+ MediaSession::Get(focus_entry_->web_contents())->StartDucking();
}
void AudioFocusManager::MaybeStopDucking() const {
if (TransientMayDuckEntriesCount() != 0 || !focus_entry_)
return;
- // TODO(mlamouri): add StopDuck to MediaSession.
- MediaSession::Get(focus_entry_->web_contents())
- ->SetVolumeMultiplier(kDefaultVolumeMultiplier);
+ MediaSession::Get(focus_entry_->web_contents())->StopDucking();
}
int AudioFocusManager::TransientMayDuckEntriesCount() const {
@@ -118,8 +107,7 @@ void AudioFocusManager::MaybeRemoveTransientEntry(WebContents* web_contents) {
void AudioFocusManager::MaybeRemoveFocusEntry(WebContents* web_contents) {
if (focus_entry_ && focus_entry_->web_contents() == web_contents) {
- MediaSession::Get(focus_entry_->web_contents())
- ->SetVolumeMultiplier(kDefaultVolumeMultiplier);
+ MediaSession::Get(focus_entry_->web_contents())->StopDucking();
focus_entry_.reset();
}
}
« no previous file with comments | « no previous file | content/browser/media/session/audio_focus_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698