Changeset 125337 in webkit

Timestamp:

Aug 10, 2012, 4:50:46 PM (13 years ago)

Author:

jer.noble@apple.com

Message:

no timeupdate events emitted for media controller
​https://bugs.webkit.org/show_bug.cgi?id=93745

Reviewed by Eric Carlson.

Source/WebCore:

Generate timeupdate events while the current position is changing.

Test: media/media-controller-timeupdate.html

Enforce the spec requirement that the timeupdate event is fired no more often
than every 250ms.

• html/MediaController.cpp:

(MediaController::scheduleTimeupdateEvent):

Add a periodic firing timer to generate timeupdate events during playback.

• html/MediaController.cpp:

(MediaController::startTimeupdateTimer):
(MediaController::timeupdateTimerFired):

• html/MediaController.cpp:

(MediaController::MediaController): Initialize m_previousTimeupdateTime.
(MediaController::setCurrentTime): Call scheduleTimeUpdateEvent.
(MediaController::updatePlaybackState): Start and stop the timeupdate timer.

• html/MediaController.h:

LayoutTests:

New test checking that the timeupdate event is emmitted correctly during playback.

• media/media-controller-timeupdate-expected.txt: Added.
• media/media-controller-timeupdate.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-controller-timeupdate-expected.txt (added)
• LayoutTests/media/media-controller-timeupdate.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/MediaController.cpp (modified) (4 diffs)
• Source/WebCore/html/MediaController.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-10  Jer Noble  <jer.noble@apple.com>
+
+        no timeupdate events emitted for media controller
+        https://bugs.webkit.org/show_bug.cgi?id=93745
+
+        Reviewed by Eric Carlson.
+
+        New test checking that the timeupdate event is emmitted correctly during playback.
+
+        * media/media-controller-timeupdate-expected.txt: Added.
+        * media/media-controller-timeupdate.html: Added.
+
 2012-08-09  Jeffrey Pfau  <jpfau@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-10  Jer Noble  <jer.noble@apple.com>
+
+        no timeupdate events emitted for media controller
+        https://bugs.webkit.org/show_bug.cgi?id=93745
+
+        Reviewed by Eric Carlson.
+
+        Generate timeupdate events while the current position is changing.
+
+        Test: media/media-controller-timeupdate.html
+
+        Enforce the spec requirement that the timeupdate event is fired no more often
+        than every 250ms.
+        * html/MediaController.cpp:
+        (MediaController::scheduleTimeupdateEvent):
+
+        Add a periodic firing timer to generate timeupdate events during playback.
+        * html/MediaController.cpp:
+        (MediaController::startTimeupdateTimer):
+        (MediaController::timeupdateTimerFired):
+
+        * html/MediaController.cpp:
+        (MediaController::MediaController): Initialize m_previousTimeupdateTime.
+        (MediaController::setCurrentTime): Call scheduleTimeUpdateEvent.
+        (MediaController::updatePlaybackState): Start and stop the timeupdate timer.
+        * html/MediaController.h:
+        
 2012-08-09  Jeffrey Pfau  <jpfau@apple.com>
 

trunk/Source/WebCore/html/MediaController.cpp

@@ -57 +57 @@
     , m_clock(Clock::create())
     , m_scriptExecutionContext(context)
+    , m_timeupdateTimer(this, &MediaController::timeupdateTimerFired)
+    , m_previousTimeupdateTime(0)
 {
 }
@@ -172 +174 @@
     for (size_t index = 0; index < m_mediaElements.size(); ++index)
         m_mediaElements[index]->seek(time, code);
+
+    scheduleTimeupdateEvent();
 }
 
@@ -396 +400 @@
         eventName = eventNames().waitingEvent;
         m_clock->stop();
+        m_timeupdateTimer.stop();
         break;
     case ENDED:
         eventName = eventNames().endedEvent;
         m_clock->stop();
+        m_timeupdateTimer.stop();
         break;
     case PLAYING:
         eventName = eventNames().playingEvent;
         m_clock->start();
+        startTimeupdateTimer();
         break;
     default:
@@ -606 +613 @@
 }
 
+// The spec says to fire periodic timeupdate events (those sent while playing) every
+// "15 to 250ms", we choose the slowest frequency
+static const double maxTimeupdateEventFrequency = 0.25;
+
+void MediaController::startTimeupdateTimer()
+{
+    if (m_timeupdateTimer.isActive())
+        return;
+
+    m_timeupdateTimer.startRepeating(maxTimeupdateEventFrequency);
+}
+
+void MediaController::timeupdateTimerFired(Timer<MediaController>*)
+{
+    scheduleTimeupdateEvent();
+}
+
+void MediaController::scheduleTimeupdateEvent()
+{
+    double now = WTF::currentTime();
+    double timedelta = now - m_previousTimeupdateTime;
+
+    if (timedelta < maxTimeupdateEventFrequency)
+        return;
+
+    scheduleEvent(eventNames().timeupdateEvent);
+    m_previousTimeupdateTime = now;
+}
+
 #endif

trunk/Source/WebCore/html/MediaController.h

@@ -126 +126 @@
     void clearPositionTimerFired(Timer<MediaController>*);
     bool hasEnded() const;
+    void scheduleTimeupdateEvent();
+    void timeupdateTimerFired(Timer<MediaController>*);
+    void startTimeupdateTimer();
 
     // EventTarget
@@ -153 +156 @@
     PassRefPtr<Clock> m_clock;
     ScriptExecutionContext* m_scriptExecutionContext;
+    Timer<MediaController> m_timeupdateTimer;
+    double m_previousTimeupdateTime;
 };