WebKit
diff --git a/?LayoutTests/media/media-source/media-managedmse-noresumeafterpause-expected.txt
Lines changed: 1 addition & 1 deletion b/?LayoutTests/media/media-source/media-managedmse-noresumeafterpause-expected.txt
Lines changed: 1 addition & 1 deletion
diff --git a/?LayoutTests/media/media-source/media-managedmse-noresumeafterpause.html
Lines changed: 2 additions & 2 deletions b/?LayoutTests/media/media-source/media-managedmse-noresumeafterpause.html
Lines changed: 2 additions & 2 deletions
diff --git a/?LayoutTests/media/media-source/media-managedmse-resume-after-remove-expected.txt
Lines changed: 27 additions & 0 deletions b/?LayoutTests/media/media-source/media-managedmse-resume-after-remove-expected.txt
Lines changed: 27 additions & 0 deletions
diff --git a/?LayoutTests/media/media-source/media-managedmse-resume-after-remove.html
Lines changed: 69 additions & 0 deletions b/?LayoutTests/media/media-source/media-managedmse-resume-after-remove.html
Lines changed: 69 additions & 0 deletions
diff --git a/?LayoutTests/media/media-source/media-managedmse-resume-after-stall-expected.txt
Lines changed: 4 additions & 0 deletions b/?LayoutTests/media/media-source/media-managedmse-resume-after-stall-expected.txt
Lines changed: 4 additions & 0 deletions
diff --git a/?LayoutTests/media/media-source/media-managedmse-resume-after-stall.html
Lines changed: 7 additions & 1 deletion b/?LayoutTests/media/media-source/media-managedmse-resume-after-stall.html
Lines changed: 7 additions & 1 deletion
diff --git a/?LayoutTests/media/media-source/media-managedmse-stall-endofstream-expected.txt
Lines changed: 27 additions & 0 deletions b/?LayoutTests/media/media-source/media-managedmse-stall-endofstream-expected.txt
Lines changed: 27 additions & 0 deletions
diff --git a/?LayoutTests/media/media-source/media-managedmse-stall-endofstream.html
Lines changed: 65 additions & 0 deletions b/?LayoutTests/media/media-source/media-managedmse-stall-endofstream.html
Lines changed: 65 additions & 0 deletions
diff --git a/?LayoutTests/media/media-source/media-source-fudge-factor-expected.txt
Lines changed: 2 additions & 0 deletions b/?LayoutTests/media/media-source/media-source-fudge-factor-expected.txt
Lines changed: 2 additions & 0 deletions
diff --git a/?LayoutTests/media/media-source/media-source-fudge-factor.html
Lines changed: 4 additions & 15 deletions b/?LayoutTests/media/media-source/media-source-fudge-factor.html
Lines changed: 4 additions & 15 deletions
@@ -12,7 +12,7 @@ EVENT(update)
 RUN(video.play())
 EVENT(playing)
 EVENT(waiting)
-EXPECTED (video.currentTime >= '1') OK
+EXPECTED (video.currentTime == '1') OK
 RUN(video.pause())
 RUN(sourceBuffer.appendBuffer(loader.mediaSegment(1)))
 EXPECTED (video.currentTime == currentTimeWhenStalling == 'true') OK
 
@@ -40,10 +40,10 @@
         run('video.play()');
         await waitFor(video, 'playing');
         await Promise.all([
-        testExpectedEventuallySilent('video.currentTime', 1, '>='),
+            testExpectedEventuallySilent('video.currentTime', 1, '>='),
             waitFor(video, 'waiting')
         ]);
-        testExpected('video.currentTime', 1, '>=');
+        testExpected('video.currentTime', 1, '==');
         currentTimeWhenStalling = video.currentTime;
 
         // Issue pause() command while playback has stalled.
 
