1 files changed, 5 insertions, 71 deletions
diff --git a/dom/media/test/mochitest_stream.toml b/dom/media/test/mochitest_stream.toml
index 0badfc52ab..429e694a96 100644
--- a/dom/media/test/mochitest_stream.toml
+++ b/dom/media/test/mochitest_stream.toml
@@ -27,12 +27,6 @@ tags = "mtg capturestream"
 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^",
   "allowed.sjs",
@@ -406,63 +400,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",
@@ -481,14 +431,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",
@@ -568,8 +512,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",
@@ -624,14 +566,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",
@@ -653,8 +587,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",
@@ -763,11 +695,15 @@ support-files = [
   "hls/960x720_seg1.ts",
   "sync.webm",
 ]
+# This test requires software decoding on Android to be able to check that
+# painting a video to the canvas throws. bug 1372457, bug 1526207
+prefs = [
+  "media.android-media-codec.preferred=false",
+]
 
 ["test_streams_capture_origin.html"]
 
 ["test_streams_element_capture.html"]
-skip-if = ["os == 'android'"] # bug 1372457, bug 1526207 for drawImage
 
 ["test_streams_element_capture_mediatrack.html"]
 
@@ -788,9 +724,7 @@ tags = "mtg"
 
 ["test_streams_srcObject.html"]
 skip-if = [
-  "os == 'android'", # bug 1300443, android(bug 1232305)
   "os == 'mac' && debug", # Bug 1756880 - temp due to high frequency shutdown hang
 ]
 
 ["test_streams_tracks.html"]
-skip-if = ["os == 'android'"] # android(bug 1232305)