Bug 1182946: [MSE] Re-enable webm mediasource tests. r=jya,r=karlt
☠☠ backed out by eb58591dc190 ☠ ☠
authorJan Gerber <j@mailb.org>
Mon, 03 Aug 2015 13:38:51 +0200
changeset 288479 b9c50a97ee3ed413476928b269741e97206a6248
parent 288478 a2cfbfac8ae898ff1e16ec893dfbbc247c8f8ee2
child 288480 0a7ec92071a5f547c3b13f4abca6aa9d2e848f15
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya, karlt
bugs1182946
milestone42.0a1
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
Bug 1182946: [MSE] Re-enable webm mediasource tests. r=jya,r=karlt
dom/media/mediasource/test/mochitest.ini
dom/media/mediasource/test/test_SetModeThrows.html
testing/profiles/prefs_general.js
testing/web-platform/meta/media-source/SourceBuffer-abort-readyState.html.ini
testing/web-platform/meta/media-source/SourceBuffer-abort-removed.html.ini
testing/web-platform/meta/media-source/SourceBuffer-abort-updating.html.ini
testing/web-platform/meta/media-source/SourceBuffer-abort.html.ini
testing/web-platform/meta/media-source/interfaces.html.ini
testing/web-platform/meta/media-source/mediasource-addsourcebuffer.html.ini
testing/web-platform/meta/media-source/mediasource-append-buffer.html.ini
testing/web-platform/meta/media-source/mediasource-appendwindow.html.ini
testing/web-platform/meta/media-source/mediasource-buffered.html.ini
testing/web-platform/meta/media-source/mediasource-closed.html.ini
testing/web-platform/meta/media-source/mediasource-duration-boundaryconditions.html.ini
testing/web-platform/meta/media-source/mediasource-getvideoplaybackquality.html.ini
testing/web-platform/meta/media-source/mediasource-is-type-supported.html.ini
testing/web-platform/meta/media-source/mediasource-play.html.ini
testing/web-platform/meta/media-source/mediasource-redundant-seek.html.ini
testing/web-platform/meta/media-source/mediasource-remove.html.ini
testing/web-platform/meta/media-source/mediasource-removesourcebuffer.html.ini
testing/web-platform/meta/media-source/mediasource-seek-during-pending-seek.html.ini
testing/web-platform/meta/media-source/mediasource-sourcebuffer-mode.html.ini
testing/web-platform/meta/media-source/mediasource-sourcebufferlist.html.ini
testing/web-platform/meta/media-source/mediasource-timestamp-offset.html.ini
--- a/dom/media/mediasource/test/mochitest.ini
+++ b/dom/media/mediasource/test/mochitest.ini
@@ -30,84 +30,69 @@ support-files =
   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^
 
 [test_BufferedSeek.html]
-skip-if = true # bug 1182946
 [test_BufferedSeek_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_BufferingWait.html]
-skip-if = true # bug 1182946
+skip-if = true # bug 1190776
 [test_BufferingWait_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_EndOfStream.html]
 skip-if = (true || toolkit == 'android' || buildapp == 'mulet') #timeout android/mulet only bug 1101187 and bug 1182946
 [test_EndOfStream_mp4.html]
 skip-if = (toolkit == 'android' || buildapp == 'mulet') || ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_DurationUpdated.html]
-skip-if = true # bug 1182946
 [test_DurationUpdated_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_FrameSelection.html]
-skip-if = true # bug 1182946
 [test_HaveMetadataUnbufferedSeek.html]
-skip-if = true # bug 1182946
 [test_HaveMetadataUnbufferedSeek_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_LoadedMetadataFired.html]
-skip-if = true # bug 1182946
 [test_LoadedMetadataFired_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_MediaSource.html]
-skip-if = true # bug 1182946
 [test_MediaSource_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_MediaSource_disabled.html]
 [test_MultipleInitSegments.html]
-skip-if = true # bug 1182946
 [test_MultipleInitSegments_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_SeekableAfterEndOfStream.html]
-skip-if = true # bug 1182946
 [test_SeekableAfterEndOfStream_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_SeekableAfterEndOfStreamSplit.html]
-skip-if = true # bug 1182946
 [test_SeekableAfterEndOfStreamSplit_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_SeekableBeforeEndOfStream.html]
-skip-if = true # bug 1182946
 [test_SeekableBeforeEndOfStream_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_SeekableBeforeEndOfStreamSplit.html]
-skip-if = true # bug 1182946
 [test_SeekableBeforeEndOfStreamSplit_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_SeekNoData_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_SeekTwice_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_SetModeThrows.html]