@@ -0,0 +1,27 @@
+
+RUN(video.src = URL.createObjectURL(source))
+RUN(video.muted = true)
+RUN(video.playsInline = true)
+RUN(video.disableRemotePlayback = true)
+RUN(video.autoplay = true)
+EVENT(sourceopen)
+RUN(sourceBuffer = source.addSourceBuffer(loader.type()))
+RUN(sourceBuffer.appendBuffer(loader.initSegment()))
+EVENT(update)
+RUN(sourceBuffer.appendBuffer(loader.mediaSegment(0)))
+EVENT(update)
+RUN(video.currentTime = 1)
+EVENT(seeked)
+EXPECTED (video.currentTime >= '1.5') OK
+RUN(sourceBuffer.remove(1, sourceBuffer.buffered.end(0)))
+EVENT(waiting)
+EXPECTED (video.currentTime >= '1.5') OK
+EXPECTED (video.readyState == '1') OK
+EXPECTED (video.currentTime == currentTime == 'true') OK
+EXPECTED (video.readyState == '1') OK
+RUN(sourceBuffer.appendBuffer(loader.mediaSegment(0)))
+EVENT(update)
+EXPECTED (video.currentTime >= '2') OK
+EXPECTED (video.readyState >= video.HAVE_CURRENT_DATA == 'true') OK
+END OF TEST
+
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>mediasource-resume-after-remove</title>
+    <script src="media-source-loader.js"></script>
+    <script src="../video-test.js"></script>
+    <script>
+    var loader;
+    var source;
+    var sourceBuffer;
+    var currentTime;
+
+    function loaderPromise(loader) {
+        return new Promise((resolve, reject) => {
+            loader.onload = resolve;
+            loader.onerror = reject;
+        });
+    }
+
+    window.addEventListener('load', async event => {
+        findMediaElement();
+
+        loader = new MediaSourceLoader('content/test-vp9-profile0-manifest.json');
+        await loaderPromise(loader);
+
+        source = new ManagedMediaSource();
+        run('video.src = URL.createObjectURL(source)');
+        run('video.muted = true');
+        run('video.playsInline = true');
+        run('video.disableRemotePlayback = true');
+        run('video.autoplay = true');
+        await waitFor(source, 'sourceopen');
+        waitFor(video, 'error').then(failTest);
+        const playingPromise = waitFor(video, 'playing', true);
+
+        run('sourceBuffer = source.addSourceBuffer(loader.type())');
+        run('sourceBuffer.appendBuffer(loader.initSegment())');
+        await waitFor(sourceBuffer, 'update');
+
+        run('sourceBuffer.appendBuffer(loader.mediaSegment(0))');
+        await waitFor(sourceBuffer, 'update');
+        await playingPromise;
+        run('video.currentTime = 1');
+        await Promise.all([ waitFor(video, 'seeked'), testExpectedEventually("video.currentTime", 1.5, ">=") ]);
+
+        run('sourceBuffer.remove(1, sourceBuffer.buffered.end(0))');
+        await Promise.all([ waitFor(video, 'waiting'), waitFor(sourceBuffer, 'update', true)]);
+        testExpected('video.currentTime', 1.5, ">=");
+        currentTime = video.currentTime;
+        testExpected('video.readyState', video.HAVE_METADATA);
+
+        // make sure currentTime didn't progress.
+        await sleepFor(500);
+        testExpected('video.currentTime == currentTime',true);
+        testExpected('video.readyState', video.HAVE_METADATA);
+
+        run('sourceBuffer.appendBuffer(loader.mediaSegment(0))');
+        await waitFor(sourceBuffer, 'update');
+        await testExpectedEventually("video.currentTime", 2, ">=");
+        testExpected('video.readyState >= video.HAVE_CURRENT_DATA', true);
+
+        endTest();
+    });
+    </script>
+</head>
+<body>
+    <video></video>
+</body>
+</html>
@@ -14,6 +14,10 @@ RUN(sourceBuffer.appendBuffer(loader.mediaSegment(1)))
 EVENT(update)
 RUN(sourceBuffer.appendBuffer(loader.mediaSegment(2)))
 EVENT(update)
+EXPECTED (video.buffered.length == '1') OK
+EXPECTED (video.buffered.end(0) == '3') OK
+EVENT(waiting)
+EXPECTED (video.currentTime == '3') OK
 RUN(sourceBuffer.appendBuffer(loader.mediaSegment(3)))
 EVENT(update)
 RUN(sourceBuffer.appendBuffer(loader.mediaSegment(4)))
 
@@ -30,6 +30,7 @@
         run('video.autoplay = true');
         await waitFor(source, 'sourceopen');
         waitFor(video, 'error').then(failTest);
+        const playingPromise = waitFor(video, 'playing', true);
 
         run('sourceBuffer = source.addSourceBuffer(loader.type())');
         run('sourceBuffer.appendBuffer(loader.initSegment())');
