Bug 1329547 - Remove media test checks for Vista. r?cpearce
MozReview-Commit-ID: BkIARSntDud
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -533,26 +533,19 @@ var gErrorTests = [
{ name:"bug504843.ogv", type:"video/ogg" },
{ name:"bug501279.ogg", type:"audio/ogg" },
{ name:"bug580982.webm", type:"video/webm" },
{ name:"bug603918.webm", type:"video/webm" },
{ name:"bug604067.webm", type:"video/webm" },
{ name:"bogus.duh", type:"bogus/duh" }
];
-function IsWindowsVistaOrLater() {
- var re = /Windows NT (\d+.\d)/;
- var winver = manifestNavigator().userAgent.match(re);
- return winver && winver.length == 2 && parseFloat(winver[1]) >= 6.0;
-}
-
// Windows' H.264 decoder cannot handle H.264 streams with resolution
// less than 48x48 pixels. We refuse to play and error on such streams.
-if (IsWindowsVistaOrLater() &&
- manifestVideo().canPlayType('video/mp4; codecs="avc1.42E01E"')) {
+if (manifestVideo().canPlayType('video/mp4; codecs="avc1.42E01E"')) {
gErrorTests = gErrorTests.concat({name: "red-46x48.mp4", type:"video/mp4"},
{name: "red-48x46.mp4", type:"video/mp4"});
}
// These are files that have nontrivial duration and are useful for seeking within.
var gSeekTests = [
{ name:"r11025_s16_c1.wav", type:"audio/x-wav", duration:1.0 },
{ name:"audio.wav", type:"audio/x-wav", duration:0.031247 },
--- a/dom/media/test/test_aspectratio_mp4.html
+++ b/dom/media/test/test_aspectratio_mp4.html
@@ -10,22 +10,16 @@ https://bugzilla.mozilla.org/show_bug.cg
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=975978">Mozilla Bug 975978</a>
<pre id="test">
<script class="testbody" type="text/javascript">
-function IsWindows7OrLater() {
- var re = /Windows NT (\d.\d)/;
- var winver = navigator.userAgent.match(re);
- return winver && winver.length == 2 && parseFloat(winver[1]) >= 6.1;
-}
-
SimpleTest.waitForExplicitFinish();
// MP4 video with display size is difference to decode frame size.
// The display size is recorded in TrackHeaderBox 'tkhd' of this mp4 video.
var resource =
{ name:"pixel_aspect_ratio.mp4", type:"video/mp4", width:525, height:288 };
var v = document.createElement("video");
--- a/dom/media/test/test_can_play_type_mpeg.html
+++ b/dom/media/test/test_can_play_type_mpeg.html
@@ -101,22 +101,16 @@ function check_mp3(v, enabled) {
check("audio/mpeg; codecs=\"mp3\"", "probably");
check("audio/mpeg; codecs=mp3", "probably");
check("audio/mp3; codecs=\"mp3\"", "probably");
check("audio/mp3; codecs=mp3", "probably");
}
-function IsWindowsVistaOrLater() {
- var re = /Windows NT (\d+\.\d)/;
- var winver = navigator.userAgent.match(re);
- return winver && winver.length == 2 && parseFloat(winver[1]) >= 6.0;
-}
-
function IsMacOSSnowLeopardOrLater() {
var re = /Mac OS X (\d+)\.(\d+)/;
var ver = navigator.userAgent.match(re);
if (!ver || ver.length != 3) {
return false;
}
var major = ver[1] | 0;
var minor = ver[2] | 0;
@@ -138,26 +132,26 @@ function getPref(name) {
function IsSupportedAndroid() {
return getAndroidVersion() >= 14;
}
function IsJellyBeanOrLater() {
return getAndroidVersion() >= 16;
}
-var haveMp4 = (getPref("media.wmf.enabled") && IsWindowsVistaOrLater()) ||
+var haveMp4 = getPref("media.wmf.enabled") ||
IsMacOSSnowLeopardOrLater() ||
(IsSupportedAndroid() &&
(IsJellyBeanOrLater() || getPref("media.plugins.enabled"))) ||
(IsLinux() && getPref("media.ffmpeg.enabled"));
check_mp4(document.getElementById('v'), haveMp4);
var haveMp3 = getPref("media.directshow.enabled") ||
- (getPref("media.wmf.enabled") && IsWindowsVistaOrLater()) ||
+ getPref("media.wmf.enabled") ||
(IsLinux() && getPref("media.ffmpeg.enabled")) ||
(IsSupportedAndroid() &&
((IsJellyBeanOrLater() && getPref("media.android-media-codec.enabled")) ||
getPref("media.plugins.enabled"))) ||
getPref("media.apple.mp3.enabled");
check_mp3(document.getElementById('v'), haveMp3);
mediaTestCleanup();