wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1065855) for failing their freshly-landed test

Browse Source 
CLOSED TREE

Backed out changeset 2605dfc0996d (bug 1065855)
Backed out changeset 8a945498a0e4 (bug 1065855)
This commit is contained in:
Phil Ringnalda 2014-09-11 21:55:13 -07:00
parent 2ac72a4fb6
commit 5621efe898
8 changed files with 2 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/media/mediasource/MediaSource.h
View File

@ -105,10 +105,6 @@ public:
#endif
private:
// MediaSourceDecoder uses DurationChange to set the duration
// without hitting the checks in SetDuration.
friend class mozilla::MediaSourceDecoder;
~MediaSource();
explicit MediaSource(nsPIDOMWindow* aWindow);

3
content/media/mediasource/MediaSourceDecoder.cpp
View File

@ -76,7 +76,6 @@ MediaSourceDecoder::GetSeekable(dom::TimeRanges* aSeekable)
if (!mMediaSource) {
return NS_ERROR_FAILURE;
}
double duration = mMediaSource->Duration();
if (IsNaN(duration)) {
// Return empty range.
@ -170,7 +169,7 @@ MediaSourceDecoder::SetMediaSourceDuration(double aDuration)
return;
}
ErrorResult dummy;
mMediaSource->DurationChange(aDuration, dummy);
mMediaSource->SetDuration(aDuration, dummy);
}
void

5
content/media/mediasource/test/mochitest.ini
View File

@ -9,9 +9,6 @@ support-files =
[test_FrameSelection.html]
skip-if = os == "mac"
[test_MediaSource.html]
[test_SeekableAfterEndOfStream.html]
[test_SeekableAfterEndOfStreamSplit.html]
[test_SeekableBeforeEndOfStream.html]
[test_SeekableBeforeEndOfStreamSplit.html]
[test_SplitAppendDelay.html]
[test_SplitAppend.html]

19
content/media/mediasource/test/test_MediaSource.html
View File

@ -41,11 +41,6 @@ runWithMSE(function () {
v.src = o;
document.body.appendChild(v);
var loadedmetadataCount = 0;
var updatestartCount = 0;
var updateendCount = 0;
var updateCount = 0;
ms.addEventListener("sourceopen", function () {
ok(true, "Receive a sourceopen event");
is(ms.readyState, "open", "MediaSource must be in open state after sourceopen");
@ -62,17 +57,11 @@ runWithMSE(function () {
sb.addEventListener("update", function () {
is(sb.updating, false, "SourceBuffer.updating is expected value in update event");
updateCount++;
ms.endOfStream();
});
sb.addEventListener("updatestart", function () {
updatestartCount++;
});
sb.addEventListener("updateend", function () {
is(sb.updating, false, "SourceBuffer.updating is expected value in updateend event");
updateendCount++;
v.play();
});
});
@ -82,17 +71,9 @@ runWithMSE(function () {
is(ms.readyState, "ended", "MediaSource must be in ended state after sourceended");
});
v.addEventListener("loadedmetadata", function () {
loadedmetadataCount++;
});
v.addEventListener("ended", function () {
is(v.duration, 4, "Video has correct duration");
is(v.currentTime, 4, "Video has played to end");
is(updateCount, 1, "update event received");
is(updateendCount, 1, "updateend event received");
is(updatestartCount, 1, "updatestart event received");
is(loadedmetadataCount, 1, "loadedmetadata event received");
v.parentNode.removeChild(v);
SimpleTest.finish();
});

49
content/media/mediasource/test/test_SeekableAfterEndOfStream.html
View File

@ -1,49 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>MSE: seekable attribute after end of stream</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="mediasource.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
runWithMSE(function () {
var ms = new MediaSource();
var v = document.createElement("video");
v.preload = "auto";
v.src = URL.createObjectURL(ms);
document.body.appendChild(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 () {
ms.endOfStream()
});
});
var target = 2;
v.addEventListener("loadedmetadata", function () {
ok(v.seekable.length, "Resource is seekable");
ok(v.seekable.length &&
target >= v.seekable.start(0) &&
target < v.seekable.end(0), "Target is within seekable range");
v.parentNode.removeChild(v);
SimpleTest.finish();
});
});
});
</script>
</pre>
</body>
</html>

56
content/media/mediasource/test/test_SeekableAfterEndOfStreamSplit.html
View File

@ -1,56 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>MSE: seekable attribute after end of stream with split appendBuffer</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="mediasource.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
runWithMSE(function () {
var ms = new MediaSource();
var v = document.createElement("video");
v.preload = "auto";
v.src = URL.createObjectURL(ms);
document.body.appendChild(v);
ms.addEventListener("sourceopen", function () {
var sb = ms.addSourceBuffer("video/webm");
fetchWithXHR("seek.webm", function (arrayBuffer) {
sb.appendBuffer(new Uint8Array(arrayBuffer, 0, 25223));
var updateCount = 0;
sb.addEventListener("updateend", function () {
updateCount++;
if (updateCount == 1) {
sb.appendBuffer(new Uint8Array(arrayBuffer, 25223));
}
else {
ms.endOfStream();
}
});
});
var target = 2;
v.addEventListener("loadedmetadata", function () {
ok(v.seekable.length, "Resource is seekable");
ok(v.seekable.length &&
target >= v.seekable.start(0) &&
target < v.seekable.end(0), "Target is within seekable range");
v.parentNode.removeChild(v);
SimpleTest.finish();
});
});
});
</script>
</pre>
</body>
</html>

46
content/media/mediasource/test/test_SeekableBeforeEndOfStream.html
View File

@ -1,46 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>MSE: seekable attribute before end of stream</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="mediasource.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
runWithMSE(function () {
var ms = new MediaSource();
var v = document.createElement("video");
v.preload = "auto";
v.src = URL.createObjectURL(ms);
document.body.appendChild(v);
ms.addEventListener("sourceopen", function () {
var sb = ms.addSourceBuffer("video/webm");
fetchWithXHR("seek.webm", function (arrayBuffer) {
sb.appendBuffer(new Uint8Array(arrayBuffer));
});
var target = 2;
v.addEventListener("loadedmetadata", function () {
ok(v.seekable.length, "Resource is seekable");
ok(v.seekable.length &&
target >= v.seekable.start(0) &&
target < v.seekable.end(0), "Target is within seekable range");
v.parentNode.removeChild(v);
SimpleTest.finish();
});
});
});
</script>
</pre>
</body>
</html>

49
content/media/mediasource/test/test_SeekableBeforeEndOfStreamSplit.html
View File

@ -1,49 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>MSE: seekable attribute before end of stream with split appendBuffer</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="mediasource.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
runWithMSE(function () {
var ms = new MediaSource();
var v = document.createElement("video");
v.preload = "auto";
v.src = URL.createObjectURL(ms);
document.body.appendChild(v);
ms.addEventListener("sourceopen", function () {
var sb = ms.addSourceBuffer("video/webm");
fetchWithXHR("seek.webm", function (arrayBuffer) {
sb.appendBuffer(new Uint8Array(arrayBuffer, 0, 25223));
sb.addEventListener("updateend", function () {
sb.appendBuffer(new Uint8Array(arrayBuffer, 25223));
});
});
var target = 2;
v.addEventListener("loadedmetadata", function () {
ok(v.seekable.length, "Resource is seekable");
ok(v.seekable.length &&
target >= v.seekable.start(0) &&
target < v.seekable.end(0), "Target is within seekable range");
v.parentNode.removeChild(v);
SimpleTest.finish();
});
});
});
</script>
</pre>
</body>
</html>