Bug 1475564 - Enable libav1 when not building with msvc. r=dmajor

We reenable the corresponding tests unconditionally because we don't run
tests on the msvc builds anyways (and they're going to be retired soon).

Differential Revision: https://phabricator.services.mozilla.com/D18028

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2019-01-30 07:30:01 +00:00
parent 9f28a31080
commit e39820dc70
3 changed files with 6 additions and 12 deletions

View File

@ -36,8 +36,7 @@ async function check_webm(v, enabled) {
}
await SpecialPowers.pushPrefEnv({"set": [["media.av1.enabled", true]]});
// AV1 is disabled on Windows 32 bits (bug 1475564)
check("video/webm; codecs=\"av1\"", isWindows32() ? "" : "probably");
check("video/webm; codecs=\"av1\"", "probably");
await SpecialPowers.pushPrefEnv({"set": [["media.av1.enabled", false]]});
check("video/webm; codecs=\"av1\"", "");

View File

@ -96,13 +96,7 @@ function check_mp4(v, enabled) {
check(codec, "probably");
ok(MediaSource.isTypeSupported(codec), "VP9 in MP4 should be supported in MSE");
});
// AV1 is temporarily disabled on Win32 due to linker issues
// https://bugzilla.mozilla.org/show_bug.cgi?id=1475564
if (!isWindows32()) {
check("video/mp4; codecs=\"av1\"", "probably");
} else {
check("video/mp4; codecs=\"av1\"", "");
}
check("video/mp4; codecs=\"av1\"", "probably");
}
function check_mp3(v, enabled) {

View File

@ -425,11 +425,12 @@ imply_option('--enable-fmp4', ffmpeg, '--enable-ffmpeg')
option('--enable-av1',
help='Enable libaom for av1 video support')
@depends('--enable-av1', target)
def av1(value, target):
@depends('--enable-av1', target, c_compiler)
def av1(value, target, c_compiler):
enabled = bool(value)
if value.origin == 'default':
if target.os == 'WINNT' and target.cpu == 'x86':
if target.os == 'WINNT' and target.cpu == 'x86' and \
c_compiler and c_compiler.type == 'msvc':
enabled = False
else:
enabled = True