From 540af6f38e5c12534eb2e68ef525d7eddab21dff Mon Sep 17 00:00:00 2001 From: sam marshall Date: Thu, 6 Nov 2014 11:54:09 +0000 Subject: [PATCH] MDL-48093 HTML 5 video: Firefox now supports .mp4 --- lib/medialib.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/medialib.php b/lib/medialib.php index 9c136f37312..9a2ad64e142 100644 --- a/lib/medialib.php +++ b/lib/medialib.php @@ -1071,8 +1071,11 @@ OET; continue; } } else { - // Formats .m4v and .mp4 are not supported in Firefox or Opera. - if (core_useragent::is_firefox() || core_useragent::is_opera()) { + // Formats .m4v and .mp4 are not supported in Opera, or in Firefox before 27. + // https://developer.mozilla.org/en-US/docs/Web/HTML/Supported_media_formats + // has the details. + if (core_useragent::is_opera() || (core_useragent::is_firefox() && + !core_useragent::check_firefox_version(27))) { continue; } } @@ -1140,8 +1143,15 @@ OET; continue; } } else { - // Formats .aac, .mp3, and .m4a are not supported in Firefox or Opera. - if (core_useragent::is_firefox() || core_useragent::is_opera()) { + // Formats .aac, .mp3, and .m4a are not supported in Opera. + if (core_useragent::is_opera()) { + continue; + } + // Formats .mp3 and .m4a were not reliably supported in Firefox before 27. + // https://developer.mozilla.org/en-US/docs/Web/HTML/Supported_media_formats + // has the details. .aac is still not supported. + if (core_useragent::is_firefox() && ($ext === 'aac' || + !core_useragent::check_firefox_version(27))) { continue; } }