Bug 1295886 - P15. Enable FLAC mochitest on Android. r=gerald
authorJean-Yves Avenard <jyavenard@mozilla.com>
Thu, 02 Nov 2017 02:56:04 +0100
changeset 443262 c387badaa88ba586c1fee17aabc35521ec781b42
parent 443261 cd2b7c34307eef0bf59b1a2184e1be5cc7c4d897
child 443263 ae52929709bdb293f0e16d88960320b9b2128038
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerald
bugs1295886
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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) => {