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

Unified Diff: content/browser/media/session/media_session.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
Index: content/browser/media/session/media_session.cc
diff --git a/content/browser/media/session/media_session.cc b/content/browser/media/session/media_session.cc
index 79df56701892976eb46c99079b083a886f0331b1..c95ab3b5784069a8ab41a26600c3c976d7751188 100644
--- a/content/browser/media/session/media_session.cc
+++ b/content/browser/media/session/media_session.cc
@@ -16,6 +16,7 @@ namespace content {
namespace {
const double kDefaultVolumeMultiplier = 1.0;
+const double kDuckingVolumeMultiplier = 0.2;
} // anonymous namespace
@@ -70,7 +71,7 @@ void MediaSession::SetMetadata(const MediaMetadata& metadata) {
bool MediaSession::AddPlayer(MediaSessionObserver* observer,
int player_id,
media::MediaContentType media_content_type) {
- observer->OnSetVolumeMultiplier(player_id, volume_multiplier_);
+ observer->OnSetVolumeMultiplier(player_id, GetVolumeMultiplier());
// Determine the audio focus type required for playing the new player.
// TODO(zqzhang): handle duckable and uncontrollable.
@@ -206,10 +207,27 @@ void MediaSession::Stop(SuspendType suspend_type) {
AbandonSystemAudioFocusIfNeeded();
}
-void MediaSession::SetVolumeMultiplier(double volume_multiplier) {
- volume_multiplier_ = volume_multiplier;
+void MediaSession::StartDucking() {
+ if (is_ducking_)
+ return;
+ is_ducking_ = true;
+ UpdateVolumeMultiplier();
+}
+
+void MediaSession::StopDucking() {
+ if (!is_ducking_)
+ return;
+ is_ducking_ = false;
+ UpdateVolumeMultiplier();
+}
+
+void MediaSession::UpdateVolumeMultiplier() {
for (const auto& it : players_)
- it.observer->OnSetVolumeMultiplier(it.player_id, volume_multiplier_);
+ it.observer->OnSetVolumeMultiplier(it.player_id, GetVolumeMultiplier());
+}
+
+double MediaSession::GetVolumeMultiplier() const {
+ return is_ducking_ ? kDuckingVolumeMultiplier : kDefaultVolumeMultiplier;
}
bool MediaSession::IsActive() const {
@@ -325,7 +343,7 @@ MediaSession::MediaSession(WebContents* web_contents)
audio_focus_state_(State::INACTIVE),
audio_focus_type_(
AudioFocusManager::AudioFocusType::GainTransientMayDuck),
- volume_multiplier_(kDefaultVolumeMultiplier) {}
+ is_ducking_(false) {}
void MediaSession::Initialize() {
delegate_ = MediaSessionDelegate::Create(this);
« no previous file with comments | « content/browser/media/session/media_session.h ('k') | content/browser/media/session/media_session_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698