Diff
Modified: trunk/LayoutTests/ChangeLog (108405 => 108406)
--- trunk/LayoutTests/ChangeLog 2012-02-21 22:57:55 UTC (rev 108405)
+++ trunk/LayoutTests/ChangeLog 2012-02-21 23:28:00 UTC (rev 108406)
@@ -1,3 +1,16 @@
+2012-02-21 Victor Carbune <[email protected]>
+
+ Added relevant tests and functionality for supporting pause-on-exit
+ flag for a TextTrackCue.
+
+ https://bugs.webkit.org/show_bug.cgi?id=72173
+
+ Reviewed by Eric Carlson.
+
+ * media/track/captions-webvtt/simple-captions.vtt: Added.
+ * media/track/track-cues-pause-on-exit-expected.txt: Added.
+ * media/track/track-cues-pause-on-exit.html: Added.
+
2012-02-21 Csaba Osztrogonác <[email protected]>
[Qt] Unreviewed gardening. Typo fix.
Added: trunk/LayoutTests/media/track/captions-webvtt/simple-captions.vtt (0 => 108406)
--- trunk/LayoutTests/media/track/captions-webvtt/simple-captions.vtt (rev 0)
+++ trunk/LayoutTests/media/track/captions-webvtt/simple-captions.vtt 2012-02-21 23:28:00 UTC (rev 108406)
@@ -0,0 +1,17 @@
+WEBVTT
+
+0
+00:00:05.000 --> 00:00:05.200
+First cue
+
+1
+00:00:05.210 --> 00:00:05.400
+Lorem
+
+2
+00:00:05.410 --> 00:00:05.600
+ipsum
+
+3
+00:00:05.610 --> 00:00:05.700
+dolor
Added: trunk/LayoutTests/media/track/track-cues-pause-on-exit-expected.txt (0 => 108406)
--- trunk/LayoutTests/media/track/track-cues-pause-on-exit-expected.txt (rev 0)
+++ trunk/LayoutTests/media/track/track-cues-pause-on-exit-expected.txt 2012-02-21 23:28:00 UTC (rev 108406)
@@ -0,0 +1,28 @@
+Tests that the video is paused after cues that have pause-on-exit flag are processed
+
+EVENT(canplaythrough)
+EXPECTED (testTrack.track.cues.length == '4') OK
+
+RUN(video.play())
+EXPECTED (video.paused == 'false') OK
+
+EVENT(exit)
+EXPECTED (currentCue.id == '0') OK
+EXPECTED (video.paused == 'true') OK
+RUN(video.play())
+
+EVENT(exit)
+EXPECTED (currentCue.id == '1') OK
+EXPECTED (video.paused == 'false') OK
+
+EVENT(exit)
+EXPECTED (currentCue.id == '2') OK
+EXPECTED (video.paused == 'true') OK
+RUN(video.play())
+
+EVENT(exit)
+EXPECTED (currentCue.id == '3') OK
+EXPECTED (video.paused == 'false') OK
+EVENT(ended)
+END OF TEST
+
Added: trunk/LayoutTests/media/track/track-cues-pause-on-exit.html (0 => 108406)
--- trunk/LayoutTests/media/track/track-cues-pause-on-exit.html (rev 0)
+++ trunk/LayoutTests/media/track/track-cues-pause-on-exit.html 2012-02-21 23:28:00 UTC (rev 108406)
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <script src=""
+ <script src=""
+ <script>
+ var videoCanPlayThrough = false;
+ var trackLoaded = false;
+
+ var currentCue;
+ var currentCueNumber = 0;
+
+ function runTests()
+ {
+ if (!trackLoaded || !videoCanPlayThrough)
+ return;
+
+ testTrack = document.getElementById("testTrack");
+ testExpected("testTrack.track.cues.length", 4);
+
+ consoleWrite("");
+
+ for (var i = 0; i < testTrack.track.cues.length; ++i) {
+ testTrack.track.cues[i].pauseOnExit = (i % 2 == 0);
+ testTrack.track.cues[i].addEventListener('exit', cueExited);
+ }
+
+ run("video.play()");
+ testExpected("video.paused", false);
+ }
+
+ function cueExited(evt)
+ {
+ currentCue = evt.target;
+
+ consoleWrite("");
+ consoleWrite("EVENT("+evt.type+")");
+
+ testExpected("currentCue.id", currentCueNumber);
+ testExpected("video.paused", currentCueNumber % 2 == 0);
+
+ if (currentCueNumber % 2 == 0) {
+ run("video.play()");
+ }
+
+ currentCueNumber++;
+ }
+
+ function loaded()
+ {
+ trackLoaded = true;
+
+ runTests();
+ }
+
+ function bodyLoaded()
+ {
+ findMediaElement();
+ video.src = "" "../content/test");
+ }
+
+ waitForEvent('ended', endTest);
+
+ waitForEvent('canplaythrough', function() {
+ video.currentTime = 4.70;
+ videoCanPlayThrough = true;
+
+ runTests();
+ });
+
+ </script>
+ </head>
+ <body _onload_="bodyLoaded()">
+ <p>Tests that the video is paused after cues that have pause-on-exit flag are processed</p>
+ <video controls>
+ <track id="testTrack" src="" _onload_="loaded()" default>
+ </video>
+ </body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (108405 => 108406)
--- trunk/Source/WebCore/ChangeLog 2012-02-21 22:57:55 UTC (rev 108405)
+++ trunk/Source/WebCore/ChangeLog 2012-02-21 23:28:00 UTC (rev 108406)
@@ -1,3 +1,17 @@
+2012-02-21 Victor Carbune <[email protected]>
+
+ Added support for pause-on-exit flag on a TextTrackCue.
+ https://bugs.webkit.org/show_bug.cgi?id=72173
+
+ Reviewed by Eric Carlson.
+
+ Test: media/track/track-cues-pause-on-exit.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::updateActiveTextTrackCues): Implemented
+ support for pausing the video if the pause-on-exit flag is set on
+ a cue that is currently exiting.
+
2012-02-21 Kentaro Hara <[email protected]>
Enable the IDL attribute checker in all build systems
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (108405 => 108406)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2012-02-21 22:57:55 UTC (rev 108405)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2012-02-21 23:28:00 UTC (rev 108406)
@@ -1008,7 +1008,7 @@
// cues whose start times are greater than or equal to last time and whose
// end times are less than or equal to the current playback position.
// Otherwise, let missed cues be an empty list.
- if (lastTime >= 0 && m_lastSeekTime <= lastTime) {
+ if (lastTime >= 0 && m_lastSeekTime < movieTime) {
Vector<CueIntervalTree::IntervalType> potentiallySkippedCues =
m_cueTree.allOverlaps(m_cueTree.createInterval(lastTime, movieTime));
@@ -1016,7 +1016,8 @@
float cueStartTime = potentiallySkippedCues[i].low();
float cueEndTime = potentiallySkippedCues[i].high();
- if (cueStartTime > lastTime && cueEndTime < movieTime)
+ // Consider cues that may have been missed since the last seek time.
+ if (cueStartTime > max(m_lastSeekTime, lastTime) && cueEndTime < movieTime)
missedCues.append(potentiallySkippedCues[i]);
}
}
@@ -1034,17 +1035,20 @@
if (m_lastSeekTime <= lastTime)
scheduleTimeupdateEvent(false);
+ // Explicitly cache vector sizes, as their content is constant from here.
+ size_t currentCuesSize = currentCues.size();
+ size_t missedCuesSize = missedCues.size();
+ size_t previousCuesSize = previousCues.size();
+
// 6 - If all of the cues in current cues have their text track cue active
// flag set, none of the cues in other cues have their text track cue active
// flag set, and missed cues is empty, then abort these steps.
- bool activeSetChanged = missedCues.size();
+ bool activeSetChanged = missedCuesSize;
- size_t previousCuesSize = previousCues.size();
for (size_t i = 0; !activeSetChanged && i < previousCuesSize; ++i)
if (!currentCues.contains(previousCues[i]) && previousCues[i].data()->isActive())
activeSetChanged = true;
- size_t currentCuesSize = currentCues.size();
for (size_t i = 0; !activeSetChanged && i < currentCuesSize; ++i) {
if (!currentCues[i].data()->isActive())
activeSetChanged = true;
@@ -1053,12 +1057,23 @@
if (!activeSetChanged)
return;
- // FIXME(72173): 7 - If the time was reached through the usual monotonic
- // increase of the current playback position during normal playback, and
- // there are cues in other cues that have their text track cue pause-on-exit
- // flag set and that either have their text track cue active flag set or are
- // also in missed cues, then immediately pause the media element.
+ // 7 - If the time was reached through the usual monotonic increase of the
+ // current playback position during normal playback, and there are cues in
+ // other cues that have their text track cue pause-on-exi flag set and that
+ // either have their text track cue active flag set or are also in missed
+ // cues, then immediately pause the media element.
+ for (size_t i = 0; !m_paused && i < previousCuesSize; ++i) {
+ if (previousCues[i].data()->pauseOnExit()
+ && previousCues[i].data()->isActive()
+ && !currentCues.contains(previousCues[i]))
+ pause();
+ }
+ for (size_t i = 0; !m_paused && i < missedCuesSize; ++i) {
+ if (missedCues[i].data()->pauseOnExit())
+ pause();
+ }
+
// 8 - Let events be a list of tasks, initially empty. Each task in this
// list will be associated with a text track, a text track cue, and a time,
// which are used to sort the list before the tasks are queued.
@@ -1067,7 +1082,7 @@
// 8 - Let affected tracks be a list of text tracks, initially empty.
Vector<TextTrack*> affectedTracks;
- for (size_t i = 0; i < missedCues.size(); ++i) {
+ for (size_t i = 0; i < missedCuesSize; ++i) {
// 9 - For each text track cue in missed cues, prepare an event named enter
// for the TextTrackCue object with the text track cue start time.
eventTasks.append(std::make_pair(missedCues[i].data()->startTime(),
@@ -1080,7 +1095,7 @@
missedCues[i].data()));
}
- for (size_t i = 0; i < previousCues.size(); ++i) {
+ for (size_t i = 0; i < previousCuesSize; ++i) {
// 10 - For each text track cue in other cues that has its text
// track cue active flag set prepare an event named exit for the
// TextTrackCue object with the text track cue end time.
@@ -1089,7 +1104,7 @@
previousCues[i].data()));
}
- for (size_t i = 0; i < currentCues.size(); ++i) {
+ for (size_t i = 0; i < currentCuesSize; ++i) {
// 11 - For each text track cue in current cues that does not have its
// text track cue active flag set, prepare an event named enter for the
// TextTrackCue object with the text track cue start time.
@@ -1144,10 +1159,10 @@
// 16 - Set the text track cue active flag of all the cues in the current
// cues, and unset the text track cue active flag of all the cues in the
// other cues.
- for (size_t i = 0; i < currentCues.size(); ++i)
+ for (size_t i = 0; i < currentCuesSize; ++i)
currentCues[i].data()->setIsActive(true);
- for (size_t i = 0; i < previousCues.size(); ++i)
+ for (size_t i = 0; i < previousCuesSize; ++i)
if (!currentCues.contains(previousCues[i]))
previousCues[i].data()->setIsActive(false);
