Changeset 168996 in webkit

Timestamp:

May 17, 2014 2:36:15 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Setting playback rate on video with media controller is not ignored.
​https://bugs.webkit.org/show_bug.cgi?id=129048

Patch by Piotr Grad <​p.grad@samsung.com> on 2014-05-17
Reviewed by Jer Noble.

Source/WebCore:
Replaced queries for m_playbackRate with effectivePlaybackRate()
which includes media controller playback rate.

Test: media/video-controller-child-rate.html

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::parseAttribute):

• html/HTMLMediaElement.h:

LayoutTests:

• media/video-controller-child-rate-expected.txt: Added.
• media/video-controller-child-rate.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-controller-child-rate-expected.txt (added)
• LayoutTests/media/video-controller-child-rate.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (11 diffs)
• Source/WebCore/html/HTMLMediaElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-05-17  Piotr Grad  <p.grad@samsung.com>
+
+        Setting playback rate on video with media controller is not ignored.
+        https://bugs.webkit.org/show_bug.cgi?id=129048
+
+        Reviewed by Jer Noble.
+
+        * media/video-controller-child-rate-expected.txt: Added.
+        * media/video-controller-child-rate.html: Added.
+
 2014-05-16  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-17  Piotr Grad  <p.grad@samsung.com>
+
+        Setting playback rate on video with media controller is not ignored.
+        https://bugs.webkit.org/show_bug.cgi?id=129048
+
+        Reviewed by Jer Noble.
+
+        Replaced queries for m_playbackRate with effectivePlaybackRate()
+        which includes media controller playback rate.
+
+        Test: media/video-controller-child-rate.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::parseAttribute):
+        * html/HTMLMediaElement.h:
+
 2014-05-16  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -2536 +2536 @@
         // Not too soon, use the cached time only if it hasn't expired.
         if (clockDelta < maximumDurationToCacheMediaTime) {
-            double adjustedCacheTime = m_cachedTime + (m_playbackRate * clockDelta);
+            double adjustedCacheTime = m_cachedTime + (effectivePlaybackRate() * clockDelta);
 
 #if LOG_CACHED_TIME_WARNINGS
@@ -2550 +2550 @@
     if (maximumDurationToCacheMediaTime && now > m_minimumClockTimeToUpdateCachedTime && m_cachedTime != MediaPlayer::invalidTime()) {
         double clockDelta = now - m_clockTimeAtLastCachedTimeUpdate;
-        double delta = m_cachedTime + (m_playbackRate * clockDelta) - m_player->currentTime();
+        double delta = m_cachedTime + (effectivePlaybackRate() * clockDelta) - m_player->currentTime();
         LOG(Media, "HTMLMediaElement::currentTime - cached time was %f seconds off of media time when it expired", delta);
     }
@@ -2616 +2616 @@
 }
 
+double HTMLMediaElement::effectivePlaybackRate() const
+{
+    return m_mediaController ? m_mediaController->playbackRate() : m_playbackRate;
+}
+
 double HTMLMediaElement::playbackRate() const
 {
@@ -2637 +2642 @@
 void HTMLMediaElement::updatePlaybackRate()
 {
-    double effectiveRate = m_mediaController ? m_mediaController->playbackRate() : m_playbackRate;
+    double effectiveRate = effectivePlaybackRate();
     if (m_player && potentiallyPlaying() && m_player->rate() != effectiveRate)
         m_player->setRate(effectiveRate);
@@ -2664 +2669 @@
     // The ended attribute must return true if the media element has ended 
     // playback and the direction of playback is forwards, and false otherwise.
-    return endedPlayback() && m_playbackRate > 0;
+    return endedPlayback() && effectivePlaybackRate() > 0;
 }
 
@@ -3101 +3106 @@
     ASSERT(m_player);
 
-    if (m_fragmentEndTime != MediaPlayer::invalidTime() && currentTime() >= m_fragmentEndTime && m_playbackRate > 0) {
+    if (m_fragmentEndTime != MediaPlayer::invalidTime() && currentTime() >= m_fragmentEndTime && effectivePlaybackRate() > 0) {
         m_fragmentEndTime = MediaPlayer::invalidTime();
         if (!m_mediaController && !m_paused) {
@@ -3111 +3116 @@
     scheduleTimeupdateEvent(true);
 
-    if (!m_playbackRate)
+    if (!effectivePlaybackRate())
         return;
 
@@ -4033 +4038 @@
     double now = currentTime();
     double dur = duration();
+    double playbackRate = effectivePlaybackRate();
     
     // When the current playback position reaches the end of the media resource then the user agent must follow these steps:
     if (!std::isnan(dur) && dur) {
         // If the media element has a loop attribute specified and does not have a current media controller,
-        if (loop() && !m_mediaController && m_playbackRate > 0) {
+        if (loop() && !m_mediaController && playbackRate > 0) {
             m_sentEndEvent = false;
             // then seek to the earliest possible position of the media resource and abort these steps when the direction of
@@ -4043 +4049 @@
             if (now >= dur)
                 seek(0);
-        } else if ((now <= 0 && m_playbackRate < 0) || (now >= dur && m_playbackRate > 0)) {
+        } else if ((now <= 0 && playbackRate < 0) || (now >= dur && playbackRate > 0)) {
             // If the media element does not have a current media controller, and the media element
             // has still ended playback and paused is false,
@@ -4353 +4359 @@
     // or the media element has a current media controller.
     double now = currentTime();
-    if (m_playbackRate > 0)
+    if (effectivePlaybackRate() > 0)
         return dur > 0 && now >= dur && (!loop() || m_mediaController);
 
     // or the current playback position is the earliest possible position and the direction 
     // of playback is backwards
-    if (m_playbackRate < 0)
+    if (effectivePlaybackRate() < 0)
         return now <= 0;
 
@@ -4461 +4467 @@
             // Set rate, muted before calling play in case they were set before the media engine was setup.
             // The media engine should just stash the rate and muted values since it isn't already playing.
-            m_player->setRate(m_playbackRate);
+            m_player->setRate(effectivePlaybackRate());
             m_player->setMuted(muted());
 

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -501 +501 @@
     void setNetworkState(MediaPlayer::NetworkState);
 
+    double effectivePlaybackRate() const;
+
     virtual Document* mediaPlayerOwningDocument() override;
     virtual void mediaPlayerNetworkStateChanged(MediaPlayer*) override;