and event sorting in case of simultaneous event triggering.
<track>-related events cuechange, enter, and exit should be sorted and filtered before dispatching
https://bugs.webkit.org/show_bug.cgi?id=72171
Patch by Victor Carbune <victor@rosedu.org> on 2012-02-20
Reviewed by Eric Carlson.
Tests: media/track/track-cues-missed.html
media/track/track-cues-sorted-before-dispatch.html
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::HTMLMediaElement): Added initialization code
for newly added state variables.
(WebCore::trackIndexCompare): Static boolean compare function between
the index of two tracks.
(WebCore):
(WebCore::eventTimeCueCompare): Static boolean compare function between
events associated with text track cues.
(WebCore::HTMLMediaElement::updateActiveTextTrackCues): Added code to
sort the events associated with text track cues before dispatching.
Each step from the specification is commented within the code.
(WebCore::HTMLMediaElement::finishSeek): Added a boolean variable that
is needed within the text track update function, to know whether a seek
event has occured before or not.
(WebCore::HTMLMediaElement::mediaPlayerTimeChanged): Moved the update
call for text tracks at the beginning of the function instead of the end.
'ended' events for video should be dispatched after track specific events.
* html/HTMLMediaElement.h: Added variables to keep
state information required by the text track update algorithm (last time
the algorithm was run, and whether a seeking event has occured)
(HTMLMediaElement):
* html/LoadableTextTrack.cpp: Refactored fireCueChangeEvent method
(WebCore::LoadableTextTrack::fireCueChangeEvent): The method dispatches a
synchronous cue change event for the track element.
* html/LoadableTextTrack.h:
(LoadableTextTrack):
* html/TextTrack.cpp: Modified the fireCueChange method, cached track index.
(WebCore::TextTrack::TextTrack):
(WebCore::TextTrack::trackIndex): Cached the track index.
(WebCore):
(WebCore::TextTrack::invalidateTrackIndex): Invalidates the track. Used
when a new track is added in a TextTrackList instance.
* html/TextTrack.h:
(TextTrack):
(WebCore::TextTrack::fireCueChangeEvent): The fireCueChangeEvent has been changed,
as events need to be fired asyncronously.
* html/TextTrackCue.cpp: Added internal variables to keep the current index
position in the track cue order. This is invalidated when an element is
inserted before.
(WebCore::TextTrackCue::TextTrackCue):
(WebCore::TextTrackCue::cueIndex): Getter for the cueIndex.
(WebCore):
(WebCore::TextTrackCue::invalidateCueIndex): Invalidates the currently stored
cue index.
(WebCore::TextTrackCue::dispatchEvent): Event dispatching is done asynchronously
now. This should be the only method used for event dispatching.
(WebCore::TextTrackCue::setIsActive): The setIsActive method no longer dispatches
events, but rather just changes the m_isActive variable.
* html/TextTrackCue.h:
(TextTrackCue):
* html/TextTrackCueList.cpp:
(WebCore::TextTrackCueList::getCueIndex): Retrieves the cue index, in the track cue
order, of a given cue.
(WebCore):
(WebCore::TextTrackCueList::add): Modified the add method such that all the next cue
indexes are invalidated.
(WebCore::TextTrackCueList::invalidateCueIndexes): Invalidates all cue indexes starting
with a specific position.
* html/TextTrackCueList.h:
(TextTrackCueList):
* html/track/TextTrackList.cpp:
(TextTrackList::getTrackIndex): Retrieves the track index position.
(TextTrackList::append): Added method for invalidating the text track index in case of
changing the list contents.
* html/track/TextTrackList.h:
(TextTrackList):
LayoutTests: <track>-related events cuechange, enter, and exit should be sorted and filtered before dispatching
https://bugs.webkit.org/show_bug.cgi?id=72171
Patch by Victor Carbune <victor@rosedu.org> on 2012-02-20
Reviewed by Eric Carlson.
* media/track/captions-webvtt/missed-cues.vtt: Added.
* media/track/captions-webvtt/sorted-dispatch.vtt: Added.
* media/track/track-cues-cuechange-expected.txt: This test had to be changed because
the synchronous dispatch of the events against the HTMLTrackElement doesn't mean that
the text track actually has any active cues at the dispatch moment.
* media/track/track-cues-cuechange.html: Changed tests structure to guide the entering and
exit events according to the asynchronous dispatch done by TextTrack.
* media/track/track-cues-missed-expected.txt: Added.
* media/track/track-cues-missed.html: Added.
* media/track/track-cues-sorted-before-dispatch-expected.txt: Added.
* media/track/track-cues-sorted-before-dispatch.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108241
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2012-02-20 Victor Carbune <victor@rosedu.org>
+
+ <track>-related events cuechange, enter, and exit should be sorted and filtered before dispatching
+ https://bugs.webkit.org/show_bug.cgi?id=72171
+
+ Reviewed by Eric Carlson.
+
+ * media/track/captions-webvtt/missed-cues.vtt: Added.
+ * media/track/captions-webvtt/sorted-dispatch.vtt: Added.
+ * media/track/track-cues-cuechange-expected.txt: This test had to be changed because
+ the synchronous dispatch of the events against the HTMLTrackElement doesn't mean that
+ the text track actually has any active cues at the dispatch moment.
+ * media/track/track-cues-cuechange.html: Changed tests structure to guide the entering and
+ exit events according to the asynchronous dispatch done by TextTrack.
+ * media/track/track-cues-missed-expected.txt: Added.
+ * media/track/track-cues-missed.html: Added.
+ * media/track/track-cues-sorted-before-dispatch-expected.txt: Added.
+ * media/track/track-cues-sorted-before-dispatch.html: Added.
+
2012-02-20 Vsevolod Vlasov <vsevik@chromium.org>
Unreviewed manual rollout of r107970 which breaks table column widths
--- /dev/null
+WEBVTT
+Events should be triggered for missed (skipped) cues during normal playback.
+
+1
+00:00:00.000 --> 00:00:01.500 A:start T:20%
+Bear is Coming!!!!!
+And what kind of a bear it is - just have look.
+
+2
+00:00:02.000 --> 00:00:02.500 A:start T:20%
+I said Bear is coming!!!!
+
+3
+00:00:05.500 --> 00:00:05.501 A:start T:20%
+I said Bear is coming now!!!!
+
+4
+00:00:05.700 --> 00:00:05.701 A:start T:20%
+This is the second missed cue in the test.
+
+5
+00:00:05.800 --> 00:00:05.801 A:start T:20%
+Maybe a third missed cue.
+
+6
+00:00:05.992 --> 00:00:05.993 A:start T:20%
+Fourth missed cue.
--- /dev/null
+WEBVTT
+Enter and exit events should be dispatched in a sorted order according to their times.
+
+0
+00:00:04.000 --> 00:00:04.500
+Missed cue that should not be considered because of seeking.
+
+1
+00:00:05.100 --> 00:00:05.800 A:start T:20%
+Bear is Coming!!!!!
+
+2
+00:00:05.100 --> 00:00:05.101
+Missed cue 1
+
+3
+00:00:05.100 --> 00:00:05.301
+And what kind of a bear it is - just have look.
+
+4
+00:00:05.100 --> 00:00:05.101
+Missed Cue 2
+
+5
+00:00:05.300 --> 00:00:05.800 A:start T:20%
+I said Bear is coming!!!!
+
+6
+00:00:05.990 --> 00:00:05.993 A:start T:20%
+I said Bear is coming now!!!!
+
+7
+00:00:05.994 --> 00:00:05.998 A:start T:20%
+Bear is already here
EXPECTED (testTrack.track.cues.length == '3') OK
RUN(video.play())
+EVENT(cuechange) from <track>
EVENT(cuechange) from TextTrack
Cue entered
EXPECTED ([object TextTrackCue] == '[object TextTrackCue]') OK
EXPECTED (currentCue.id == '1') OK
EVENT(cuechange) from <track>
-Cue entered
-EXPECTED ([object TextTrackCue] == '[object TextTrackCue]') OK
-EXPECTED (currentCue.id == '1') OK
-
EVENT(cuechange) from TextTrack
Cue exited
EVENT(cuechange) from <track>
-Cue exited
-
EVENT(cuechange) from TextTrack
Cue entered
EXPECTED ([object TextTrackCue] == '[object TextTrackCue]') OK
EXPECTED (currentCue.id == '2') OK
EVENT(cuechange) from <track>
-Cue entered
-EXPECTED ([object TextTrackCue] == '[object TextTrackCue]') OK
-EXPECTED (currentCue.id == '2') OK
-
EVENT(cuechange) from TextTrack
Cue exited
EVENT(cuechange) from <track>
-Cue exited
-
EVENT(cuechange) from TextTrack
Cue entered
EXPECTED ([object TextTrackCue] == '[object TextTrackCue]') OK
EXPECTED (currentCue.id == '3') OK
EVENT(cuechange) from <track>
-Cue entered
-EXPECTED ([object TextTrackCue] == '[object TextTrackCue]') OK
-EXPECTED (currentCue.id == '3') OK
-
EVENT(cuechange) from TextTrack
Cue exited
-EVENT(cuechange) from <track>
-Cue exited
-
END OF TEST
function cueChangedFromTrackElement()
{
consoleWrite("EVENT(cuechange) from <track>");
-
- currentCueIndex = Math.floor(cueChangeCount/2);
- currentCue = event.target.track.cues[currentCueIndex];
- checkCue();
-
- ++cueChangeCount;
- if (cueChangeCount == testTrack.track.cues.length * 2)
- endTest();
}
function cueChangedFromTextTrack()
{
consoleWrite("EVENT(cuechange) from TextTrack");
-
- currentCueIndex = Math.floor(cueChangeCount/2);
+
+ currentCueIndex = Math.floor(cueChangeCount / 2);
currentCue = event.target.cues[currentCueIndex];
checkCue();
+
+ ++cueChangeCount;
+ if (cueChangeCount == testTrack.track.cues.length * 2)
+ endTest();
}
-
+
function checkCue()
{
if (cueChangeCount % 2 == 0) {
--- /dev/null
+Tests that events are triggered for missed (skipped) cues during normal playback.
+
+EVENT(canplaythrough)
+EXPECTED (testTrack.track.cues.length == '6') OK
+RUN(video.play())
+EVENT(enter)
+EXPECTED (testTrack.track.cues.getCueById(cueCount) == '[object TextTrackCue]') OK
+EXPECTED (currentCue.id == '3') OK
+EVENT(exit)
+EXPECTED (testTrack.track.cues.getCueById(cueCount) == '[object TextTrackCue]') OK
+EXPECTED (currentCue.id == '3') OK
+EVENT(enter)
+EXPECTED (testTrack.track.cues.getCueById(cueCount) == '[object TextTrackCue]') OK
+EXPECTED (currentCue.id == '4') OK
+EVENT(exit)
+EXPECTED (testTrack.track.cues.getCueById(cueCount) == '[object TextTrackCue]') OK
+EXPECTED (currentCue.id == '4') OK
+EVENT(enter)
+EXPECTED (testTrack.track.cues.getCueById(cueCount) == '[object TextTrackCue]') OK
+EXPECTED (currentCue.id == '5') OK
+EVENT(exit)
+EXPECTED (testTrack.track.cues.getCueById(cueCount) == '[object TextTrackCue]') OK
+EXPECTED (currentCue.id == '5') OK
+EVENT(enter)
+EXPECTED (testTrack.track.cues.getCueById(cueCount) == '[object TextTrackCue]') OK
+EXPECTED (currentCue.id == '6') OK
+EVENT(exit)
+EXPECTED (testTrack.track.cues.getCueById(cueCount) == '[object TextTrackCue]') OK
+EXPECTED (currentCue.id == '6') OK
+EVENT(ended)
+END OF TEST
+
--- /dev/null
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <script src=../media-file.js></script>
+ <script src=../video-test.js></script>
+ <script>
+ var videoCanPlayThrough = false;
+ var trackLoaded = false;
+
+ var currentCue;
+ var cueCount;
+ var testTrack;
+
+ function runTests()
+ {
+ if (!trackLoaded || !videoCanPlayThrough)
+ return;
+
+ testTrack = document.getElementById("testTrack");
+ testExpected("testTrack.track.cues.length", 6);
+
+ for (cueCount = 2; cueCount < testTrack.track.cues.length; cueCount++) {
+ var cue = testTrack.track.cues[cueCount];
+
+ cue.addEventListener('enter', cueEnteredOrExited);
+ cue.addEventListener('exit', cueEnteredOrExited);
+ }
+
+ cueCount = 3;
+ run("video.play()");
+ }
+
+ function cueEnteredOrExited()
+ {
+ consoleWrite("EVENT(" + event.type + ")");
+
+ currentCue = event.target;
+ testExpected("testTrack.track.cues.getCueById(cueCount)", currentCue);
+ testExpected("currentCue.id", cueCount);
+
+ if (event.type == 'exit') {
+ cueCount++;
+ }
+ }
+
+ waitForEvent('ended', endTest);
+
+ waitForEvent('canplaythrough', function() {
+ video.currentTime = 5.00;
+ videoCanPlayThrough = true;
+
+ runTests();
+ });
+
+ function loaded()
+ {
+ trackLoaded = true;
+
+ runTests();
+ };
+
+ function bodyLoaded()
+ {
+ findMediaElement();
+ video.src = findMediaFile("video", "../content/test");
+ }
+ </script>
+ </head>
+ <body onload="bodyLoaded()">
+ <p>Tests that events are triggered for missed (skipped) cues during normal playback.</p>
+ <video controls>
+ <track id="testTrack" src="captions-webvtt/missed-cues.vtt" onload="loaded()" default>
+ </video>
+ </body>
+</html>
--- /dev/null
+Tests that all events events are triggered in chronological order.
+
+EVENT(canplaythrough)
+EXPECTED (testTrack.track.cues.length == '8') OK
+RUN(video.play())
+EVENT(ended)
+Cue event: enter id: 1 time: 5.1
+Cue event: enter id: 3 time: 5.1
+Cue event: enter id: 2 time: 5.1
+Cue event: enter id: 4 time: 5.1
+Cue event: exit id: 2 time: 5.101
+Cue event: exit id: 4 time: 5.101
+Cue event: enter id: 5 time: 5.3
+Cue event: exit id: 3 time: 5.301
+Cue event: exit id: 1 time: 5.8
+Cue event: exit id: 5 time: 5.8
+Cue event: enter id: 6 time: 5.99
+Cue event: exit id: 6 time: 5.993
+Cue event: enter id: 7 time: 5.994
+Cue event: exit id: 7 time: 5.998
+END OF TEST
+
--- /dev/null
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <script src=../media-file.js></script>
+ <script src=../video-test.js></script>
+ <script>
+ var videoCanPlayThrough = false;
+ var trackLoaded = false;
+
+ var currentCue;
+ var testTrack;
+
+ var dispatchedEvents = [];
+
+ function runTests()
+ {
+ if (!trackLoaded || !videoCanPlayThrough)
+ return;
+
+ testTrack = document.getElementById("testTrack");
+ testExpected("testTrack.track.cues.length", 8);
+
+ for (var i = 0; i < testTrack.track.cues.length; ++i) {
+ testTrack.track.cues[i].addEventListener('enter', cueEnteredOrExited);
+ testTrack.track.cues[i].addEventListener('exit', cueEnteredOrExited);
+ }
+
+ run("video.play()");
+ }
+
+ function cueEnteredOrExited(event)
+ {
+ currentCue = event.target;
+
+ var eventObj = {};
+
+ eventObj.time = currentCue.startTime;
+ if (event.type == 'exit')
+ eventObj.time = currentCue.endTime;
+
+ eventObj.type = event.type;
+ eventObj.cue = currentCue;
+
+ dispatchedEvents.push(eventObj);
+ }
+
+ function loaded()
+ {
+ trackLoaded = true;
+ runTests();
+ }
+
+ function bodyLoaded()
+ {
+ findMediaElement();
+ video.src = findMediaFile("video", "../content/test");
+ }
+
+ function logEndTest()
+ {
+ for (var i = 0; i < dispatchedEvents.length; ++i) {
+ consoleWrite("Cue event: " + dispatchedEvents[i].type +
+ " id: " + dispatchedEvents[i].cue.id +
+ " time: " + dispatchedEvents[i].time);
+ }
+
+ endTest();
+ }
+
+ waitForEvent('ended', logEndTest);
+
+ waitForEvent('canplaythrough', function() {
+ video.currentTime = 5.00;
+ videoCanPlayThrough = true;
+
+ runTests();
+ });
+
+ </script>
+ </head>
+ <body onload="bodyLoaded()">
+ <p>Tests that all events events are triggered in chronological order.</p>
+ <video controls>
+ <track id="testTrack" src="captions-webvtt/sorted-dispatch.vtt" onload="loaded()" default>
+ </video>
+ </body>
+</html>
+2012-02-20 Victor Carbune <victor@rosedu.org>
+
+ Added code to support dispatching of missed cues in case of normal playback
+ and event sorting in case of simultaneous event triggering.
+
+ <track>-related events cuechange, enter, and exit should be sorted and filtered before dispatching
+ https://bugs.webkit.org/show_bug.cgi?id=72171
+
+ Reviewed by Eric Carlson.
+
+ Tests: media/track/track-cues-missed.html
+ media/track/track-cues-sorted-before-dispatch.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement): Added initialization code
+ for newly added state variables.
+ (WebCore::trackIndexCompare): Static boolean compare function between
+ the index of two tracks.
+ (WebCore):
+ (WebCore::eventTimeCueCompare): Static boolean compare function between
+ events associated with text track cues.
+ (WebCore::HTMLMediaElement::updateActiveTextTrackCues): Added code to
+ sort the events associated with text track cues before dispatching.
+ Each step from the specification is commented within the code.
+ (WebCore::HTMLMediaElement::finishSeek): Added a boolean variable that
+ is needed within the text track update function, to know whether a seek
+ event has occured before or not.
+ (WebCore::HTMLMediaElement::mediaPlayerTimeChanged): Moved the update
+ call for text tracks at the beginning of the function instead of the end.
+ 'ended' events for video should be dispatched after track specific events.
+ * html/HTMLMediaElement.h: Added variables to keep
+ state information required by the text track update algorithm (last time
+ the algorithm was run, and whether a seeking event has occured)
+ (HTMLMediaElement):
+
+ * html/LoadableTextTrack.cpp: Refactored fireCueChangeEvent method
+ (WebCore::LoadableTextTrack::fireCueChangeEvent): The method dispatches a
+ synchronous cue change event for the track element.
+ * html/LoadableTextTrack.h:
+ (LoadableTextTrack):
+ * html/TextTrack.cpp: Modified the fireCueChange method, cached track index.
+ (WebCore::TextTrack::TextTrack):
+ (WebCore::TextTrack::trackIndex): Cached the track index.
+ (WebCore):
+ (WebCore::TextTrack::invalidateTrackIndex): Invalidates the track. Used
+ when a new track is added in a TextTrackList instance.
+ * html/TextTrack.h:
+ (TextTrack):
+ (WebCore::TextTrack::fireCueChangeEvent): The fireCueChangeEvent has been changed,
+ as events need to be fired asyncronously.
+ * html/TextTrackCue.cpp: Added internal variables to keep the current index
+ position in the track cue order. This is invalidated when an element is
+ inserted before.
+ (WebCore::TextTrackCue::TextTrackCue):
+ (WebCore::TextTrackCue::cueIndex): Getter for the cueIndex.
+ (WebCore):
+ (WebCore::TextTrackCue::invalidateCueIndex): Invalidates the currently stored
+ cue index.
+ (WebCore::TextTrackCue::dispatchEvent): Event dispatching is done asynchronously
+ now. This should be the only method used for event dispatching.
+ (WebCore::TextTrackCue::setIsActive): The setIsActive method no longer dispatches
+ events, but rather just changes the m_isActive variable.
+ * html/TextTrackCue.h:
+ (TextTrackCue):
+
+ * html/TextTrackCueList.cpp:
+ (WebCore::TextTrackCueList::getCueIndex): Retrieves the cue index, in the track cue
+ order, of a given cue.
+ (WebCore):
+ (WebCore::TextTrackCueList::add): Modified the add method such that all the next cue
+ indexes are invalidated.
+ (WebCore::TextTrackCueList::invalidateCueIndexes): Invalidates all cue indexes starting
+ with a specific position.
+ * html/TextTrackCueList.h:
+ (TextTrackCueList):
+ * html/track/TextTrackList.cpp:
+ (TextTrackList::getTrackIndex): Retrieves the track index position.
+ (TextTrackList::append): Added method for invalidating the text track index in case of
+ changing the list contents.
+ * html/track/TextTrackList.h:
+ (TextTrackList):
+
2012-02-20 Kenichi Ishibashi <bashi@chromium.org>
[WebSocket] Move WebSocketChannel::FrameData into a separate header file
#include <limits>
#include <wtf/CurrentTime.h>
#include <wtf/MathExtras.h>
+#include <wtf/NonCopyingSort.h>
#include <wtf/Uint8Array.h>
#include <wtf/text/CString.h>
#if ENABLE(VIDEO_TRACK)
, m_tracksAreReady(true)
, m_haveVisibleTextTrack(false)
+ , m_lastTextTrackUpdateTime(-1)
, m_textTracks(0)
, m_ignoreTrackDisplayUpdate(0)
#endif
}
#if ENABLE(VIDEO_TRACK)
+static bool trackIndexCompare(TextTrack* a,
+ TextTrack* b)
+{
+ return a->trackIndex() - b->trackIndex() < 0;
+}
+
+static bool eventTimeCueCompare(const std::pair<double, TextTrackCue*>& a,
+ const std::pair<double, TextTrackCue*>& b)
+{
+ // 12 - Sort the tasks in events in ascending time order (tasks with earlier
+ // times first).
+ if (a.first != b.first)
+ return a.first - b.first < 0;
+
+ // If the cues belong to different text tracks, it doesn't make sense to
+ // compare the two tracks by the relative cue order, so return the relative
+ // track order.
+ if (a.second->track() != b.second->track())
+ return trackIndexCompare(a.second->track(), b.second->track());
+
+ // 12 - Further sort tasks in events that have the same time by the
+ // relative text track cue order of the text track cues associated
+ // with these tasks.
+ return a.second->cueIndex() - b.second->cueIndex() < 0;
+}
+
+
void HTMLMediaElement::updateActiveTextTrackCues(float movieTime)
{
+ LOG(Media, "HTMLMediaElement::updateActiveTextTracks");
+
+ // 4.8.10.8 Playing the media resource
+
+ // If the current playback position changes while the steps are running,
+ // then the user agent must wait for the steps to complete, and then must
+ // immediately rerun the steps.
if (ignoreTrackDisplayUpdateRequests())
return;
- CueList previouslyActiveCues = m_currentlyActiveCues;
- bool activeSetChanged = false;
+ // 1 - Let current cues be a list of cues, initialized to contain all the
+ // cues of all the hidden, showing, or showing by default text tracks of the
+ // media element (not the disabled ones) whose start times are less than or
+ // equal to the current playback position and whose end times are greater
+ // than the current playback position.
+ Vector<CueIntervalTree::IntervalType> currentCues;
+
+ // The user agent must synchronously unset [the text track cue active] flag
+ // whenever ... the media element's readyState is changed back to HAVE_NOTHING.
+ if (m_readyState != HAVE_NOTHING && m_player)
+ currentCues = m_cueTree.allOverlaps(m_cueTree.createInterval(movieTime, movieTime));
+
+ Vector<CueIntervalTree::IntervalType> affectedCues;
+ Vector<CueIntervalTree::IntervalType> previousCues;
+ Vector<CueIntervalTree::IntervalType> missedCues;
+
+ // 2 - Let other cues be a list of cues, initialized to contain all the cues
+ // of hidden, showing, and showing by default text tracks of the media
+ // element that are not present in current cues.
+ previousCues = m_currentlyActiveCues;
+
+ // 3 - Let last time be the current playback position at the time this
+ // algorithm was last run for this media element, if this is not the first
+ // time it has run.
+ float lastTime = m_lastTextTrackUpdateTime;
+
+ // 4 - If the current playback position has, since the last time this
+ // algorithm was run, only changed through its usual monotonic increase
+ // during normal playback, then let missed cues be the list of cues in other
+ // 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) {
+ Vector<CueIntervalTree::IntervalType> potentiallySkippedCues =
+ m_cueTree.allOverlaps(m_cueTree.createInterval(lastTime, movieTime));
+
+ for (size_t i = 0; i < potentiallySkippedCues.size(); ++i) {
+ float cueStartTime = potentiallySkippedCues[i].low();
+ float cueEndTime = potentiallySkippedCues[i].high();
+
+ if (cueStartTime > lastTime && cueEndTime < movieTime)
+ missedCues.append(potentiallySkippedCues[i]);
+ }
+ }
- // The user agent must synchronously unset [the text track cue active] flag whenever ... the media
- // element's readyState is changed back to HAVE_NOTHING.
- if (m_readyState == HAVE_NOTHING || !m_player)
- m_currentlyActiveCues.shrink(0);
- else
- m_currentlyActiveCues = m_cueTree.allOverlaps(m_cueTree.createInterval(movieTime, movieTime));
-
- // FIXME(72171): Events need to be sorted and filtered before dispatching.
+ m_lastTextTrackUpdateTime = movieTime;
+
+ // 5 - If the time was reached through the usual monotonic increase of the
+ // current playback position during normal playback, and if the user agent
+ // has not fired a timeupdate event at the element in the past 15 to 250ms
+ // and is not still running event handlers for such an event, then the user
+ // agent must queue a task to fire a simple event named timeupdate at the
+ // element. (In the other cases, such as explicit seeks, relevant events get
+ // fired as part of the overall process of changing the current playback
+ // position.)
+ if (m_lastSeekTime <= lastTime)
+ scheduleTimeupdateEvent(false);
+
+ // 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();
- for (size_t i = 0; i < previouslyActiveCues.size(); ++i) {
- if (!m_currentlyActiveCues.contains(previouslyActiveCues[i])) {
- previouslyActiveCues[i].data()->setIsActive(false);
+ 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;
- }
- }
- for (size_t i = 0; i < m_currentlyActiveCues.size(); ++i) {
- if (!previouslyActiveCues.contains(m_currentlyActiveCues[i])) {
- m_currentlyActiveCues[i].data()->setIsActive(true);
+
+ size_t currentCuesSize = currentCues.size();
+ for (size_t i = 0; !activeSetChanged && i < currentCuesSize; ++i) {
+ if (!currentCues[i].data()->isActive())
activeSetChanged = true;
- }
}
-
- // FIXME(72173): Pause the media element for cues going past their endTime
- // during a monotonic time increase.
+
+ 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.
+
+ // 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.
+ Vector<std::pair<double, TextTrackCue*> > eventTasks;
+
+ // 8 - Let affected tracks be a list of text tracks, initially empty.
+ Vector<TextTrack*> affectedTracks;
+
+ for (size_t i = 0; i < missedCues.size(); ++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(),
+ missedCues[i].data()));
+
+ // 10 - For each text track in missed cues, prepare an event
+ // named exit for the TextTrackCue object with the text track cue end
+ // time.
+ eventTasks.append(std::make_pair(missedCues[i].data()->endTime(),
+ missedCues[i].data()));
+ }
+
+ for (size_t i = 0; i < previousCues.size(); ++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.
+ if (!currentCues.contains(previousCues[i]))
+ eventTasks.append(std::make_pair(previousCues[i].data()->endTime(),
+ previousCues[i].data()));
+ }
+
+ for (size_t i = 0; i < currentCues.size(); ++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.
+ if (!previousCues.contains(currentCues[i]))
+ eventTasks.append(std::make_pair(currentCues[i].data()->startTime(),
+ currentCues[i].data()));
+ }
+
+ // 12 - Sort the tasks in events in ascending time order (tasks with earlier
+ // times first).
+ nonCopyingSort(eventTasks.begin(), eventTasks.end(), eventTimeCueCompare);
+
+ for (size_t i = 0; i < eventTasks.size(); ++i) {
+ if (!affectedTracks.contains(eventTasks[i].second->track()))
+ affectedTracks.append(eventTasks[i].second->track());
+
+ // 13 - Queue each task in events, in list order.
+ RefPtr<Event> event;
+
+ // Each event in eventTasks may be either an enterEvent or an exitEvent,
+ // depending on the time that is associated with the event. This
+ // correctly identifies the type of the event, since the startTime is
+ // always less than the endTime.
+ if (eventTasks[i].first == eventTasks[i].second->startTime())
+ event = Event::create(eventNames().enterEvent, false, false);
+ else
+ event = Event::create(eventNames().exitEvent, false, false);
+
+ event->setTarget(eventTasks[i].second);
+ m_asyncEventQueue.enqueueEvent(event.release());
+ }
+
+ // 14 - Sort affected tracks in the same order as the text tracks appear in
+ // the media element's list of text tracks, and remove duplicates.
+ nonCopyingSort(affectedTracks.begin(), affectedTracks.end(), trackIndexCompare);
+
+ // 15 - For each text track in affected tracks, in the list order, queue a
+ // task to fire a simple event named cuechange at the TextTrack object, and,
+ // if the text track has a corresponding track element, to then fire a
+ // simple event named cuechange at the track element as well.
+ for (size_t i = 0; i < affectedTracks.size(); ++i) {
+ RefPtr<Event> event = Event::create(eventNames().cuechangeEvent, false, false);
+ event->setTarget(affectedTracks[i]);
+
+ m_asyncEventQueue.enqueueEvent(event.release());
+
+ // Fire syncronous cue change event for track elements.
+ if (affectedTracks[i]->trackType() == TextTrack::TrackElement)
+ affectedTracks[i]->fireCueChangeEvent();
+ }
+
+ // 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)
+ currentCues[i].data()->setIsActive(true);
+
+ for (size_t i = 0; i < previousCues.size(); ++i)
+ if (!currentCues.contains(previousCues[i]))
+ previousCues[i].data()->setIsActive(false);
+
+ // Update the current active cues.
+ m_currentlyActiveCues = currentCues;
if (activeSetChanged && hasMediaControls())
mediaControls()->updateTextTrackDisplay();
{
LOG(Media, "HTMLMediaElement::mediaPlayerTimeChanged");
+#if ENABLE(VIDEO_TRACK)
+ updateActiveTextTrackCues(currentTime());
+#endif
+
beginProcessingMediaPlayerCallback();
invalidateCachedTime();
m_sentEndEvent = false;
updatePlayState();
-#if ENABLE(VIDEO_TRACK)
- updateActiveTextTrackCues(now);
-#endif
endProcessingMediaPlayerCallback();
}
#if ENABLE(VIDEO_TRACK)
bool m_tracksAreReady : 1;
bool m_haveVisibleTextTrack : 1;
+ float m_lastTextTrackUpdateTime;
RefPtr<TextTrackList> m_textTracks;
Vector<RefPtr<TextTrack> > m_textTracksWhenResourceSelectionBegan;
+
CueIntervalTree m_cueTree;
+
CueList m_currentlyActiveCues;
int m_ignoreTrackDisplayUpdate;
#endif
void LoadableTextTrack::fireCueChangeEvent()
{
- TextTrack::fireCueChangeEvent();
+ RefPtr<Event> event = Event::create(eventNames().cuechangeEvent, false, false);
ExceptionCode ec = 0;
- m_trackElement->dispatchEvent(Event::create(eventNames().cuechangeEvent, false, false), ec);
+
+ m_trackElement->dispatchEvent(event, ec);
}
size_t LoadableTextTrack::trackElementIndex()
void scheduleLoad(const KURL&);
virtual void clearClient();
-
+
size_t trackElementIndex();
HTMLTrackElement* trackElement() { return m_trackElement; }
+ virtual void fireCueChangeEvent();
+
private:
// TextTrackLoaderClient
virtual bool shouldLoadCues(TextTrackLoader*) { return true; }
LoadableTextTrack(HTMLTrackElement*, const String& kind, const String& label, const String& language, bool isDefault);
void loadTimerFired(Timer<LoadableTextTrack>*);
-
- virtual void fireCueChangeEvent();
HTMLTrackElement* m_trackElement;
Timer<LoadableTextTrack> m_loadTimer;
#include "Event.h"
#include "ExceptionCode.h"
+#include "HTMLMediaElement.h"
#include "TextTrackCueList.h"
+#include "TextTrackList.h"
#include "TrackBase.h"
namespace WebCore {
+static const int invalidTrackIndex = -1;
+
const AtomicString& TextTrack::subtitlesKeyword()
{
DEFINE_STATIC_LOCAL(const AtomicString, subtitles, ("subtitles"));
, m_trackType(type)
, m_readinessState(NotLoaded)
, m_showingByDefault(false)
+ , m_trackIndex(invalidTrackIndex)
{
setKind(kind);
}
m_client->textTrackRemoveCue(this, cue);
}
-void TextTrack::fireCueChangeEvent()
-{
- ExceptionCode ec = 0;
- dispatchEvent(Event::create(eventNames().cuechangeEvent, false, false), ec);
-}
-
void TextTrack::cueWillChange(TextTrackCue* cue)
{
if (!m_client)
m_client->textTrackAddCue(this, cue);
}
+int TextTrack::trackIndex()
+{
+ ASSERT(m_mediaElement);
+
+ if (m_trackIndex == invalidTrackIndex)
+ m_trackIndex = m_mediaElement->textTracks()->getTrackIndex(this);
+
+ return m_trackIndex;
+}
+
+void TextTrack::invalidateTrackIndex()
+{
+ m_trackIndex = invalidTrackIndex;
+}
+
TextTrackCueList* TextTrack::ensureTextTrackCueList()
{
if (!m_cues)
return adoptRef(new TextTrack(context, client, kind, label, language, AddTrack));
}
virtual ~TextTrack();
-
+
void setMediaElement(HTMLMediaElement* element) { m_mediaElement = element; }
HTMLMediaElement* mediaElement() { return m_mediaElement; }
void addCue(PassRefPtr<TextTrackCue>, ExceptionCode&);
void removeCue(TextTrackCue*, ExceptionCode&);
+ virtual void fireCueChangeEvent() { };
+
void cueWillChange(TextTrackCue*);
void cueDidChange(TextTrackCue*);
-
- virtual void fireCueChangeEvent();
+
DEFINE_ATTRIBUTE_EVENT_LISTENER(cuechange);
enum TextTrackType { TrackElement, AddTrack, InBand };
TextTrackType trackType() const { return m_trackType; }
+ int trackIndex();
+ void invalidateTrackIndex();
+
protected:
TextTrack(ScriptExecutionContext*, TextTrackClient*, const String& kind, const String& label, const String& language, TextTrackType);
TextTrackType m_trackType;
ReadinessState m_readinessState;
bool m_showingByDefault;
+ int m_trackIndex;
};
} // namespace WebCore
#include "Event.h"
#include "DocumentFragment.h"
#include "TextTrack.h"
+#include "TextTrackCueList.h"
#include "WebVTTParser.h"
#include <wtf/text/StringBuilder.h>
namespace WebCore {
+static const int invalidCueIndex = -1;
+
static const AtomicString& startKeyword()
{
DEFINE_STATIC_LOCAL(const AtomicString, start, ("start"));
, m_linePosition(-1)
, m_textPosition(50)
, m_cueSize(100)
+ , m_cueIndex(invalidCueIndex)
, m_cueAlignment(Middle)
, m_scriptExecutionContext(context)
, m_isActive(false)
cueDidChange();
}
+int TextTrackCue::cueIndex()
+{
+ if (m_cueIndex == invalidCueIndex)
+ m_cueIndex = track()->cues()->getCueIndex(this);
+
+ return m_cueIndex;
+}
+
+void TextTrackCue::invalidateCueIndex()
+{
+ m_cueIndex = invalidCueIndex;
+}
+
PassRefPtr<DocumentFragment> TextTrackCue::getCueAsHTML()
{
if (!m_documentFragment)
m_documentFragment = fragment;
}
+bool TextTrackCue::dispatchEvent(PassRefPtr<Event> event)
+{
+ // When a TextTrack's mode is disabled: no cues are active, no events fired.
+ if (!track() || track()->mode() == TextTrack::DISABLED)
+ return false;
+
+ return EventTarget::dispatchEvent(event);
+}
+
+bool TextTrackCue::dispatchEvent(PassRefPtr<Event> event, ExceptionCode &ec)
+{
+ return EventTarget::dispatchEvent(event, ec);
+}
+
bool TextTrackCue::isActive()
{
return m_isActive && track() && track()->mode() != TextTrack::DISABLED;
void TextTrackCue::setIsActive(bool active)
{
m_isActive = active;
-
- // When a TextTrack's mode is disabled: No cues are active, no events are fired ...
- if (!track() || track()->mode() == TextTrack::DISABLED)
- return;
-
- ExceptionCode ec = 0;
- if (active)
- dispatchEvent(Event::create(eventNames().enterEvent, false, false), ec);
- else
- dispatchEvent(Event::create(eventNames().exitEvent, false, false), ec);
-
- if (m_track)
- m_track->fireCueChangeEvent();
}
void TextTrackCue::parseSettings(const String& input)
{
return adoptRef(new TextTrackCue(context, id, start, end, content, settings, pauseOnExit));
}
-
+
enum Direction { Horizontal, VerticalGrowingLeft, VerticalGrowingRight };
enum Alignment { Start, Middle, End };
const String& text() const { return m_content; }
void setText(const String&);
+ int cueIndex();
+ void invalidateCueIndex();
+
PassRefPtr<DocumentFragment> getCueAsHTML();
void setCueHTML(PassRefPtr<DocumentFragment>);
+ virtual bool dispatchEvent(PassRefPtr<Event>);
+ bool dispatchEvent(PassRefPtr<Event>, ExceptionCode&);
+
bool isActive();
void setIsActive(bool);
-
+
virtual const AtomicString& interfaceName() const;
virtual ScriptExecutionContext* scriptExecutionContext() const;
void parseSettings(const String&);
void cueWillChange();
void cueDidChange();
-
+
virtual void refEventTarget() { ref(); }
virtual void derefEventTarget() { deref(); }
-
+
String m_id;
double m_startTime;
double m_endTime;
int m_linePosition;
int m_textPosition;
int m_cueSize;
+ int m_cueIndex;
+
Alignment m_cueAlignment;
RefPtr<DocumentFragment> m_documentFragment;
RefPtr<TextTrack> m_track;
return m_list.size();
}
+unsigned long TextTrackCueList::getCueIndex(TextTrackCue* cue) const
+{
+ return m_list.find(cue);
+}
+
TextTrackCue* TextTrackCueList::item(unsigned index) const
{
if (index < m_list.size())
return false;
m_list.insert(start, cue);
+ invalidateCueIndexes(start);
return true;
}
m_list.clear();
}
+void TextTrackCueList::invalidateCueIndexes(size_t start)
+{
+ for (size_t i = start; i < m_list.size(); ++i)
+ m_list[i]->invalidateCueIndex();
+}
+
} // namespace WebCore
#endif
~TextTrackCueList() { }
unsigned long length() const;
+ unsigned long getCueIndex(TextTrackCue*) const;
+
TextTrackCue* item(unsigned index) const;
TextTrackCue* getCueById(const String&) const;
TextTrackCueList* activeCues();
TextTrackCueList();
bool add(PassRefPtr<TextTrackCue>, size_t, size_t);
void clear();
-
+ void invalidateCueIndexes(size_t);
+
Vector<RefPtr<TextTrackCue> > m_list;
RefPtr<TextTrackCueList> m_activeCues;
-
+
};
} // namespace WebCore
return m_addTrackTracks.size() + m_elementTracks.size();
}
+unsigned TextTrackList::getTrackIndex(TextTrack *textTrack)
+{
+ if (textTrack->trackType() == TextTrack::TrackElement)
+ return static_cast<LoadableTextTrack*>(textTrack)->trackElementIndex();
+
+ if (textTrack->trackType() == TextTrack::AddTrack)
+ return m_elementTracks.size() + m_addTrackTracks.find(textTrack);
+
+ ASSERT_NOT_REACHED();
+
+ return -1;
+}
+
TextTrack* TextTrackList::item(unsigned index)
{
// 4.8.10.12.1 Text track model
void TextTrackList::append(PassRefPtr<TextTrack> prpTrack)
{
RefPtr<TextTrack> track = prpTrack;
-
+
if (track->trackType() == TextTrack::AddTrack)
m_addTrackTracks.append(track);
else if (track->trackType() == TextTrack::TrackElement) {
// Insert tracks added for <track> element in tree order.
size_t index = static_cast<LoadableTextTrack*>(track.get())->trackElementIndex();
m_elementTracks.insert(index, track);
+
+ // Invalidate the cached index for all the following tracks.
+ for (size_t i = index; i < m_elementTracks.size(); ++i)
+ m_elementTracks[i]->invalidateTrackIndex();
+
+ for (size_t i = 0; i < m_addTrackTracks.size(); ++i)
+ m_addTrackTracks[i]->invalidateTrackIndex();
+
} else
ASSERT_NOT_REACHED();
~TextTrackList();
unsigned length() const;
+ unsigned getTrackIndex(TextTrack*);
+
TextTrack* item(unsigned index);
void append(PassRefPtr<TextTrack>);
void remove(TextTrack*);
projects / profile / ivi / webkit-efl.git / commitdiff