Bug 1295886 - P15. Enable FLAC mochitest on Android. r?gerald draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Thu, 02 Nov 2017 02:56:04 +0100
changeset 692663 e10f97439a21e09059e34921ca7959addf574ec7
parent 692662 3a99b099cfebae5959671f944009deea08662d3c
child 692664 fb256ce7ff98f0789baa5c8455bff0da554e7946
push id87558
push userbmo:jyavenard@mozilla.com
push dateFri, 03 Nov 2017 10:39:20 +0000
reviewersgerald
bugs1295886
milestone58.0a1
Bug 1295886 - P15. Enable FLAC mochitest on Android. r?gerald MozReview-Commit-ID: 83mJleAMVro
dom/media/mediasource/test/mochitest.ini
dom/media/test/test_can_play_type_mpeg.html
--- a/dom/media/mediasource/test/mochitest.ini
+++ b/dom/media/mediasource/test/mochitest.ini
@@ -94,17 +94,16 @@ skip-if = toolkit == 'android' # Not sup
 skip-if = toolkit == 'android' # Not supported on android
 [test_MediaSource.html]
 skip-if = android_version == '22' # bug 1341146
 [test_MediaSource_memory_reporting.html]
 skip-if = android_version == '22' # bug 1225758
 [test_MediaSource_mp4.html]
 skip-if = toolkit == 'android' # Not supported on android
 [test_MediaSource_flac_mp4.html]
-skip-if = toolkit == 'android' # Not supported on android
 [test_MediaSource_disabled.html]
 [test_MultipleInitSegments.html]
 [test_MultipleInitSegments_mp4.html]
 skip-if = toolkit == 'android' # Not supported on android
 [test_OnEvents.html]
 skip-if = android_version == '22' # bug 1359010
 [test_PlayEvents.html]
 skip-if = toolkit == 'android' # Not supported on android
--- a/dom/media/test/test_can_play_type_mpeg.html
+++ b/dom/media/test/test_can_play_type_mpeg.html
@@ -79,20 +79,18 @@ function check_mp4(v, enabled) {
   // HE-AAC v2
   check("audio/mp4; codecs=\"mp4a.40.29\"", "probably");
 
   // Opus
   check("audio/mp4; codecs=\"opus\"", "probably");
   check("audio/mp4; codecs=opus", "probably");
 
   // Flac.
-  // Not available on Android yet.
-  var expectedResult = IsSupportedAndroid() ? "" : "probably";
-  check("audio/mp4; codecs=\"flac\"", expectedResult);
-  check("audio/mp4; codecs=flac", expectedResult);
+  check("audio/mp4; codecs=\"flac\"", "probably");
+  check("audio/mp4; codecs=flac", "probably");
 
   // VP9.
   // Note: canPlayType assumes non-fragmented MP4. Once we support VP9 in
   // non-fragmented MP4, we need to change this to report supported.
   [ "video/mp4; codecs=vp9",
     "video/mp4; codecs=\"vp9\"",
     "video/mp4; codecs=\"vp9.0\""
   ].forEach((codec) => {