Backed out changeset 9ad2b86b9b30 (bug 1247138)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 18 Apr 2016 14:40:57 +0200
changeset 331468 153b665717cf58c7409227acf86b5ef5cc6315dd
parent 331467 a6eb4d3e373fbe117d1c527ed5cfcdabf8ef1f29
child 331469 ca4c37c89034e5750d74b72817f8b701b5e56c5e
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1247138
milestone48.0a1
backs out9ad2b86b9b309ac3a3faab615311b68a158fc104
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 9ad2b86b9b30 (bug 1247138)
dom/media/mediasource/test/aac20-48000-64000-1.m4s
dom/media/mediasource/test/aac20-48000-64000-1.m4s^headers^
dom/media/mediasource/test/aac20-48000-64000-2.m4s
dom/media/mediasource/test/aac20-48000-64000-2.m4s^headers^
dom/media/mediasource/test/aac20-48000-64000-init.mp4
dom/media/mediasource/test/aac20-48000-64000-init.mp4^headers^
dom/media/mediasource/test/aac51-48000-128000-1.m4s
dom/media/mediasource/test/aac51-48000-128000-1.m4s^headers^
dom/media/mediasource/test/aac51-48000-128000-2.m4s
dom/media/mediasource/test/aac51-48000-128000-2.m4s^headers^
dom/media/mediasource/test/aac51-48000-128000-init.mp4
dom/media/mediasource/test/aac51-48000-128000-init.mp4^headers^
dom/media/mediasource/test/mochitest.ini
dom/media/mediasource/test/test_AudioChange_mp4.html
deleted file mode 100644
index 56506e1f2da0b9304bafc93d3b26e2d88d1f1339..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/dom/media/mediasource/test/aac20-48000-64000-1.m4s^headers^
+++ /dev/null
@@ -1,1 +0,0 @@
-Cache-Control: no-store
deleted file mode 100644
index 3faff17ebf709d76b471751ba9e3f0e37e522b00..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/dom/media/mediasource/test/aac20-48000-64000-2.m4s^headers^
+++ /dev/null
@@ -1,1 +0,0 @@
-Cache-Control: no-store
deleted file mode 100644
index b70e01651272eeebaf6f192f833e45aadbd451ec..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/dom/media/mediasource/test/aac20-48000-64000-init.mp4^headers^
+++ /dev/null
@@ -1,1 +0,0 @@
-Cache-Control: no-store
deleted file mode 100644
index 3424acfecca8ef311a09914026d0b81f2b002977..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/dom/media/mediasource/test/aac51-48000-128000-1.m4s^headers^
+++ /dev/null
@@ -1,1 +0,0 @@
-Cache-Control: no-store
deleted file mode 100644
index b02bfd043d38d87da6538f3fd72813aee7d2b675..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/dom/media/mediasource/test/aac51-48000-128000-2.m4s^headers^
+++ /dev/null
@@ -1,1 +0,0 @@
-Cache-Control: no-store
deleted file mode 100644
index 7d62401f288eb36868b7eba94a8013cb73516141..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/dom/media/mediasource/test/aac51-48000-128000-init.mp4^headers^
+++ /dev/null
@@ -1,1 +0,0 @@
-Cache-Control: no-store
--- a/dom/media/mediasource/test/mochitest.ini
+++ b/dom/media/mediasource/test/mochitest.ini
@@ -29,25 +29,17 @@ support-files =
   bipbop/bipbop6.m4s^headers^ bipbop/bipbop_audio6.m4s^headers^ bipbop/bipbop_video6.m4s^headers^
   bipbop/bipbop7.m4s^headers^ bipbop/bipbop_audio7.m4s^headers^ bipbop/bipbop_video7.m4s^headers^
   bipbop/bipbop8.m4s^headers^ bipbop/bipbop_audio8.m4s^headers^ bipbop/bipbop_video8.m4s^headers^
   bipbop/bipbop9.m4s^headers^ bipbop/bipbop_audio9.m4s^headers^ bipbop/bipbop_video9.m4s^headers^
   bipbop/bipbop10.m4s^headers^ bipbop/bipbop_audio10.m4s^headers^ bipbop/bipbop_video10.m4s^headers^
   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
 [test_BufferingWait.html]
 skip-if = toolkit == 'android' #timeout android bug 1199531
 [test_BufferingWait_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_DrainOnMissingData_mp4.html]
deleted file mode 100644
--- a/dom/media/mediasource/test/test_AudioChange_mp4.html
+++ /dev/null
@@ -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>