Title: [160755] trunk
- Revision
- 160755
- Author
- [email protected]
- Date
- 2013-12-17 23:37:08 -0800 (Tue, 17 Dec 2013)
Log Message
[MSE] Periodically monitor source buffers.
https://bugs.webkit.org/show_bug.cgi?id=125898
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/media-source/media-source-monitor-source-buffers.html
The MSE spec requires that the SourceBuffer Monitoring step is run
periodically during playback. No specific update interval is specified
so we will re-use the existing HTMLMediaElement playback progress
timer to signal the media source monitoring.
* html/HTMLMediaElement.cpp:
(HTMLMediaElement::playbackProgressTimerFired):
LayoutTests:
* media/media-source/media-source-monitor-source-buffers-expected.txt: Added.
* media/media-source/media-source-monitor-source-buffers.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (160754 => 160755)
--- trunk/LayoutTests/ChangeLog 2013-12-18 06:49:50 UTC (rev 160754)
+++ trunk/LayoutTests/ChangeLog 2013-12-18 07:37:08 UTC (rev 160755)
@@ -1,3 +1,13 @@
+2013-12-17 Jer Noble <[email protected]>
+
+ [MSE] Periodically monitor source buffers.
+ https://bugs.webkit.org/show_bug.cgi?id=125898
+
+ Reviewed by Eric Carlson.
+
+ * media/media-source/media-source-monitor-source-buffers-expected.txt: Added.
+ * media/media-source/media-source-monitor-source-buffers.html: Added.
+
2013-12-17 Joseph Pecoraro <[email protected]>
Web Inspector: Remove InspectorFrontendHost.setInjectedScriptForOrigin
Added: trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers-expected.txt (0 => 160755)
--- trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers-expected.txt 2013-12-18 07:37:08 UTC (rev 160755)
@@ -0,0 +1,12 @@
+
+EXPECTED (source.readyState == 'closed') OK
+EVENT(sourceopen)
+RUN(sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock"))
+RUN(sourceBuffer.appendBuffer(initSegment))
+EVENT(updateend)
+RUN(sourceBuffer.appendBuffer(sample))
+EVENT(updateend)
+RUN(video.play())
+EVENT(waiting) TEST(video.readyState == HTMLMediaElement.HAVE_CURRENT_DATA) OK
+END OF TEST
+
Added: trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers.html (0 => 160755)
--- trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers.html (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers.html 2013-12-18 07:37:08 UTC (rev 160755)
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>mock-media-source</title>
+ <script src=""
+ <script src=""
+ <script>
+ var source;
+ var sourceBuffer;
+ var initSegment;
+ var sample;
+
+ if (window.internals)
+ internals.initializeMockMediaSource();
+
+ function runTest()
+ {
+ findMediaElement();
+
+ source = new MediaSource();
+ testExpected('source.readyState', 'closed');
+
+ waitForEventOn(source, 'sourceopen', sourceOpen);
+ video.src = ""
+ }
+
+ function sourceOpen()
+ {
+ run('sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock")');
+ waitForEventOn(sourceBuffer, 'updateend', loadSamples, false, true);
+ initSegment = makeAInit(100, [makeATrack(1, 'mock', TRACK_KIND.VIDEO)]);
+ run('sourceBuffer.appendBuffer(initSegment)');
+ }
+
+ function loadSamples()
+ {
+ sample = makeASample(0, 0, 10, 1, SAMPLE_FLAG.SYNC);
+ waitForEventOn(sourceBuffer, 'updateend', play, false, true);
+ run('sourceBuffer.appendBuffer(sample)');
+ }
+
+ function play()
+ {
+ waitForEventTestAndEnd('waiting', 'video.readyState == HTMLMediaElement.HAVE_CURRENT_DATA');
+ run('video.play()');
+ }
+
+ </script>
+</head>
+<body _onload_="runTest()">
+ <video></video>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (160754 => 160755)
--- trunk/Source/WebCore/ChangeLog 2013-12-18 06:49:50 UTC (rev 160754)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 07:37:08 UTC (rev 160755)
@@ -1,5 +1,22 @@
2013-12-17 Jer Noble <[email protected]>
+ [MSE] Periodically monitor source buffers.
+ https://bugs.webkit.org/show_bug.cgi?id=125898
+
+ Reviewed by Eric Carlson.
+
+ Test: media/media-source/media-source-monitor-source-buffers.html
+
+ The MSE spec requires that the SourceBuffer Monitoring step is run
+ periodically during playback. No specific update interval is specified
+ so we will re-use the existing HTMLMediaElement playback progress
+ timer to signal the media source monitoring.
+
+ * html/HTMLMediaElement.cpp:
+ (HTMLMediaElement::playbackProgressTimerFired):
+
+2013-12-17 Jer Noble <[email protected]>
+
[MSE] Add per-track signalling between SourceBuffer and SourceBufferPrivate.
https://bugs.webkit.org/show_bug.cgi?id=125899
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (160754 => 160755)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-12-18 06:49:50 UTC (rev 160754)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-12-18 07:37:08 UTC (rev 160755)
@@ -3008,6 +3008,11 @@
if (RuntimeEnabledFeatures::sharedFeatures().webkitVideoTrackEnabled())
updateActiveTextTrackCues(currentTime());
#endif
+
+#if ENABLE(MEDIA_SOURCE)
+ if (m_mediaSource)
+ m_mediaSource->monitorSourceBuffers();
+#endif
}
void HTMLMediaElement::scheduleTimeupdateEvent(bool periodicEvent)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
