1 files changed, 4 insertions, 68 deletions
diff --git a/dom/media/test/mochitest_compat.toml b/dom/media/test/mochitest_compat.toml
index 86f76f1464..fdff340f39 100644
--- a/dom/media/test/mochitest_compat.toml
+++ b/dom/media/test/mochitest_compat.toml
@@ -35,12 +35,6 @@ prefs = ["media.wmf.hevc.enabled=1"] # for test_hevc_playback
 support-files = [
   "16bit_wave_extrametadata.wav",
   "16bit_wave_extrametadata.wav^headers^",
-  "320x240.ogv",
-  "320x240.ogv^headers^",
-  "448636.ogv",
-  "448636.ogv^headers^",
-  "A4.ogv",
-  "A4.ogv^headers^",
   "VID_0001.ogg",
   "VID_0001.ogg^headers^",
   "adts.aac",
@@ -416,63 +410,19 @@ support-files = [
   "bipbop_short_vp8.webm^headers^",
   "bipbop-lateaudio.mp4",
   "bipbop-lateaudio.mp4^headers^",
-  "black100x100-aspect3to2.ogv",
-  "black100x100-aspect3to2.ogv^headers^",
   "bogus.duh",
-  "bogus.ogv",
-  "bogus.ogv^headers^",
   "bogus.wav",
   "bogus.wav^headers^",
-  "bug461281.ogg",
-  "bug461281.ogg^headers^",
-  "bug482461-theora.ogv",
-  "bug482461-theora.ogv^headers^",
-  "bug482461.ogv",
-  "bug482461.ogv^headers^",
-  "bug495129.ogv",
-  "bug495129.ogv^headers^",
   "bug495794.ogg",
   "bug495794.ogg^headers^",
-  "bug498380.ogv",
-  "bug498380.ogv^headers^",
-  "bug498855-1.ogv",
-  "bug498855-1.ogv^headers^",
-  "bug498855-2.ogv",
-  "bug498855-2.ogv^headers^",
-  "bug498855-3.ogv",
-  "bug498855-3.ogv^headers^",
-  "bug499519.ogv",
-  "bug499519.ogv^headers^",
-  "bug500311.ogv",
-  "bug500311.ogv^headers^",
   "bug501279.ogg",
   "bug501279.ogg^headers^",
-  "bug504613.ogv",
-  "bug504613.ogv^headers^",
-  "bug504644.ogv",
-  "bug504644.ogv^headers^",
-  "bug504843.ogv",
-  "bug504843.ogv^headers^",
-  "bug506094.ogv",
-  "bug506094.ogv^headers^",
-  "bug516323.indexed.ogv",
-  "bug516323.indexed.ogv^headers^",
-  "bug516323.ogv",
-  "bug516323.ogv^headers^",
   "bug520493.ogg",
   "bug520493.ogg^headers^",
   "bug520500.ogg",
   "bug520500.ogg^headers^",
-  "bug520908.ogv",
-  "bug520908.ogv^headers^",
-  "bug523816.ogv",
-  "bug523816.ogv^headers^",
   "bug533822.ogg",
   "bug533822.ogg^headers^",
-  "bug556821.ogv",
-  "bug556821.ogv^headers^",
-  "bug557094.ogv",
-  "bug557094.ogv^headers^",
   "bug604067.webm",
   "bug604067.webm^headers^",
   "bug1066943.webm",
@@ -491,14 +441,8 @@ support-files = [
   "cancellable_request.sjs",
   "chain.ogg",
   "chain.ogg^headers^",
-  "chain.ogv",
-  "chain.ogv^headers^",
   "chain.opus",
   "chain.opus^headers^",
-  "chained-audio-video.ogg",
-  "chained-audio-video.ogg^headers^",
-  "chained-video.ogv",
-  "chained-video.ogv^headers^",
   "chromeHelper.js",
   "cloneElementVisually_helpers.js",
   "contentType.sjs",
@@ -592,8 +536,6 @@ support-files = [
   "invalid-preskip.webm^headers^",
   "manifest.js",
   "midflight-redirect.sjs",
-  "multiple-bos.ogg",
-  "multiple-bos.ogg^headers^",
   "multiple-bos-more-header-fileds.ogg",
   "multiple-bos-more-header-fileds.ogg^headers^",
   "multi_id3v2.mp3",
@@ -648,14 +590,6 @@ support-files = [
   "sample.3g2",
   "sample-encrypted-sgpdstbl-sbgptraf.mp4",
   "sample-encrypted-sgpdstbl-sbgptraf.mp4^headers^",
-  "sample-fisbone-skeleton4.ogv",
-  "sample-fisbone-skeleton4.ogv^headers^",
-  "sample-fisbone-wrong-header.ogv",
-  "sample-fisbone-wrong-header.ogv^headers^",
-  "seek.ogv",
-  "seek.ogv^headers^",
-  "seek-short.ogv",
-  "seek-short.ogv^headers^",
   "seek.webm",
   "seek.webm^headers^",
   "seek-short.webm",
@@ -677,8 +611,6 @@ support-files = [
   "short-aac-encrypted-audio.mp4^headers^",
   "short-audio-fragmented-cenc-without-pssh.mp4",
   "short-audio-fragmented-cenc-without-pssh.mp4^headers^",
-  "short-video.ogv",
-  "short-video.ogv^headers^",
   "short-vp9-encrypted-video.mp4",
   "short-vp9-encrypted-video.mp4^headers^",
   "small-shot-mp3.mp4",
@@ -823,6 +755,10 @@ skip-if = ["true"] # bug 475110 - disabled since we don't play Wave files standa
 ["test_can_play_type_webm.html"]
 
 ["test_closing_connections.html"]
+# This test attempts to load 20 videos to test something network-related, and
+# Android devices that aren't an emulator hit a device-specific decoder limit,
+# that make the test fail.
+skip-if = ["os == 'android' && !is_emulator"]
 
 ["test_constants.html"]