Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1247138) for permafailing media mochitests on OSX 10.6 a=backout

Browse Source 
Backed out changeset 34f5a7144be3 (bug 1247138)
Backed out changeset fbcd1815776a (bug 1247138)

MozReview-Commit-ID: 5PLY4dZx3me
This commit is contained in:
Wes Kocher 2016-04-20 11:01:09 -07:00
parent 9eb45808ae
commit 7f155f79ba
15 changed files with 8 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/media/mediasource/TrackBuffersManager.cpp
View File

@ -1094,6 +1094,14 @@ TrackBuffersManager::OnDemuxerInitDone(nsresult)
// 6. Set first initialization segment received flag to true.
mFirstInitializationSegmentReceived = true;
} else {
// Check that audio configuration hasn't changed as this is something
// we do not support yet (bug 1185827).
if (mAudioTracks.mNumTracks &&
(info.mAudio.mChannels != mAudioTracks.mInfo->GetAsAudioInfo()->mChannels ||
info.mAudio.mRate != mAudioTracks.mInfo->GetAsAudioInfo()->mRate)) {
RejectAppend(NS_ERROR_FAILURE, __func__);
return;
}
mAudioTracks.mLastInfo = new SharedTrackInfo(info.mAudio, streamID);
mVideoTracks.mLastInfo = new SharedTrackInfo(info.mVideo, streamID);
}

BIN
dom/media/mediasource/test/aac20-48000-64000-1.m4s
View File

Binary file not shown.

1
dom/media/mediasource/test/aac20-48000-64000-1.m4s^headers^
View File

@ -1 +0,0 @@
Cache-Control: no-store

BIN
dom/media/mediasource/test/aac20-48000-64000-2.m4s
View File

Binary file not shown.

1
dom/media/mediasource/test/aac20-48000-64000-2.m4s^headers^
View File

@ -1 +0,0 @@
Cache-Control: no-store

BIN
dom/media/mediasource/test/aac20-48000-64000-init.mp4
View File

Binary file not shown.

1
dom/media/mediasource/test/aac20-48000-64000-init.mp4^headers^
View File

@ -1 +0,0 @@
Cache-Control: no-store

BIN
dom/media/mediasource/test/aac51-48000-128000-1.m4s
View File

Binary file not shown.

1
dom/media/mediasource/test/aac51-48000-128000-1.m4s^headers^
View File

@ -1 +0,0 @@
Cache-Control: no-store

BIN
dom/media/mediasource/test/aac51-48000-128000-2.m4s
View File

Binary file not shown.

1
dom/media/mediasource/test/aac51-48000-128000-2.m4s^headers^
View File

@ -1 +0,0 @@
Cache-Control: no-store

BIN
dom/media/mediasource/test/aac51-48000-128000-init.mp4
View File

Binary file not shown.

1
dom/media/mediasource/test/aac51-48000-128000-init.mp4^headers^
View File

@ -1 +0,0 @@
Cache-Control: no-store

8
dom/media/mediasource/test/mochitest.ini
View File

@ -34,15 +34,7 @@ support-files =
bipbop/bipbop11.m4s^headers^ bipbop/bipbop_audio11.m4s^headers^ bipbop/bipbop_video11.m4s^headers^
bipbop/bipbop12.m4s^headers^ bipbop/bipbop_video12.m4s^headers^
bipbop/bipbop13.m4s^headers^ bipbop/bipbop_video13.m4s^headers^
aac20-48000-64000-init.mp4 aac20-48000-64000-init.mp4^headers^
aac20-48000-64000-1.m4s aac20-48000-64000-1.m4s^headers^
aac20-48000-64000-2.m4s aac20-48000-64000-2.m4s^headers^
aac51-48000-128000-init.mp4 aac51-48000-128000-init.mp4^headers^
aac51-48000-128000-1.m4s aac51-48000-128000-1.m4s^headers^
aac51-48000-128000-2.m4s aac51-48000-128000-2.m4s^headers^
[test_AudioChange_mp4.html]
skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
[test_BufferedSeek.html]
[test_BufferedSeek_mp4.html]
skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3

72
dom/media/mediasource/test/test_AudioChange_mp4.html
View File

@ -1,72 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>MSE: basic functionality</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();
// This test checks loading a stereo segment, followed by a 5.1 segment plays without error.
runWithMSE(function(ms, el) {
el.controls = true;
once(ms, 'sourceopen').then(function() {
// Log events for debugging.
var events = ["suspend", "play", "canplay", "canplaythrough", "loadstart", "loadedmetadata",
"loadeddata", "playing", "ended", "error", "stalled", "emptied", "abort",
"waiting", "pause", "durationchange", "seeking", "seeked"];
function logEvent(e) {
var v = e.target;
info("got " + e.type + " event");
}
events.forEach(function(e) {
el.addEventListener(e, logEvent, false);
});
ok(true, "Receive a sourceopen event");
var audiosb = ms.addSourceBuffer("audio/mp4");
el.addEventListener("error", function(e) {
ok(false, "should not fire '" + e.type + "' event");
SimpleTest.finish();
});
is(el.readyState, el.HAVE_NOTHING, "readyState is HAVE_NOTHING");
fetchAndLoad(audiosb, 'aac20-48000-64000-', ['init'], '.mp4')
.then(once.bind(null, el, 'loadedmetadata'))
.then(function() {
ok(true, "got loadedmetadata event");
var promises = [];
promises.push(once(el, 'loadeddata'));
promises.push(once(el, 'canplay'));
promises.push(fetchAndLoad(audiosb, 'aac20-48000-64000-', ['1'], '.m4s'));
return Promise.all(promises);
})
.then(function() {
ok(true, "got canplay event");
el.play();
return fetchAndLoad(audiosb, 'aac51-48000-128000-', ['init'], '.mp4');
})
.then(fetchAndLoad.bind(null, audiosb, 'aac51-48000-128000-', ['2'], '.m4s'))
.then(function() {
var promises = [];
ms.endOfStream();
promises.push(once(el, 'ended'));
promises.push(once(audiosb, 'updateend'));
return Promise.all(promises);
})
.then(function() {
ok(el.currentTime >= 6, "played to the end");
SimpleTest.finish();
})
});
});
</script>
</pre>
</body>
</html>