@@ -42,8 +43,13 @@
         await waitFor(sourceBuffer, 'update');
         run('sourceBuffer.appendBuffer(loader.mediaSegment(2))');
         await waitFor(sourceBuffer, 'update');
+        testExpected('video.buffered.length', 1);
+        testExpected('video.buffered.end(0)', 3);
+        await playingPromise;
+
+        await waitFor(video, 'waiting');
+        testExpected('video.currentTime', video.buffered.end(0));
 
-        await sleepFor(3000);
         sourceBuffer.timestampOffset = -0.5;
 
         // Again, buffer a minimum of 3s, see reasons above.
 
@@ -0,0 +1,27 @@
+
+RUN(video.src = URL.createObjectURL(source))
+RUN(video.muted = true)
+RUN(video.playsInline = true)
+RUN(video.disableRemotePlayback = true)
+EVENT(sourceopen)
+RUN(sourceBuffer = source.addSourceBuffer(loader.type()))
+RUN(sourceBuffer.appendBuffer(loader.initSegment()))
+EVENT(loadedmetadata)
+EVENT(update)
+RUN(video.play())
+RUN(sourceBuffer.appendBuffer(loader.mediaSegment(0)))
+EVENT(update)
+RUN(sourceBuffer.appendBuffer(loader.mediaSegment(1)))
+EVENT(update)
+EXPECTED (video.buffered.length == '1') OK
+EXPECTED (video.buffered.end(0) == '2') OK
+EVENT(waiting)
+EXPECTED (video.currentTime == video.buffered.end(0) == 'true') OK
+RUN(source.endOfStream())
+EVENT(sourceended)
+EVENT(ended)
+EXPECTED (video.buffered.end(0) > endBuffered == 'true') OK
+EXPECTED (video.buffered.end(0) == video.duration == 'true') OK
+EXPECTED (video.currentTime == video.buffered.end(0) == 'true') OK
+END OF TEST
+
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>mediasource-resume-after-stall</title>
+    <script src="media-source-loader.js"></script>
+    <script src="../video-test.js"></script>
+    <script>
+    var loader;
+    var source;
+    var sourceBuffer;
+    var endBuffered;
+
+    function loaderPromise(loader) {
+        return new Promise((resolve, reject) => {
+            loader.onload = resolve;
+            loader.onerror = reject;
+        });
+    }
+
+    window.addEventListener('load', async event => {
+        findMediaElement();
+
+        loader = new MediaSourceLoader('content/test-fragmented-manifest.json');
+        await loaderPromise(loader);
+
+        source = new ManagedMediaSource();
+        run('video.src = URL.createObjectURL(source)');
+        run('video.muted = true');
+        run('video.playsInline = true');
+        run('video.disableRemotePlayback = true');
+        await waitFor(source, 'sourceopen');
+        waitFor(video, 'error').then(failTest);
+        const playingPromise = waitFor(video, 'playing', true);
+
+        run('sourceBuffer = source.addSourceBuffer(loader.type())');
+        run('sourceBuffer.appendBuffer(loader.initSegment())');
+        await Promise.all([ waitFor(video, 'loadedmetadata'), waitFor(sourceBuffer, 'update') ]);
+        run('video.play()');
+
+        run('sourceBuffer.appendBuffer(loader.mediaSegment(0))');
+        await waitFor(sourceBuffer, 'update');
+        run('sourceBuffer.appendBuffer(loader.mediaSegment(1))');
+        await waitFor(sourceBuffer, 'update');
+        testExpected('video.buffered.length', 1);
+        testExpected('video.buffered.end(0)', 2);
+        await playingPromise;
+        await Promise.all([ waitFor(video, 'waiting') ]);
+        testExpected('video.currentTime == video.buffered.end(0)', true);
+        const endedPromise = waitFor(video, 'ended');
+        endBuffered = video.buffered.end(0);
+        run('source.endOfStream()');
+        await Promise.all([ waitFor(source, 'sourceended'), endedPromise ]);
+        // Following call to endOfStream() buffered range was extended to the last
+        // known sample and playback resumed to the end.
+        testExpected('video.buffered.end(0) > endBuffered', true);
+        testExpected('video.buffered.end(0) == video.duration', true);
+        testExpected('video.currentTime == video.buffered.end(0)', true);
+        endTest();
+    });
+    </script>
+</head>
+<body>
+    <video></video>
+</body>
+</html>
@@ -3,12 +3,14 @@ RUN(video.src = URL.createObjectURL(source))
 EVENT(loadedmetadata)
 EVENT(update)
 Samples with presentation times after currentTime should not cause loadedData.
