зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1329547 - Remove media test checks for Vista. r=cpearce
MozReview-Commit-ID: BkIARSntDud --HG-- extra : rebase_source : 9c0a6ad4f72ef56d3ad84da9d752c387afe99e99
This commit is contained in:
Родитель
4b28bd3f34
Коммит
7a353f99e3
|
@ -538,16 +538,9 @@ var gErrorTests = [
|
|||
{ 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"});
|
||||
}
|
||||
|
|
|
@ -15,12 +15,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=975978
|
|||
<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.
|
||||
|
|
|
@ -106,12 +106,6 @@ function check_mp3(v, enabled) {
|
|||
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);
|
||||
|
@ -143,7 +137,7 @@ 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"))) ||
|
||||
|
@ -152,7 +146,7 @@ var haveMp4 = (getPref("media.wmf.enabled") && IsWindowsVistaOrLater()) ||
|
|||
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")) ||
|
||||
|
|
Загрузка…
Ссылка в новой задаче