Bug 1093980 - Rewrite test_FrameSelection to avoid assuming that resizes will always be processed before firing 'seeked'. rpending=mattwoodrow

Nothing in the spec says this should hold, and it holds less often when we move
invalidation to happen at the end of seeking.
This commit is contained in:
Bobby Holley 2015-03-05 12:33:05 -08:00
parent 91d1025f91
commit 774e705988

View File

@ -14,55 +14,60 @@ SimpleTest.waitForExplicitFinish();
var updateCount = 0;
runWithMSE(function (ms, v) {
ms.addEventListener("sourceopen", function () {
var sb = ms.addSourceBuffer("video/webm");
fetchWithXHR("seek.webm", function (arrayBuffer) {
// Append entire file covering range [0, 4].
sb.appendBuffer(new Uint8Array(arrayBuffer));
});
var targets = [{ currentTime: 3, videoWidth: 160, videoHeight: 120 },
{ currentTime: 2, videoWidth: 160, videoHeight: 120 },
{ currentTime: 0, videoWidth: 320, videoHeight: 240 }];
var target;
v.addEventListener("loadedmetadata", function () {
var lowResBuffer;
runWithMSE(function (ms, v) {
ms.addEventListener("sourceopen", function () {
var sb = ms.addSourceBuffer("video/webm");
fetchWithXHR("seek.webm")
.then(function (arrayBuffer) {
var p = once(v, 'loadedmetadata');
// Append entire file covering range [0, 4].
sb.appendBuffer(new Uint8Array(arrayBuffer));
return p;
}).then(function() {
is(v.currentTime, 0, "currentTime has correct initial value");
is(v.videoWidth, 320, "videoWidth has correct initial value");
is(v.videoHeight, 240, "videoHeight has correct initial value");
fetchWithXHR("seek_lowres.webm", function (arrayBuffer) {
return fetchWithXHR("seek_lowres.webm");
}).then(function (arrayBuffer) {
// Append initialization segment.
var p = once(sb, 'updateend');
info("Appending low-res init segment");
sb.appendBuffer(new Uint8Array(arrayBuffer, 0, 438));
sb.addEventListener("updateend", function () {
updateCount++;
if (updateCount == 1) {
lowResBuffer = arrayBuffer;
return p;
}).then(function() {
var p = once(sb, 'updateend');
info("Appending low-res range [2,4]");
// Append media segment covering range [2, 4].
sb.appendBuffer(new Uint8Array(arrayBuffer, 51003));
}
else if (updateCount == 2) {
sb.appendBuffer(new Uint8Array(lowResBuffer, 51003));
return p;
}).then(function() {
ms.endOfStream();
target = targets.shift();
v.currentTime = target.currentTime;
}
});
});
});
var p = Promise.all([once(v, 'seeked'), once(v, 'resize')]);
info("Seeking to t=3");
v.currentTime = 3;
return p;
}).then(function() {
is(v.currentTime, 3, "Video currentTime at target");
is(v.videoWidth, 160, "videoWidth has correct low-res value");
is(v.videoHeight, 120, "videoHeight has correct low-res value");
v.addEventListener("seeked", function () {
is(v.currentTime, target.currentTime, "Video currentTime at target");
is(v.videoWidth, target.videoWidth, "videoWidth has correct final value");
is(v.videoHeight, target.videoHeight, "videoHeight has correct final value");
target = targets.shift();
if (target) {
v.currentTime = target.currentTime;
} else {
var p = Promise.all([once(v, 'seeked'), once(v, 'resize')]);
info("Seeking to t=1");
v.currentTime = 1;
return p;
}).then(function() {
is(v.currentTime, 1, "Video currentTime at target");
is(v.videoWidth, 320, "videoWidth has correct high-res value");
is(v.videoHeight, 240, "videoHeight has correct high-res value");
SimpleTest.finish();
}
});
});
});