From aa12c067e5afece7ad1bb285e2364d742d0ef94e Mon Sep 17 00:00:00 2001 From: Karl Tomlinson Date: Wed, 26 Nov 2014 15:33:41 +1300 Subject: [PATCH] bug 1105115 enable mp4 MSE testing r=ajones --HG-- extra : rebase_source : b6dca4d6066436851b7806f30d5298b58c353b28 --- testing/profiles/prefs_general.js | 2 +- .../SourceBuffer-abort-readyState.html.ini | 3 +- .../SourceBuffer-abort-removed.html.ini | 3 +- .../SourceBuffer-abort-updating.html.ini | 3 +- .../media-source/SourceBuffer-abort.html.ini | 3 +- .../mediasource-duration.html.ini | 4 ++- .../mediasource-is-type-supported.html.ini | 30 ++++++++++++++----- 7 files changed, 34 insertions(+), 14 deletions(-) diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js index bbe0af888ff..951c5a8808c 100644 --- a/testing/profiles/prefs_general.js +++ b/testing/profiles/prefs_general.js @@ -156,7 +156,7 @@ user_pref("layout.spammy_warnings.enabled", false); // Enable Media Source Extensions for testing user_pref("media.mediasource.enabled", true); -user_pref("media.mediasource.mp4.enabled", false); +user_pref("media.mediasource.mp4.enabled", true); user_pref("media.mediasource.webm.enabled", true); // Enable mozContacts diff --git a/testing/web-platform/meta/media-source/SourceBuffer-abort-readyState.html.ini b/testing/web-platform/meta/media-source/SourceBuffer-abort-readyState.html.ini index a46a221ca97..5365a12cd00 100644 --- 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,5 +1,6 @@ [SourceBuffer-abort-readyState.html] type: testharness [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: FAIL + expected: + if os == "win" and version == "5.1.2600": FAIL diff --git a/testing/web-platform/meta/media-source/SourceBuffer-abort-removed.html.ini b/testing/web-platform/meta/media-source/SourceBuffer-abort-removed.html.ini index e470a349be1..c8f57281d3a 100644 --- a/testing/web-platform/meta/media-source/SourceBuffer-abort-removed.html.ini +++ b/testing/web-platform/meta/media-source/SourceBuffer-abort-removed.html.ini @@ -2,5 +2,6 @@ type: testharness expected: TIMEOUT [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: FAIL + expected: + if os == "win" and version == "5.1.2600": FAIL diff --git a/testing/web-platform/meta/media-source/SourceBuffer-abort-updating.html.ini b/testing/web-platform/meta/media-source/SourceBuffer-abort-updating.html.ini index 84262857e64..091a1643783 100644 --- 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,5 +1,6 @@ [SourceBuffer-abort-updating.html] type: testharness [SourceBuffer#abort() (video/mp4) : Check the algorithm when the updating attribute is true.] - expected: FAIL + expected: + if os == "win" and version == "5.1.2600": FAIL diff --git a/testing/web-platform/meta/media-source/SourceBuffer-abort.html.ini b/testing/web-platform/meta/media-source/SourceBuffer-abort.html.ini index 519ac330216..888352cece4 100644 --- a/testing/web-platform/meta/media-source/SourceBuffer-abort.html.ini +++ b/testing/web-platform/meta/media-source/SourceBuffer-abort.html.ini @@ -2,5 +2,6 @@ type: testharness expected: TIMEOUT [SourceBuffer#abort() (video/mp4): Check the values of appendWindowStart and appendWindowEnd.] - expected: FAIL + expected: + if os == "win" and version == "5.1.2600": FAIL diff --git a/testing/web-platform/meta/media-source/mediasource-duration.html.ini b/testing/web-platform/meta/media-source/mediasource-duration.html.ini index 0ad1164f44c..9a790175eab 100644 --- a/testing/web-platform/meta/media-source/mediasource-duration.html.ini +++ b/testing/web-platform/meta/media-source/mediasource-duration.html.ini @@ -11,5 +11,7 @@ disabled: TIMEOUT or FAIL https://bugzilla.mozilla.org/show_bug.cgi?id=1085247 [Test setting same duration multiple times does not fire duplicate durationchange] - expected: FAIL + expected: + if os == "win" and version != "5.1.2600": TIMEOUT + FAIL diff --git 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 index 157d966369f..2833b94a3ed 100644 --- 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 @@ -22,29 +22,43 @@ expected: FAIL [Test valid MP4 type "video/mp4;codecs="avc1.4d001e""] - expected: FAIL + expected: + if os == "linux": FAIL + if os == "win" and version == "5.1.2600": FAIL [Test valid MP4 type "video/mp4;codecs="avc1.42001e""] - expected: FAIL + expected: + if os == "linux": FAIL + if os == "win" and version == "5.1.2600": FAIL [Test valid MP4 type "audio/mp4;codecs="mp4a.40.2""] - expected: FAIL + expected: + if os == "win" and version == "5.1.2600": FAIL [Test valid MP4 type "audio/mp4;codecs="mp4a.40.5""] - expected: FAIL + expected: + if os == "linux": FAIL + if os == "win" and version == "5.1.2600": FAIL [Test valid MP4 type "audio/mp4;codecs="mp4a.67""] expected: FAIL [Test valid MP4 type "video/mp4;codecs="mp4a.40.2""] - expected: FAIL + expected: + if os == "win" and version == "5.1.2600": FAIL [Test valid MP4 type "video/mp4;codecs="avc1.4d001e,mp4a.40.2""] - expected: FAIL + expected: + if os == "linux": FAIL + if os == "win" and version == "5.1.2600": FAIL [Test valid MP4 type "video/mp4;codecs="mp4a.40.2 , avc1.4d001e ""] - expected: FAIL + expected: + if os == "linux": FAIL + if os == "win" and version == "5.1.2600": FAIL [Test valid MP4 type "video/mp4;codecs="avc1.4d001e,mp4a.40.5""] - expected: FAIL + expected: + if os == "linux": FAIL + if os == "win" and version == "5.1.2600": FAIL