Changeset 187257 in webkit

Timestamp:

Jul 23, 2015 3:06:56 PM (9 years ago)

Author:

mrajca@apple.com

Message:

Media Session: add support for ducking media elements ​https://bugs.webkit.org/show_bug.cgi?id=147089

Reviewed by Eric Carlson.

Test: media/session/transient-interruptions.html

• Modules/mediasession/MediaSession.cpp:

(WebCore::MediaSession::handleDuckInterruption): Duck the active media elements.
(WebCore::MediaSession::handleUnduckInterruption): Unduck the active media elements.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::updateVolume): Lower the volume of media elements to 25% when ducked (constant determined empirically).
(WebCore::HTMLMediaElement::setShouldDuck): Call updateVolume to change the volume of the underlying media player.

• html/HTMLMediaElement.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/session/transient-interruptions-expected.txt (added)
• LayoutTests/media/session/transient-interruptions.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediasession/MediaSession.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLMediaElement.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-07-19  Matt Rajca  <mrajca@apple.com>
+
+        Media Session: add support for ducking media elements
+        https://bugs.webkit.org/show_bug.cgi?id=147089
+
+        Reviewed by Eric Carlson.
+
+        * media/session/transient-interruptions-expected.txt: Added.
+        * media/session/transient-interruptions.html: Added.
+        * platform/mac/TestExpectations: Media Session support is disabled by default.
+
 2015-07-23  Devin Rousso  <drousso@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -997 +997 @@
 media/session/controls-existence.html
 media/session/default-session.html
+media/session/transient-interruptions.html
 
 # This test requires generation of progress events during loading

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-19  Matt Rajca  <mrajca@apple.com>
+
+        Media Session: add support for ducking media elements
+        https://bugs.webkit.org/show_bug.cgi?id=147089
+
+        Reviewed by Eric Carlson.
+
+        Test: media/session/transient-interruptions.html
+
+        * Modules/mediasession/MediaSession.cpp:
+        (WebCore::MediaSession::handleDuckInterruption): Duck the active media elements.
+        (WebCore::MediaSession::handleUnduckInterruption): Unduck the active media elements.
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::updateVolume): Lower the volume of media elements to 25% when ducked (constant determined empirically).
+        (WebCore::HTMLMediaElement::setShouldDuck): Call updateVolume to change the volume of the underlying media player.
+        * html/HTMLMediaElement.h:
+
 2015-07-23  Matt Rajca  <mrajca@apple.com>
 

trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp

@@ -241 +241 @@
 void MediaSession::handleDuckInterruption()
 {
-    // FIXME: Duck media elements.
+    for (auto* element : m_activeParticipatingElements)
+        element->setShouldDuck(true);
 
     m_currentState = State::Interrupted;
@@ -248 +249 @@
 void MediaSession::handleUnduckInterruption()
 {
-    // FIXME: Unduck media elements.
+    for (auto* element : m_activeParticipatingElements)
+        element->setShouldDuck(false);
 
     m_currentState = State::Active;

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -4653 +4653 @@
         }
 
+#if ENABLE(MEDIA_SESSION)
+        if (m_shouldDuck)
+            volumeMultiplier *= 0.25;
+#endif
+
         m_player->setMuted(shouldMute);
         m_player->setVolume(m_volume * volumeMultiplier);
@@ -6535 +6540 @@
 }
 
+void HTMLMediaElement::setShouldDuck(bool duck)
+{
+    if (m_shouldDuck == duck)
+        return;
+
+    m_shouldDuck = duck;
+    updateVolume();
+}
+
 #endif
 

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -428 +428 @@
     MediaSession* session() const;
     void setSession(MediaSession*);
+
+    void setShouldDuck(bool);
 #endif
 
@@ -823 +825 @@
     String m_kind;
     RefPtr<MediaSession> m_session;
+    bool m_shouldDuck { false };
 #endif