+EVENT(update)
 EXPECTED (video.readyState == '1') OK
 Samples with presentation times very close to currentTime should cause loadedData.
 EVENT(loadeddata)
 EVENT(update)
 EXPECTED (video.readyState == '2') OK
 Samples with presentation end times very close to currentTime should not cause canPlay.
+EVENT(update)
 EXPECTED (video.readyState == '2') OK
 Continuous samples with presentation end times after currentTime should cause canPlay.
 EVENT(canplay)
 
@@ -8,10 +8,6 @@
     var source;
     var sourceBuffer;
 
-    var requestLength = 200000;
-    var nextRequest = 0;
-    var totalLength = 100;
-
     if (window.internals)
         internals.initializeMockMediaSource();
 
@@ -32,10 +28,7 @@
 
         consoleWrite('Samples with presentation times after currentTime should not cause loadedData.');
         sourceBuffer.appendBuffer(makeASample(500, 500, 500, 1000, 1, SAMPLE_FLAG.SYNC));
-        setTimeout(notLoadedData, 50);
-    }
-
-    async function notLoadedData() {
+        await waitFor(sourceBuffer, 'update');
         testExpected('video.readyState', HTMLMediaElement.HAVE_METADATA);
 
         consoleWrite('Samples with presentation times very close to currentTime should cause loadedData.');
@@ -46,19 +39,15 @@
 
         consoleWrite('Samples with presentation end times very close to currentTime should not cause canPlay.');
         sourceBuffer.appendBuffer(makeASample(20, 20, 10, 1000, 1, SAMPLE_FLAG.SYNC));
-        setTimeout(notCanPlay, 50);
-    }
+        await waitFor(sourceBuffer, 'update');
 
-    function notCanPlay() {
         testExpected('video.readyState', HTMLMediaElement.HAVE_CURRENT_DATA);
 
         consoleWrite('Continuous samples with presentation end times after currentTime should cause canPlay.');
         sourceBuffer.appendBuffer(makeASample(30, 30, 470, 1000, 1, SAMPLE_FLAG.SYNC));
-        waitForEvent('canplay', canPlay);
-    }
-
-    function canPlay() {
+        await waitFor(video, 'canplay');
         testExpected('video.readyState', HTMLMediaElement.HAVE_FUTURE_DATA, '>=');
+
         endTest();
     }
     </script>
为什么不建议切除脂肪瘤	九孔藕和七孔藕有什么区别	莲雾吃了有什么好处	隔空是什么意思	痣是什么
微波炉不热是什么原因	1994年属什么生肖	1993年属鸡是什么命	南京五行属什么	光阴是什么意思
前胸后背疼是什么原因	什么的技术	吃什么醒酒	六月份出生的是什么星座	世界杯是什么时候
脑电图能检查出什么疾病	鱼鳞云有什么预兆	斐乐手表属于什么档次	彼岸花什么时候开花	在什么什么前面
桃花像什么hcv9jop4ns3r.cn	西瓜红是什么颜色hcv7jop9ns6r.cn	lancome是什么品牌hcv9jop5ns0r.cn	血管痉挛吃什么药hcv9jop4ns8r.cn	move什么意思hcv9jop4ns6r.cn
日本桑是什么意思hcv7jop6ns4r.cn	脾虚湿气重吃什么药hcv8jop5ns8r.cn	急性肠胃炎可以吃什么水果hcv9jop0ns0r.cn	糖化血红蛋白是什么hcv9jop6ns4r.cn	子代表什么意思hcv8jop6ns7r.cn
五月十四号是什么情人节hcv9jop5ns2r.cn	朱门是什么意思hcv7jop9ns4r.cn	中科院是干什么的hcv8jop0ns1r.cn	九六年属什么的hcv8jop3ns0r.cn	中医为什么不让睡凉席hcv9jop3ns5r.cn
石榴什么时候开花hcv8jop9ns4r.cn	甲功能5项检查是查的什么hcv9jop2ns7r.cn	血糖30多有什么危险hcv9jop5ns9r.cn	法警是干什么的hkuteam.com	双眼屈光不正是什么意思hcv9jop1ns3r.cn