-skip-if = true # bug 1182946
 [test_SplitAppendDelay.html]
-skip-if = true # bug 1182946
 [test_SplitAppendDelay_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_SplitAppend.html]
-skip-if = true # bug 1182946
 [test_SplitAppend_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_TimestampOffset_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_TruncatedDuration.html]
-skip-if = true # bug 1182946
 [test_TruncatedDuration_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_WaitingOnMissingData.html]
 skip-if = true # Disabled due to bug 1124493 and friends. WebM MSE is deprioritized.
 [test_WaitingOnMissingData_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
 [test_WaitingToEndedTransition_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (os != "win" && os != "mac")) # Only supported on osx and vista+
--- a/dom/media/mediasource/test/test_SetModeThrows.html
+++ b/dom/media/mediasource/test/test_SetModeThrows.html
@@ -1,33 +1,33 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>MSE: append initialization only</title>
+  <title>MSE: append initialization</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 should be removed when we implement sequence mode in bug 1116353 
+// MSE supports setting mode now. make sure it does not throw.
 runWithMSE(function (ms, v) {
   ms.addEventListener("sourceopen", function () {
     var sb = ms.addSourceBuffer("video/webm");
 
     sb.mode = "segments";
     ok("true", "Setting to segments does not throw");
     try {
       sb.mode = "sequence";
-      ok(false, "Should have thrown");
-    } catch (e) { ok(/supported/.test(e), "Correctly threw not supported: " + e); }
+      ok("true", "Setting to sequence does not throw");
+    } catch (e) { ok(false, "Should not throw setting mode to sequence: " + e); }
 
     SimpleTest.finish();
   });
 });
 
 </script>
 </pre>
 </body>
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -161,17 +161,17 @@ user_pref("layout.css.ruby.enabled", tru
 // Enable unicode-range for testing
 user_pref("layout.css.unicode-range.enabled", true);
 
 // Disable spammy layout warnings because they pollute test logs
 user_pref("layout.spammy_warnings.enabled", false);
 
 // Enable Media Source Extensions for testing
 user_pref("media.mediasource.mp4.enabled", true);
-user_pref("media.mediasource.webm.enabled", false);
+user_pref("media.mediasource.webm.enabled", true);
 
 // Enable mozContacts
 user_pref("dom.mozContacts.enabled", true);
 
 // Enable mozSettings
 user_pref("dom.mozSettings.enabled", true);
 
 // Make sure the disk cache doesn't get auto disabled
--- a/testing/web-platform/meta/media-source/SourceBuffer-abort-readyState.html.ini
+++ b/testing/web-platform/meta/media-source/SourceBuffer-abort-readyState.html.ini
@@ -1,11 +1,8 @@
 [SourceBuffer-abort-readyState.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [SourceBuffer#abort() (video/webm; codecs="vorbis,vp8") : If the readyState attribute of the parent media source is not in the "open" state then throw an INVALID_STATE_ERR exception and abort these steps.]
-    expected: FAIL
-
   [SourceBuffer#abort() (video/mp4) : If the readyState attribute of the parent media source is not in the "open" state then throw an INVALID_STATE_ERR exception and abort these steps.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/SourceBuffer-abort-removed.html.ini
+++ b/testing/web-platform/meta/media-source/SourceBuffer-abort-removed.html.ini
@@ -1,11 +1,8 @@
 [SourceBuffer-abort-removed.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [SourceBuffer#abort (video/webm; codecs="vorbis,vp8") : if this object has been removed from the sourceBuffers attribute of the parent media source, then throw an INVALID_STATE_ERR exception and abort these steps.]
-    expected: FAIL
-
   [SourceBuffer#abort (video/mp4) : if this object has been removed from the sourceBuffers attribute of the parent media source, then throw an INVALID_STATE_ERR exception and abort these steps.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/SourceBuffer-abort-updating.html.ini
+++ b/testing/web-platform/meta/media-source/SourceBuffer-abort-updating.html.ini
@@ -1,11 +1,8 @@
 [SourceBuffer-abort-updating.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [SourceBuffer#abort() (video/webm; codecs="vorbis,vp8") : Check the algorithm when the updating attribute is true.]
-    expected: FAIL
-
   [SourceBuffer#abort() (video/mp4) : Check the algorithm when the updating attribute is true.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/SourceBuffer-abort.html.ini
+++ b/testing/web-platform/meta/media-source/SourceBuffer-abort.html.ini
@@ -1,11 +1,8 @@
 [SourceBuffer-abort.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [SourceBuffer#abort() (video/webm; codecs="vorbis,vp8"): Check the values of appendWindowStart and appendWindowEnd.]
-    expected: FAIL
-
   [SourceBuffer#abort() (video/mp4): Check the values of appendWindowStart and appendWindowEnd.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/interfaces.html.ini
+++ b/testing/web-platform/meta/media-source/interfaces.html.ini
@@ -1,4 +1,43 @@
 [interfaces.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  expected: ERROR
+  [AudioTrack interface: attribute kind]
+    expected: FAIL
+  [AudioTrack interface: attribute language]
+    expected: FAIL
+  [AudioTrack interface: attribute sourceBuffer]
+    expected: FAIL
+  [VideoTrack interface: attribute kind]
+    expected: FAIL
+  [VideoTrack interface: attribute language]
+    expected: FAIL
+  [VideoTrack interface: attribute sourceBuffer]
+    expected: FAIL
+  [TextTrack interface: attribute kind]
+    expected: FAIL
+  [TextTrack interface: attribute language]
+    expected: FAIL
+  [TextTrack interface: attribute sourceBuffer]
+    expected: FAIL
+  [SourceBuffer interface: attribute audioTracks]
+    expected: FAIL
+  [SourceBuffer interface: attribute videoTracks]
+    expected: FAIL
+  [SourceBuffer interface: attribute textTracks]
+    expected: FAIL
+  [SourceBuffer interface: operation appendStream(Stream,unsigned long long)]
+    expected: FAIL
+  [SourceBuffer interface: sourceBuffer must inherit property "audioTracks" with the proper type (4)]
+    expected: FAIL
+  [SourceBuffer interface: sourceBuffer must inherit property "videoTracks" with the proper type (5)]
+    expected: FAIL
+  [SourceBuffer interface: sourceBuffer must inherit property "textTracks" with the proper type (6)]
+    expected: FAIL
+  [SourceBuffer interface: sourceBuffer must inherit property "appendStream" with the proper type (11)]
+    expected: FAIL
+  [SourceBuffer interface: calling appendStream(Stream,unsigned long long) on sourceBuffer with too few arguments must throw TypeError]
+    expected: FAIL
+  [VideoPlaybackQuality interface: attribute totalFrameDelay]
+    expected: FAIL
+  [VideoPlaybackQuality interface: video.getVideoPlaybackQuality() must inherit property "totalFrameDelay" with the proper type (4)]
+    expected: FAIL
--- a/testing/web-platform/meta/media-source/mediasource-addsourcebuffer.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-addsourcebuffer.html.ini
@@ -1,39 +1,12 @@
 [mediasource-addsourcebuffer.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Test addSourceBuffer() with Vorbis and VP8]
-    expected: FAIL
-
-  [Test addSourceBuffer() with Vorbis and VP8 in separate SourceBuffers]
-    expected: FAIL
-
-  [Test addSourceBuffer() in 'ended' state.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test addSourceBuffer() video only]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test addSourceBuffer() audio only]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
   [Test addSourceBuffer() with AAC and H.264]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
   [Test addSourceBuffer() with AAC and H.264 in separate SourceBuffers]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test addSourceBuffer() QuotaExceededError.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
--- a/testing/web-platform/meta/media-source/mediasource-append-buffer.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-append-buffer.html.ini
@@ -1,108 +1,3 @@
 [mediasource-append-buffer.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Test SourceBuffer.appendBuffer() event dispatching.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test SourceBuffer.appendBuffer() call during a pending appendBuffer().]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test SourceBuffer.abort() call during a pending appendBuffer().]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test SourceBuffer.appendBuffer() triggering an 'ended' to 'open' transition.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test zero byte SourceBuffer.appendBuffer() call triggering an 'ended' to 'open' transition.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test MediaSource.removeSourceBuffer() call during a pending appendBuffer().]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test set MediaSource.duration during a pending appendBuffer() for one of its SourceBuffers.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test MediaSource.endOfStream() during a pending appendBuffer() for one of its SourceBuffers.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test set SourceBuffer.timestampOffset during a pending appendBuffer().]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test appending an empty ArrayBufferView.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test appending a neutered ArrayBufferView.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test appending an empty ArrayBuffer.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test appending a neutered ArrayBuffer.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test appendBuffer with partial init segments.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test appendBuffer with partial media segments.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test abort in the middle of an initialization segment.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test abort after removing sourcebuffer.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test abort after readyState is ended following init segment and media segment.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test abort after appendBuffer update ends.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test appending null.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test appending after removeSourceBuffer().]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
--- a/testing/web-platform/meta/media-source/mediasource-appendwindow.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-appendwindow.html.ini
@@ -1,38 +1,3 @@
 [mediasource-appendwindow.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Test correctly reset appendWindowStart and appendWindowEnd values]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test set wrong values to appendWindowStart and appendWindowEnd.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test set correct values to appendWindowStart and appendWindowEnd.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test appendwindow throw error when mediasource object is not associated with a sourebuffer.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test set appendWindowStart and appendWindowEnd when source buffer updating.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test appendWindowStart and appendWindowEnd value after a sourceBuffer.abort().]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test read appendWindowStart and appendWindowEnd initial values.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
--- a/testing/web-platform/meta/media-source/mediasource-buffered.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-buffered.html.ini
@@ -1,12 +1,14 @@
 [mediasource-buffered.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  disabled:
-    if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1182945
-    if (os == "win") and (version == "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1182945
   [Demuxed content with different lengths]
     expected: FAIL
 
   [Muxed content with different lengths]
     expected: FAIL
 
+  [Demuxed content with an empty buffered range on one SourceBuffer] # Bug 1192164
+    expected:
+      if os == "linux": FAIL
+      if (os == "win") and (version == "5.1.2600"): FAIL
+
--- a/testing/web-platform/meta/media-source/mediasource-closed.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-closed.html.ini
@@ -1,28 +1,3 @@
 [mediasource-closed.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Test addSourceBuffer() while closed.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test removeSourceBuffer() while closed.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting duration while open->closed.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test getting duration while open->closed.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test sourcebuffer.abort when closed.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
--- a/testing/web-platform/meta/media-source/mediasource-duration-boundaryconditions.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-duration-boundaryconditions.html.ini
@@ -1,68 +1,3 @@
 [mediasource-duration-boundaryconditions.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Set duration to 2^31 - 1]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Set duration to 1]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Set duration to Number.MAX_VALUE]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Set duration to Number.MIN_VALUE]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Set duration to Number.MAX_VALUE - 1]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Set duration to Number.MIN_VALUE - 1]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Set duration to Number.POSITIVE_INFINITY]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Set duration to Number.NEGATIVE_INFINITY]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Set duration to lowest value.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Set duration to a negative double.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Set duration to a positive double.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Set duration to zero]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Set duration to NaN]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
--- a/testing/web-platform/meta/media-source/mediasource-getvideoplaybackquality.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-getvideoplaybackquality.html.ini
@@ -1,8 +1,4 @@
 [mediasource-getvideoplaybackquality.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Test HTMLVideoElement.getVideoPlaybackQuality() with MediaSource API]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-is-type-supported.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-is-type-supported.html.ini
@@ -1,27 +1,33 @@
 [mediasource-is-type-supported.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Test valid WebM type "video/webm;codecs="vp8""]
+  [Test invalid MIME format "video/webm"] # Bug 1191833
     expected: FAIL
 
-  [Test valid WebM type "video/webm;codecs="vorbis""]
+  [Test invalid MIME format "video/webm;"] # Bug 1191833
+    expected: FAIL
+
+  [Test invalid MIME format "video/webm;codecs"] # Bug 1191833
     expected: FAIL
 
-  [Test valid WebM type "video/webm;codecs="vp8,vorbis""]
+  [Test invalid MIME format "video/webm;codecs="] # Bug 1191833
+    expected: FAIL
+
+  [Test invalid MIME format "video/webm;codecs=""] # Bug 1191833
     expected: FAIL
 
-  [Test valid WebM type "video/webm;codecs="vorbis, vp8""]
+  [Test invalid MIME format "video/webm;codecs="""] # Bug 1191833
     expected: FAIL
 
-  [Test valid WebM type "audio/webm;codecs="vorbis""]
+  [Test valid WebM type "AUDIO/WEBM;CODECS="vorbis""] # Bug 1191833
     expected: FAIL
 
-  [Test valid WebM type "AUDIO/WEBM;CODECS="vorbis""]
+  [Test invalid mismatch between major type and codec ID "audio/webm;codecs="vp8""] # Bug 1191833
     expected: FAIL
 
   [Test valid MP4 type "audio/mp4;codecs="mp4a.67""]
     expected: FAIL
 
   [Test valid MP4 type "video/mp4;codecs="avc1.4d001e""]
     expected:
       if os == "linux": FAIL
--- a/testing/web-platform/meta/media-source/mediasource-play.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-play.html.ini
@@ -1,8 +1,3 @@
 [mediasource-play.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Test normal playback case with MediaSource API]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
--- a/testing/web-platform/meta/media-source/mediasource-redundant-seek.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-redundant-seek.html.ini
@@ -1,8 +1,3 @@
 [mediasource-redundant-seek.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Test redundant fully prebuffered seek]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
--- a/testing/web-platform/meta/media-source/mediasource-remove.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-remove.html.ini
@@ -1,70 +1,17 @@
 [mediasource-remove.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
   [Test removing all appended data.]
-    expected: FAIL
+    expected:
+      if not (os == "linux" or ((os == "win") and (version == "5.1.2600"))): FAIL
 
   [Test removing beginning of appended data.]
-    expected: FAIL
+    expected:
+      if not (os == "linux" or ((os == "win") and (version == "5.1.2600"))): FAIL
 
   [Test removing the middle of appended data.]
-    expected: FAIL
+    expected:
+      if not (os == "linux" or ((os == "win") and (version == "5.1.2600"))): FAIL
 
   [Test removing the end of appended data.]
     expected: FAIL
-
-  [Test remove with an negative start.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test remove with non-finite start.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test remove with a start beyond the duration.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test remove with a start larger than the end.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test remove with a NEGATIVE_INFINITY end.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test remove with a NaN end.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test remove after SourceBuffer removed from mediaSource.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test remove while update pending.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test aborting a remove operation.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test remove with a start at the duration.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test remove transitioning readyState from 'ended' to 'open'.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
--- a/testing/web-platform/meta/media-source/mediasource-removesourcebuffer.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-removesourcebuffer.html.ini
@@ -1,23 +1,3 @@
 [mediasource-removesourcebuffer.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Test addSourceBuffer(), removeSourceBuffer(), addSourceBuffer() sequence.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test calling removeSourceBuffer() twice with the same object.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test calling removeSourceBuffer() in ended state.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test removesourcebuffer event on activeSourceBuffers.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
--- a/testing/web-platform/meta/media-source/mediasource-seek-during-pending-seek.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-seek-during-pending-seek.html.ini
@@ -1,16 +1,4 @@
 [mediasource-seek-during-pending-seek.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  disabled:
-    if os == "mac": https://bugzilla.mozilla.org/show_bug.cgi?id=1183523
-    if (os == "win") and (version != "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1183523
-  [Test seeking to a new location before transitioning beyond HAVE_METADATA.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test seeking to a new location during a pending seek.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1183523
--- a/testing/web-platform/meta/media-source/mediasource-sourcebuffer-mode.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-sourcebuffer-mode.html.ini
@@ -1,33 +1,7 @@
 [mediasource-sourcebuffer-mode.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Test initial value of SourceBuffer.mode is "segments"]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.mode]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting a removed SourceBuffer's mode]
+  [Test setting SourceBuffer.mode triggers parent MediaSource 'ended' to 'open' transition.] # Bug 1192165
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.mode while still updating]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.mode triggers parent MediaSource 'ended' to 'open' transition.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.mode and SourceBuffer.timestampOffset while parsing media segment.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
--- a/testing/web-platform/meta/media-source/mediasource-sourcebufferlist.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-sourcebufferlist.html.ini
@@ -1,13 +1,3 @@
 [mediasource-sourcebufferlist.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Test SourceBufferList event dispatching.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test that only 1 removesourcebuffer event fires on each SourceBufferList when the MediaSource closes.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
--- a/testing/web-platform/meta/media-source/mediasource-timestamp-offset.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-timestamp-offset.html.ini
@@ -1,78 +1,3 @@
 [mediasource-timestamp-offset.html]
   type: testharness
   prefs: [media.mediasource.enabled:true]
-  [Test setting SourceBuffer.timestampOffset to a positive number.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.timestampOffset to a negative number.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.timestampOffset to zero.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.timestampOffset to positive infinity.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.timestampOffset to negative infinity.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.timestampOffset to NaN.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.timestampOffset to undefined.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.timestampOffset to null.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.timestampOffset to false.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.timestampOffset to true.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.timestampOffset to a number string.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting SourceBuffer.timestampOffset to an empty string.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting timestampOffset in 'ended' state causes a transition to 'open'.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test getting the initial value of timestampOffset.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-
-  [Test setting timestampoffset after removing the sourcebuffer.]
-    expected:
-      if os == "linux": FAIL
-      if (os == "win") and (version == "5.1.2600"): FAIL
-