Bug 1357040: P5. Remove unecessary code. r?gerald
We have no need to call endOfStream here as we don't rely on the ended event being fired.
Also, there's no need to track how many update count we will get when we only use appendBuffer once.
Adding extra test to help identify where the actual failure of the test could occur.
MozReview-Commit-ID: HIu1XQpHark
--- a/dom/media/mediasource/test/test_BufferedSeek.html
+++ b/dom/media/mediasource/test/test_BufferedSeek.html
@@ -7,38 +7,28 @@
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
-var updateCount = 0;
-
runWithMSE(function (ms, v) {
ms.addEventListener("sourceopen", function () {
var sb = ms.addSourceBuffer("video/webm");
fetchWithXHR("seek.webm", function (arrayBuffer) {
sb.appendBuffer(new Uint8Array(arrayBuffer));
- sb.addEventListener("updateend", function () {
- updateCount++;
- /* Ensure that we endOfStream on the first update event only as endOfStream can
- raise more if the duration of the last buffered range and the intial duration
- differ. See bug 1065207 */
- if (updateCount == 1) {
- ms.endOfStream();
- };
- });
});
var target = 2;
v.addEventListener("loadedmetadata", function () {
+ ok(true, "received loadedmetadata");
v.currentTime = target;
});
var wasSeeking = false;
v.addEventListener("seeking", function () {
wasSeeking = true;
is(v.currentTime, target, "Video currentTime at target");
--- a/dom/media/mediasource/test/test_BufferedSeek_mp4.html
+++ b/dom/media/mediasource/test/test_BufferedSeek_mp4.html
@@ -7,38 +7,28 @@
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
-var updateCount = 0;
-
runWithMSE(function (ms, v) {
ms.addEventListener("sourceopen", function () {
var sb = ms.addSourceBuffer("video/mp4");
fetchWithXHR("bipbop/bipbop2s.mp4", function (arrayBuffer) {
sb.appendBuffer(new Uint8Array(arrayBuffer));
- sb.addEventListener("updateend", function () {
- updateCount++;
- /* Ensure that we endOfStream on the first update event only as endOfStream can
- raise more if the duration of the last buffered range and the intial duration
- differ. See bug 1065207 */
- if (updateCount == 1) {
- ms.endOfStream();
- };
- });
});
var target = 1.3;
v.addEventListener("loadedmetadata", function () {
+ ok(true, "received loadedmetadata");
v.currentTime = target;
});
var wasSeeking = false;
v.addEventListener("seeking", function () {
wasSeeking = true;
is(v.currentTime, target, "Video currentTime at target");