From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:34:50 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- dom/media/test/320x240.ogv | Bin 28942 -> 0 bytes dom/media/test/320x240.ogv^headers^ | 1 - dom/media/test/320x240.webm | Bin 0 -> 50163 bytes dom/media/test/320x240.webm^headers^ | 1 + dom/media/test/448636.ogv | Bin 7799 -> 0 bytes dom/media/test/bogus.ogv | 45 ---- .../browser_glean_first_frame_loaded_time.js | 12 +- dom/media/test/browser/head.js | 118 ++++++--- dom/media/test/bug482461-theora.ogv | Bin 280904 -> 0 bytes dom/media/test/bug482461.ogv | Bin 305785 -> 0 bytes dom/media/test/bug495129.ogv | Bin 122207 -> 0 bytes dom/media/test/bug498380.ogv | Bin 65535 -> 0 bytes dom/media/test/bug498855-1.ogv | Bin 20480 -> 0 bytes dom/media/test/bug498855-2.ogv | Bin 20480 -> 0 bytes dom/media/test/bug498855-3.ogv | Bin 20480 -> 0 bytes dom/media/test/bug499519.ogv | Bin 20480 -> 0 bytes dom/media/test/bug500311.ogv | Bin 55834 -> 0 bytes dom/media/test/bug504613.ogv | Bin 35000 -> 0 bytes dom/media/test/bug504644.ogv | Bin 131114 -> 0 bytes dom/media/test/bug504843.ogv | Bin 65536 -> 0 bytes dom/media/test/bug506094.ogv | Bin 8195 -> 0 bytes dom/media/test/bug516323.indexed.ogv | Bin 162193 -> 0 bytes dom/media/test/bug516323.ogv | Bin 161789 -> 0 bytes dom/media/test/bug523816.ogv | Bin 40585 -> 0 bytes dom/media/test/bug556821.ogv | Bin 196608 -> 0 bytes dom/media/test/bug557094.ogv | Bin 76966 -> 0 bytes dom/media/test/can_play_type_ogg.js | 21 +- dom/media/test/chained-video.ogv | Bin 57906 -> 0 bytes dom/media/test/crashtests/576612-1.html | 15 -- dom/media/test/make-headers.sh | 4 +- dom/media/test/manifest.js | 283 +-------------------- dom/media/test/mochitest.toml | 67 +---- dom/media/test/mochitest_background_video.toml | 68 ----- dom/media/test/mochitest_bugs.toml | 68 ----- dom/media/test/mochitest_compat.toml | 72 +----- dom/media/test/mochitest_eme.toml | 68 ----- dom/media/test/mochitest_eme_compat.toml | 68 ----- dom/media/test/mochitest_media_recorder.toml | 68 +---- dom/media/test/mochitest_seek.toml | 68 ----- dom/media/test/mochitest_stream.toml | 76 +----- dom/media/test/multiple-bos.ogg | Bin 33045 -> 0 bytes dom/media/test/reftest/color_quads/reftest.list | 2 +- dom/media/test/reftest/reftest.list | 6 +- dom/media/test/sample-fisbone-skeleton4.ogv | Bin 8747 -> 0 bytes dom/media/test/sample-fisbone-wrong-header.ogv | Bin 8703 -> 0 bytes dom/media/test/seek-short.ogv | Bin 79921 -> 0 bytes dom/media/test/seek.ogv | Bin 285310 -> 0 bytes dom/media/test/seekLies.sjs | 4 +- dom/media/test/short-video.ogv | Bin 16049 -> 0 bytes dom/media/test/test_bug1248229.html | 2 +- dom/media/test/test_closing_connections.html | 2 +- dom/media/test/test_decoder_disable.html | 4 +- dom/media/test/test_error_in_video_document.html | 9 +- dom/media/test/test_load_same_resource.html | 2 +- dom/media/test/test_media_selection.html | 2 +- dom/media/test/test_preload_suspend.html | 2 +- dom/media/test/test_standalone.html | 63 ++--- dom/media/test/test_streams_element_capture.html | 5 + .../test/test_streams_element_capture_twice.html | 2 +- dom/media/test/test_videoDocumentTitle.html | 4 +- .../test_video_stats_resistfingerprinting.html | 1 - 61 files changed, 177 insertions(+), 1056 deletions(-) delete mode 100644 dom/media/test/320x240.ogv delete mode 100644 dom/media/test/320x240.ogv^headers^ create mode 100644 dom/media/test/320x240.webm create mode 100644 dom/media/test/320x240.webm^headers^ delete mode 100644 dom/media/test/448636.ogv delete mode 100644 dom/media/test/bogus.ogv delete mode 100644 dom/media/test/bug482461-theora.ogv delete mode 100644 dom/media/test/bug482461.ogv delete mode 100644 dom/media/test/bug495129.ogv delete mode 100644 dom/media/test/bug498380.ogv delete mode 100644 dom/media/test/bug498855-1.ogv delete mode 100644 dom/media/test/bug498855-2.ogv delete mode 100644 dom/media/test/bug498855-3.ogv delete mode 100644 dom/media/test/bug499519.ogv delete mode 100644 dom/media/test/bug500311.ogv delete mode 100644 dom/media/test/bug504613.ogv delete mode 100644 dom/media/test/bug504644.ogv delete mode 100644 dom/media/test/bug504843.ogv delete mode 100644 dom/media/test/bug506094.ogv delete mode 100644 dom/media/test/bug516323.indexed.ogv delete mode 100644 dom/media/test/bug516323.ogv delete mode 100644 dom/media/test/bug523816.ogv delete mode 100644 dom/media/test/bug556821.ogv delete mode 100644 dom/media/test/bug557094.ogv delete mode 100644 dom/media/test/chained-video.ogv delete mode 100644 dom/media/test/crashtests/576612-1.html delete mode 100644 dom/media/test/multiple-bos.ogg delete mode 100644 dom/media/test/sample-fisbone-skeleton4.ogv delete mode 100644 dom/media/test/sample-fisbone-wrong-header.ogv delete mode 100644 dom/media/test/seek-short.ogv delete mode 100644 dom/media/test/seek.ogv delete mode 100644 dom/media/test/short-video.ogv (limited to 'dom/media/test') diff --git a/dom/media/test/320x240.ogv b/dom/media/test/320x240.ogv deleted file mode 100644 index 093158432a..0000000000 Binary files a/dom/media/test/320x240.ogv and /dev/null differ diff --git a/dom/media/test/320x240.ogv^headers^ b/dom/media/test/320x240.ogv^headers^ deleted file mode 100644 index 4030ea1d3d..0000000000 --- a/dom/media/test/320x240.ogv^headers^ +++ /dev/null @@ -1 +0,0 @@ -Cache-Control: no-store diff --git a/dom/media/test/320x240.webm b/dom/media/test/320x240.webm new file mode 100644 index 0000000000..16ecdbf688 Binary files /dev/null and b/dom/media/test/320x240.webm differ diff --git a/dom/media/test/320x240.webm^headers^ b/dom/media/test/320x240.webm^headers^ new file mode 100644 index 0000000000..4030ea1d3d --- /dev/null +++ b/dom/media/test/320x240.webm^headers^ @@ -0,0 +1 @@ +Cache-Control: no-store diff --git a/dom/media/test/448636.ogv b/dom/media/test/448636.ogv deleted file mode 100644 index 628df924f8..0000000000 Binary files a/dom/media/test/448636.ogv and /dev/null differ diff --git a/dom/media/test/bogus.ogv b/dom/media/test/bogus.ogv deleted file mode 100644 index 528ae275d0..0000000000 --- a/dom/media/test/bogus.ogv +++ /dev/null @@ -1,45 +0,0 @@ -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus -bogus bogus bogus diff --git a/dom/media/test/browser/browser_glean_first_frame_loaded_time.js b/dom/media/test/browser/browser_glean_first_frame_loaded_time.js index 1acfa9957e..2ee5274dae 100644 --- a/dom/media/test/browser/browser_glean_first_frame_loaded_time.js +++ b/dom/media/test/browser/browser_glean_first_frame_loaded_time.js @@ -17,7 +17,7 @@ const testCases = [ key_system: undefined, }, async run(tab) { - await loadVideo(tab); + await loadVideo(tab, "mozfirstframeloadedprobe"); }, }, { @@ -28,7 +28,7 @@ const testCases = [ key_system: undefined, }, async run(tab) { - await loadMseVideo(tab); + await loadMseVideo(tab, "mozfirstframeloadedprobe"); }, }, { @@ -39,11 +39,17 @@ const testCases = [ key_system: "org.w3.clearkey", }, async run(tab) { - await loadEmeVideo(tab); + await loadEmeVideo(tab, "mozfirstframeloadedprobe"); }, }, ]; +add_task(async function setTestPref() { + await SpecialPowers.pushPrefEnv({ + set: [["media.testing-only-events", true]], + }); +}); + add_task(async function testGleanMediaPlayackFirstFrameLoaded() { for (let test of testCases) { Services.fog.testResetFOG(); diff --git a/dom/media/test/browser/head.js b/dom/media/test/browser/head.js index 7ef578a804..489d107be5 100644 --- a/dom/media/test/browser/head.js +++ b/dom/media/test/browser/head.js @@ -13,60 +13,94 @@ function openTab() { // Creates and configures a video element for non-MSE playback in `tab`. Does not // start playback for the element. Returns a promise that will resolve once // the element is setup and ready for playback. -function loadVideo(tab) { - return SpecialPowers.spawn(tab.linkedBrowser, [], async _ => { - let video = content.document.createElement("video"); - video.id = "media"; - content.document.body.appendChild(video); +function loadVideo(tab, extraEvent = undefined) { + return SpecialPowers.spawn( + tab.linkedBrowser, + [extraEvent], + async _extraEvent => { + let video = content.document.createElement("video"); + video.id = "media"; + content.document.body.appendChild(video); - video.src = "gizmo.mp4"; - video.load(); + video.src = "gizmo.mp4"; + video.load(); - info(`waiting 'loadeddata' event to ensure playback is ready`); - await new Promise(r => (video.onloadeddata = r)); - }); + info(`waiting 'loadeddata' event to ensure playback is ready`); + let promises = []; + promises.push(new Promise(r => (video.onloadeddata = r))); + if (_extraEvent != undefined) { + info( + `waiting '${_extraEvent}' event to ensure the probe has been recorded` + ); + promises.push( + new Promise(r => + video.addEventListener(_extraEvent, r, { once: true }) + ) + ); + } + await Promise.allSettled(promises); + } + ); } // Creates and configures a video element for MSE playback in `tab`. Does not // start playback for the element. Returns a promise that will resolve once // the element is setup and ready for playback. -function loadMseVideo(tab) { - return SpecialPowers.spawn(tab.linkedBrowser, [], async _ => { - async function once(target, name) { - return new Promise(r => target.addEventListener(name, r, { once: true })); - } +function loadMseVideo(tab, extraEvent = undefined) { + return SpecialPowers.spawn( + tab.linkedBrowser, + [extraEvent], + async _extraEvent => { + async function once(target, name) { + return new Promise(r => + target.addEventListener(name, r, { once: true }) + ); + } - let video = content.document.createElement("video"); - video.id = "media"; - content.document.body.appendChild(video); + let video = content.document.createElement("video"); + video.id = "media"; + content.document.body.appendChild(video); - info(`starting setup MSE`); - const ms = new content.wrappedJSObject.MediaSource(); - video.src = content.wrappedJSObject.URL.createObjectURL(ms); - await once(ms, "sourceopen"); - const sb = ms.addSourceBuffer("video/mp4"); - const videoFile = "bipbop2s.mp4"; - let fetchResponse = await content.fetch(videoFile); - sb.appendBuffer(await fetchResponse.arrayBuffer()); - await once(sb, "updateend"); - ms.endOfStream(); - await once(ms, "sourceended"); + info(`starting setup MSE`); + const ms = new content.wrappedJSObject.MediaSource(); + video.src = content.wrappedJSObject.URL.createObjectURL(ms); + await once(ms, "sourceopen"); + const sb = ms.addSourceBuffer("video/mp4"); + const videoFile = "bipbop2s.mp4"; + let fetchResponse = await content.fetch(videoFile); + sb.appendBuffer(await fetchResponse.arrayBuffer()); + await once(sb, "updateend"); + ms.endOfStream(); + await once(ms, "sourceended"); - info(`waiting 'loadeddata' event to ensure playback is ready`); - await once(video, "loadeddata"); - }); + info(`waiting 'loadeddata' event to ensure playback is ready`); + let promises = []; + promises.push(once(video, "loadeddata")); + if (_extraEvent != undefined) { + info( + `waiting '${_extraEvent}' event to ensure the probe has been recorded` + ); + promises.push( + new Promise(r => + video.addEventListener(_extraEvent, r, { once: true }) + ) + ); + } + await Promise.allSettled(promises); + } + ); } // Creates and configures a video element for EME playback in `tab`. Does not // start playback for the element. Returns a promise that will resolve once // the element is setup and ready for playback. -function loadEmeVideo(tab) { +function loadEmeVideo(tab, extraEvent = undefined) { const emeHelperUri = gTestPath.substr(0, gTestPath.lastIndexOf("/")) + "/eme_standalone.js"; return SpecialPowers.spawn( tab.linkedBrowser, - [emeHelperUri], - async _emeHelperUri => { + [emeHelperUri, extraEvent], + async (_emeHelperUri, _extraEvent) => { async function once(target, name) { return new Promise(r => target.addEventListener(name, r, { once: true }) @@ -113,7 +147,19 @@ function loadEmeVideo(tab) { await once(ms, "sourceended"); info(`waiting 'loadeddata' event to ensure playback is ready`); - await once(video, "loadeddata"); + let promises = []; + promises.push(once(video, "loadeddata")); + if (_extraEvent != undefined) { + info( + `waiting '${_extraEvent}' event to ensure the probe has been recorded` + ); + promises.push( + new Promise(r => + video.addEventListener(_extraEvent, r, { once: true }) + ) + ); + } + await Promise.allSettled(promises); } ); } diff --git a/dom/media/test/bug482461-theora.ogv b/dom/media/test/bug482461-theora.ogv deleted file mode 100644 index 941b8d8efd..0000000000 Binary files a/dom/media/test/bug482461-theora.ogv and /dev/null differ diff --git a/dom/media/test/bug482461.ogv b/dom/media/test/bug482461.ogv deleted file mode 100644 index 6cf6aed330..0000000000 Binary files a/dom/media/test/bug482461.ogv and /dev/null differ diff --git a/dom/media/test/bug495129.ogv b/dom/media/test/bug495129.ogv deleted file mode 100644 index 44eb9296f5..0000000000 Binary files a/dom/media/test/bug495129.ogv and /dev/null differ diff --git a/dom/media/test/bug498380.ogv b/dom/media/test/bug498380.ogv deleted file mode 100644 index 1179ecb70a..0000000000 Binary files a/dom/media/test/bug498380.ogv and /dev/null differ diff --git a/dom/media/test/bug498855-1.ogv b/dom/media/test/bug498855-1.ogv deleted file mode 100644 index 95a524da4c..0000000000 Binary files a/dom/media/test/bug498855-1.ogv and /dev/null differ diff --git a/dom/media/test/bug498855-2.ogv b/dom/media/test/bug498855-2.ogv deleted file mode 100644 index 795a308ae1..0000000000 Binary files a/dom/media/test/bug498855-2.ogv and /dev/null differ diff --git a/dom/media/test/bug498855-3.ogv b/dom/media/test/bug498855-3.ogv deleted file mode 100644 index 714858dfed..0000000000 Binary files a/dom/media/test/bug498855-3.ogv and /dev/null differ diff --git a/dom/media/test/bug499519.ogv b/dom/media/test/bug499519.ogv deleted file mode 100644 index 62c0922d36..0000000000 Binary files a/dom/media/test/bug499519.ogv and /dev/null differ diff --git a/dom/media/test/bug500311.ogv b/dom/media/test/bug500311.ogv deleted file mode 100644 index 2cf27ef1ee..0000000000 Binary files a/dom/media/test/bug500311.ogv and /dev/null differ diff --git a/dom/media/test/bug504613.ogv b/dom/media/test/bug504613.ogv deleted file mode 100644 index 5c7fd015e9..0000000000 Binary files a/dom/media/test/bug504613.ogv and /dev/null differ diff --git a/dom/media/test/bug504644.ogv b/dom/media/test/bug504644.ogv deleted file mode 100644 index 46fb4a876b..0000000000 Binary files a/dom/media/test/bug504644.ogv and /dev/null differ diff --git a/dom/media/test/bug504843.ogv b/dom/media/test/bug504843.ogv deleted file mode 100644 index 94b4750865..0000000000 Binary files a/dom/media/test/bug504843.ogv and /dev/null differ diff --git a/dom/media/test/bug506094.ogv b/dom/media/test/bug506094.ogv deleted file mode 100644 index 142b7b9ad1..0000000000 Binary files a/dom/media/test/bug506094.ogv and /dev/null differ diff --git a/dom/media/test/bug516323.indexed.ogv b/dom/media/test/bug516323.indexed.ogv deleted file mode 100644 index 7bd76eeccc..0000000000 Binary files a/dom/media/test/bug516323.indexed.ogv and /dev/null differ diff --git a/dom/media/test/bug516323.ogv b/dom/media/test/bug516323.ogv deleted file mode 100644 index 8f2f38b983..0000000000 Binary files a/dom/media/test/bug516323.ogv and /dev/null differ diff --git a/dom/media/test/bug523816.ogv b/dom/media/test/bug523816.ogv deleted file mode 100644 index ca9a31b6da..0000000000 Binary files a/dom/media/test/bug523816.ogv and /dev/null differ diff --git a/dom/media/test/bug556821.ogv b/dom/media/test/bug556821.ogv deleted file mode 100644 index 8d76fee45e..0000000000 Binary files a/dom/media/test/bug556821.ogv and /dev/null differ diff --git a/dom/media/test/bug557094.ogv b/dom/media/test/bug557094.ogv deleted file mode 100644 index b4fc0799a6..0000000000 Binary files a/dom/media/test/bug557094.ogv and /dev/null differ diff --git a/dom/media/test/can_play_type_ogg.js b/dom/media/test/can_play_type_ogg.js index 6572ab7c0f..e2c974d601 100644 --- a/dom/media/test/can_play_type_ogg.js +++ b/dom/media/test/can_play_type_ogg.js @@ -5,18 +5,23 @@ function check_ogg(v, enabled, finish) { function basic_test() { return new Promise(function (resolve) { - // Ogg types - check("video/ogg", "maybe"); + if (SpecialPowers.getBoolPref("media.theora.enabled")) { + check("video/ogg", "maybe"); + check("video/ogg; codecs=vorbis", "probably"); + check("video/ogg; codecs=vorbis,theora", "probably"); + check('video/ogg; codecs="vorbis, theora"', "probably"); + check("video/ogg; codecs=theora", "probably"); + } else { + check("video/ogg", ""); + check("video/ogg; codecs=vorbis", ""); + check("video/ogg; codecs=vorbis,theora", ""); + check('video/ogg; codecs="vorbis, theora"', ""); + check("video/ogg; codecs=theora", ""); + } check("audio/ogg", "maybe"); check("application/ogg", "maybe"); - // Supported Ogg codecs check("audio/ogg; codecs=vorbis", "probably"); - check("video/ogg; codecs=vorbis", "probably"); - check("video/ogg; codecs=vorbis,theora", "probably"); - check('video/ogg; codecs="vorbis, theora"', "probably"); - check("video/ogg; codecs=theora", "probably"); - resolve(); }); } diff --git a/dom/media/test/chained-video.ogv b/dom/media/test/chained-video.ogv deleted file mode 100644 index a6288ef6c9..0000000000 Binary files a/dom/media/test/chained-video.ogv and /dev/null differ diff --git a/dom/media/test/crashtests/576612-1.html b/dom/media/test/crashtests/576612-1.html deleted file mode 100644 index 04f993e780..0000000000 --- a/dom/media/test/crashtests/576612-1.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - diff --git a/dom/media/test/make-headers.sh b/dom/media/test/make-headers.sh index 35d9bd90f8..d2ac0610e2 100644 --- a/dom/media/test/make-headers.sh +++ b/dom/media/test/make-headers.sh @@ -8,9 +8,9 @@ # requests is not interferred with by Necko's cache. See bug 977398 # for details. Necko will fix this in bug 977314. -FILES=(`ls *.ogg *.ogv *.webm *.mp3 *.opus *.mp4 *.m4s *.wav`) +FILES=(`ls *.ogg *.webm *.mp3 *.opus *.mp4 *.m4s *.wav`) -rm -f *.ogg^headers^ *.ogv^headers^ *.webm^headers^ *.mp3^headers^ *.opus^headers^ *.mp4^headers^ *.m4s^headers^ *.wav^headers^ +rm -f *.ogg^headers^ *.webm^headers^ *.mp3^headers^ *.opus^headers^ *.mp4^headers^ *.m4s^headers^ *.wav^headers^ for i in "${FILES[@]}" do diff --git a/dom/media/test/manifest.js b/dom/media/test/manifest.js index c357309021..686e5b07ed 100644 --- a/dom/media/test/manifest.js +++ b/dom/media/test/manifest.js @@ -51,14 +51,6 @@ var gSmallTests = [ { name: "small-shot-mp3.mp4", type: "audio/mp4; codecs=mp3", duration: 0.34 }, { name: "small-shot.flac", type: "audio/flac", duration: 0.197 }, { name: "r11025_s16_c1-short.wav", type: "audio/x-wav", duration: 0.37 }, - { - name: "320x240.ogv", - type: "video/ogg", - width: 320, - height: 240, - duration: 0.266, - contentDuration: 0.133, - }, { name: "seek-short.webm", type: "video/webm", @@ -94,7 +86,6 @@ var gFrameCountTests = [ { name: "gizmo.mp4", type: "video/mp4", totalFrameCount: 166 }, { name: "seek-short.webm", type: "video/webm", totalFrameCount: 8 }, { name: "seek.webm", type: "video/webm", totalFrameCount: 120 }, - { name: "320x240.ogv", type: "video/ogg", totalFrameCount: 8 }, { name: "av1.mp4", type: "video/mp4", totalFrameCount: 24 }, ]; @@ -105,13 +96,6 @@ gSmallTests = gSmallTests.concat([ // Used by test_bug654550.html, for videoStats preference var gVideoTests = [ - { - name: "320x240.ogv", - type: "video/ogg", - width: 320, - height: 240, - duration: 0.266, - }, { name: "seek-short.webm", type: "video/webm", @@ -145,15 +129,6 @@ var gLongerTests = [ var gProgressTests = [ { name: "r11025_u8_c1.wav", type: "audio/x-wav", duration: 1.0, size: 11069 }, { name: "big-short.wav", type: "audio/x-wav", duration: 1.11, size: 12366 }, - { name: "seek-short.ogv", type: "video/ogg", duration: 1.03, size: 79921 }, - { - name: "320x240.ogv", - type: "video/ogg", - width: 320, - height: 240, - duration: 0.266, - size: 28942, - }, { name: "seek-short.webm", type: "video/webm", duration: 0.23, size: 19267 }, { name: "gizmo-short.mp4", type: "video/mp4", duration: 0.27, size: 29905 }, { name: "bogus.duh", type: "bogus/duh" }, @@ -162,7 +137,6 @@ var gProgressTests = [ // Used by test_played.html var gPlayedTests = [ { name: "big-short.wav", type: "audio/x-wav", duration: 1.11 }, - { name: "seek-short.ogv", type: "video/ogg", duration: 1.03 }, { name: "seek-short.webm", type: "video/webm", duration: 0.23 }, { name: "gizmo-short.mp4", type: "video/mp4", duration: 0.27 }, { name: "owl-short.mp3", type: "audio/mpeg", duration: 0.52 }, @@ -187,14 +161,14 @@ if ( // anything for testing clone-specific bugs. var cloneKey = Math.floor(Math.random() * 100000000); var gCloneTests = [ - // short-video is more like 1s, so if you load this twice you'll get an unexpected duration + // vp9.webm is more like 4s, so if you load this twice you'll get an unexpected duration { name: "dynamic_resource.sjs?key=" + cloneKey + - "&res1=320x240.ogv&res2=short-video.ogv", - type: "video/ogg", - duration: 0.266, + "&res1=seek-short.webm&res2=vp9.webm", + type: "video/webm", + duration: 0.23, }, ]; @@ -222,23 +196,6 @@ var gTrackTests = [ hasAudio: true, hasVideo: false, }, - { - name: "320x240.ogv", - type: "video/ogg", - width: 320, - height: 240, - duration: 0.266, - size: 28942, - hasAudio: false, - hasVideo: true, - }, - { - name: "short-video.ogv", - type: "video/ogg", - duration: 1.081, - hasAudio: true, - hasVideo: true, - }, { name: "seek-short.webm", type: "video/webm", @@ -257,10 +214,6 @@ var gTrackTests = [ { name: "bogus.duh", type: "bogus/duh" }, ]; -var gClosingConnectionsTest = [ - { name: "seek-short.ogv", type: "video/ogg", duration: 1.03 }, -]; - // Used by any media recorder test. Need one test file per decoder backend // currently supported by the media encoder. var gMediaRecorderTests = [ @@ -318,36 +271,6 @@ var gPlayTests = [ // Data length 0xFFFFFFFF and odd chunk lengths. { name: "bug1301226-odd.wav", type: "audio/x-wav", duration: 0.003673 }, - // Ogg stream without eof marker - { name: "bug461281.ogg", type: "application/ogg", duration: 2.208 }, - - // oggz-chop stream - { name: "bug482461.ogv", type: "video/ogg", duration: 4.34 }, - // Theora only oggz-chop stream - { name: "bug482461-theora.ogv", type: "video/ogg", duration: 4.138 }, - // With first frame a "duplicate" (empty) frame. - { - name: "bug500311.ogv", - type: "video/ogg", - duration: 1.96, - contentDuration: 1.958, - }, - // Small audio file - { name: "small-shot.ogg", type: "audio/ogg", duration: 0.276 }, - // More audio in file than video. - { name: "short-video.ogv", type: "video/ogg", duration: 1.081 }, - // First Theora data packet is zero bytes. - { name: "bug504613.ogv", type: "video/ogg", duration: Number.NaN }, - // Multiple audio streams. - { name: "bug516323.ogv", type: "video/ogg", duration: 4.208 }, - // oggz-chop with non-keyframe as first frame - { - name: "bug556821.ogv", - type: "video/ogg", - duration: 2.936, - contentDuration: 2.903, - }, - // Encoded with vorbis beta1, includes unusually sized codebooks { name: "beta-phrasebook.ogg", type: "audio/ogg", duration: 4.01 }, // Small file, only 1 frame with audio only. @@ -355,45 +278,7 @@ var gPlayTests = [ // Small file with vorbis comments with 0 length values and names. { name: "bug520500.ogg", type: "audio/ogg", duration: 0.123 }, - // Various weirdly formed Ogg files - { - name: "bug499519.ogv", - type: "video/ogg", - duration: 0.24, - contentDuration: 0.22, - }, - { name: "bug506094.ogv", type: "video/ogg", duration: 0 }, - { name: "bug498855-1.ogv", type: "video/ogg", duration: 0.24 }, - { name: "bug498855-2.ogv", type: "video/ogg", duration: 0.24 }, - { name: "bug498855-3.ogv", type: "video/ogg", duration: 0.24 }, - { - name: "bug504644.ogv", - type: "video/ogg", - duration: 1.6, - contentDuration: 1.52, - }, - { - name: "chain.ogv", - type: "video/ogg", - duration: Number.NaN, - contentDuration: 0.266, - }, - { - name: "bug523816.ogv", - type: "video/ogg", - duration: 0.766, - contentDuration: 0, - }, - { name: "bug495129.ogv", type: "video/ogg", duration: 2.41 }, - { - name: "bug498380.ogv", - type: "video/ogg", - duration: 0.7663, - contentDuration: 0, - }, { name: "bug495794.ogg", type: "audio/ogg", duration: 0.3 }, - { name: "bug557094.ogv", type: "video/ogg", duration: 0.24 }, - { name: "multiple-bos.ogg", type: "video/ogg", duration: 0.431 }, { name: "audio-overhang.ogg", type: "video/ogg", duration: 2.3 }, { name: "video-overhang.ogg", type: "video/ogg", duration: 3.966 }, @@ -402,9 +287,8 @@ var gPlayTests = [ // Test playback/metadata work after a redirect { - name: "redirect.sjs?domain=mochi.test:8888&file=320x240.ogv", - type: "video/ogg", - duration: 0.266, + name: "redirect.sjs?domain=mochi.test:8888&file=vp9.webm", + type: "video/webm", }, // Test playback of a webm file @@ -559,14 +443,6 @@ var gPlayTests = [ duration: 4.95, contentDuration: 5.03, }, - // Ogg with theora video and flac audio. - { - name: "A4.ogv", - type: "video/ogg", - width: 320, - height: 240, - duration: 3.13, - }, // A file that has no codec delay at the container level, but has a delay at // the codec level. { @@ -651,37 +527,11 @@ var gSeekToNextFrameTests = [ // Test playback of a WebM file with vp9 video { name: "vp9-short.webm", type: "video/webm", duration: 0.2 }, { name: "vp9cake-short.webm", type: "video/webm", duration: 1.0 }, - // oggz-chop stream - { name: "bug482461.ogv", type: "video/ogg", duration: 4.34 }, - // Theora only oggz-chop stream - { name: "bug482461-theora.ogv", type: "video/ogg", duration: 4.138 }, - // With first frame a "duplicate" (empty) frame. - { name: "bug500311.ogv", type: "video/ogg", duration: 1.96 }, - - // More audio in file than video. - { name: "short-video.ogv", type: "video/ogg", duration: 1.081 }, - // First Theora data packet is zero bytes. - { name: "bug504613.ogv", type: "video/ogg", duration: Number.NaN }, - // Multiple audio streams. - { name: "bug516323.ogv", type: "video/ogg", duration: 4.208 }, - // oggz-chop with non-keyframe as first frame - { name: "bug556821.ogv", type: "video/ogg", duration: 2.936 }, - // Various weirdly formed Ogg files - { name: "bug498855-1.ogv", type: "video/ogg", duration: 0.24 }, - { name: "bug498855-2.ogv", type: "video/ogg", duration: 0.24 }, - { name: "bug498855-3.ogv", type: "video/ogg", duration: 0.24 }, - { name: "bug504644.ogv", type: "video/ogg", duration: 1.6 }, - - { name: "bug523816.ogv", type: "video/ogg", duration: 0.766 }, - - { name: "bug498380.ogv", type: "video/ogg", duration: 0.2 }, - { name: "bug557094.ogv", type: "video/ogg", duration: 0.24 }, - { name: "multiple-bos.ogg", type: "video/ogg", duration: 0.431 }, + // Test playback/metadata work after a redirect { - name: "redirect.sjs?domain=mochi.test:8888&file=320x240.ogv", - type: "video/ogg", - duration: 0.266, + name: "redirect.sjs?domain=mochi.test:8888&file=vp9.webm", + type: "video/webm", }, // Test playback of a webm file { name: "seek-short.webm", type: "video/webm", duration: 0.23 }, @@ -698,14 +548,6 @@ var gSeekToNextFrameTests = [ // A file for each type we can support. var gSnifferTests = [ { name: "big.wav", type: "audio/x-wav", duration: 9.278982, size: 102444 }, - { - name: "320x240.ogv", - type: "video/ogg", - width: 320, - height: 240, - duration: 0.233, - size: 28942, - }, { name: "seek.webm", type: "video/webm", duration: 3.966, size: 215529 }, { name: "gizmo.mp4", type: "video/mp4", duration: 5.56, size: 383631 }, // A mp3 file with id3 tags. @@ -743,49 +585,20 @@ var gInvalidPlayTests = [ ]; // Files to check different cases of ogg skeleton information. -// sample-fisbone-skeleton4.ogv -// - Skeleton v4, w/ Content-Type,Role,Name,Language,Title for both theora/vorbis -// sample-fisbone-wrong-header.ogv -// - Skeleton v4, wrong message field sequence for vorbis // multiple-bos-more-header-fields.ogg // - Skeleton v3, w/ Content-Type,Role,Name,Language,Title for both theora/vorbis -// seek-short.ogv -// - No skeleton, but theora // audio-gaps-short.ogg // - No skeleton, but vorbis var gMultitrackInfoOggPlayList = [ - { name: "sample-fisbone-skeleton4.ogv", type: "video/ogg", duration: 1.0 }, - { name: "sample-fisbone-wrong-header.ogv", type: "video/ogg", duration: 1.0 }, { name: "multiple-bos-more-header-fileds.ogg", type: "video/ogg", duration: 0.431, }, - { name: "seek-short.ogv", type: "video/ogg", duration: 1.03 }, { name: "audio-gaps-short.ogg", type: "audio/ogg", duration: 0.5 }, ]; // Pre-parsed results of gMultitrackInfoOggPlayList. var gOggTrackInfoResults = { - "sample-fisbone-skeleton4.ogv": { - audio_id: " audio_1", - audio_kind: "main", - audio_language: " en-US", - audio_label: " Audio track for test", - video_id: " video_1", - video_kind: "main", - video_language: " fr", - video_label: " Video track for test", - }, - "sample-fisbone-wrong-header.ogv": { - audio_id: "1", - audio_kind: "main", - audio_language: "", - audio_label: "", - video_id: " video_1", - video_kind: "main", - video_language: " fr", - video_label: " Video track for test", - }, "multiple-bos-more-header-fileds.ogg": { audio_id: "1", audio_kind: "main", @@ -796,12 +609,6 @@ var gOggTrackInfoResults = { video_language: "", video_label: "", }, - "seek-short.ogv": { - video_id: "2", - video_kind: "main", - video_language: "", - video_label: "", - }, "audio-gaps-short.ogg": { audio_id: "1", audio_kind: "main", @@ -864,14 +671,6 @@ function range_equals(r1, r2) { // environment. Used by test_info_leak. function makeInfoLeakTests() { return makeAbsolutePathConverter().then(fileUriToSrc => [ - { - type: "video/ogg", - src: fileUriToSrc("tests/dom/media/test/320x240.ogv", true), - }, - { - type: "video/ogg", - src: fileUriToSrc("tests/dom/media/test/404.ogv", false), - }, { type: "audio/x-wav", src: fileUriToSrc("tests/dom/media/test/r11025_s16_c1.wav", true), @@ -880,10 +679,6 @@ function makeInfoLeakTests() { type: "audio/x-wav", src: fileUriToSrc("tests/dom/media/test/404.wav", false), }, - { - type: "audio/ogg", - src: fileUriToSrc("tests/dom/media/test/bug461281.ogg", true), - }, { type: "audio/ogg", src: fileUriToSrc("tests/dom/media/test/404.ogg", false), @@ -896,10 +691,6 @@ function makeInfoLeakTests() { type: "video/webm", src: fileUriToSrc("tests/dom/media/test/404.webm", false), }, - { - type: "video/ogg", - src: "http://localhost/404.ogv", - }, { type: "audio/x-wav", src: "http://localhost/404.wav", @@ -925,9 +716,6 @@ function makeInfoLeakTests() { // something crashes we have some idea of which backend is responsible. var gErrorTests = [ { name: "bogus.wav", type: "audio/x-wav" }, - { name: "bogus.ogv", type: "video/ogg" }, - { name: "448636.ogv", type: "video/ogg" }, - { name: "bug504843.ogv", type: "video/ogg" }, { name: "bug501279.ogg", type: "audio/ogg" }, { name: "bug604067.webm", type: "video/webm" }, { name: "bug1535980.webm", type: "video/webm" }, @@ -943,11 +731,8 @@ var gDurationTests = [{ name: "bug604067.webm", duration: 6.076 }]; var gSeekTests = [ { name: "r11025_s16_c1.wav", type: "audio/x-wav", duration: 1.0 }, { name: "audio.wav", type: "audio/x-wav", duration: 0.031247 }, - { name: "seek.ogv", type: "video/ogg", duration: 3.966 }, - { name: "320x240.ogv", type: "video/ogg", duration: 0.266 }, { name: "seek.webm", type: "video/webm", duration: 3.966 }, { name: "sine.webm", type: "audio/webm", duration: 4.001 }, - { name: "bug516323.indexed.ogv", type: "video/ogg", duration: 4.208333 }, { name: "split.webm", type: "video/webm", duration: 1.967 }, { name: "detodos.opus", type: "audio/ogg; codecs=opus", duration: 2.9135 }, { name: "gizmo.mp4", type: "video/mp4", duration: 5.56 }, @@ -958,9 +743,6 @@ var gSeekTests = [ }, { name: "owl.mp3", type: "audio/mpeg", duration: 3.343 }, { name: "bogus.duh", type: "bogus/duh", duration: 123 }, - - // Bug 1242338: hit a numerical problem while seeking to the duration. - { name: "bug482461-theora.ogv", type: "video/ogg", duration: 4.138 }, ]; var gFastSeekTests = [ @@ -971,14 +753,6 @@ var gFastSeekTests = [ }, // Note: Not all keyframes in the file are actually referenced in the Cues in this file. { name: "seek.webm", type: "video/webm", keyframes: [0, 0.8, 1.6, 2.4, 3.2] }, - // Note: the sync points are the points on both the audio and video streams - // before the keyframes. You can't just assume that the keyframes are the sync - // points, as the audio required for that sync point may be before the keyframe. - { - name: "bug516323.indexed.ogv", - type: "video/ogg", - keyframes: [0, 0.46, 3.06], - }, ]; // These files are WebMs without cues. They're seekable within their buffered @@ -1019,7 +793,6 @@ var gAudioTests = [ // various backends. var g404Tests = [ { name: "404.wav", type: "audio/x-wav" }, - { name: "404.ogv", type: "video/ogg" }, { name: "404.oga", type: "audio/ogg" }, { name: "404.webm", type: "video/webm" }, { name: "bogus.duh", type: "bogus/duh" }, @@ -1034,7 +807,6 @@ var gDecodeErrorTests = [ { name: "dirac.ogg", type: "video/ogg" }, // Invalid files { name: "bogus.wav", type: "audio/x-wav" }, - { name: "bogus.ogv", type: "video/ogg" }, { name: "bogus.duh", type: "bogus/duh" }, ]; @@ -1062,12 +834,6 @@ var gChainingTests = [ // original sample rate, so we can safely play Opus chained media that have // different samplerate accross links. { name: "variable-samplerate.opus", type: "audio/ogg; codec=opus", links: 2 }, - // A chained video file. We don't support those, so only one link should be - // reported. - { name: "chained-video.ogv", type: "video/ogg", links: 1 }, - // A file that consist in 4 links of audio, then another link that has video. - // We should stop right after the 4 audio links. - { name: "chained-audio-video.ogg", type: "video/ogg", links: 4 }, // An opus file that has two links, with a different preskip value for each // link. We should be able to play both links. { name: "variable-preskip.opus", type: "audio/ogg; codec=opus", links: 2 }, @@ -1085,36 +851,6 @@ var gAspectRatioTests = [ // Used by test_metadata.html. var gMetadataTests = [ // Ogg Vorbis files - { - name: "short-video.ogv", - tags: { - TITLE: "Lepidoptera", - ARTIST: "Epoq", - ALBUM: "Kahvi Collective", - DATE: "2002", - COMMENT: "http://www.kahvi.org", - }, - }, - { - name: "bug516323.ogv", - tags: { - GENRE: "Open Movie", - ENCODER: "Audacity", - TITLE: "Elephants Dream", - ARTIST: "Silvia Pfeiffer", - COMMENTS: "Audio Description", - }, - }, - { - name: "bug516323.indexed.ogv", - tags: { - GENRE: "Open Movie", - ENCODER: "Audacity", - TITLE: "Elephants Dream", - ARTIST: "Silvia Pfeiffer", - COMMENTS: "Audio Description", - }, - }, { name: "detodos.opus", tags: { @@ -2208,7 +1944,6 @@ var gDecodeSuspendTests = [ // durations that are looped while we check telemetry for macOS video // low power mode. var gVideoLowPowerTests = [ - { name: "seek.ogv", type: "video/ogg", duration: 3.966 }, { name: "gizmo.mp4", type: "video/mp4", duration: 5.56 }, ]; diff --git a/dom/media/test/mochitest.toml b/dom/media/test/mochitest.toml index 3c8a382766..99bd1c41c8 100644 --- a/dom/media/test/mochitest.toml +++ b/dom/media/test/mochitest.toml @@ -31,12 +31,7 @@ prefs = [ 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^", + "320x240.webm", "VID_0001.ogg", "VID_0001.ogg^headers^", "allowed.sjs", @@ -410,63 +405,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", @@ -487,14 +438,10 @@ 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", @@ -575,8 +522,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", @@ -631,14 +576,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", @@ -651,7 +588,6 @@ support-files = [ "short-audio-fragmented-cenc-without-pssh.mp4", "short-audio-fragmented-cenc-without-pssh.mp4^headers^", "short-cenc.mp4", - "short-video.ogv", "short.mp4", "short.mp4.gz", "short.mp4^headers^", @@ -678,7 +614,6 @@ support-files = [ "sintel-short-clearkey-subsample-encrypted-audio.webm^headers^", "sintel-short-clearkey-subsample-encrypted-video.webm", "sintel-short-clearkey-subsample-encrypted-video.webm^headers^", - "short-video.ogv^headers^", "short-vp9-encrypted-video.mp4", "short-vp9-encrypted-video.mp4^headers^", "small-shot-mp3.mp4", diff --git a/dom/media/test/mochitest_background_video.toml b/dom/media/test/mochitest_background_video.toml index e1bc542264..6eed2c3eb8 100644 --- a/dom/media/test/mochitest_background_video.toml +++ b/dom/media/test/mochitest_background_video.toml @@ -27,12 +27,6 @@ tags = "suspend media-gpu" 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", diff --git a/dom/media/test/mochitest_bugs.toml b/dom/media/test/mochitest_bugs.toml index 5c68d0e795..9e5f785408 100644 --- a/dom/media/test/mochitest_bugs.toml +++ b/dom/media/test/mochitest_bugs.toml @@ -27,12 +27,6 @@ tags = "media-gpu" 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", @@ -483,14 +433,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", @@ -570,8 +514,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", @@ -626,14 +568,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", @@ -655,8 +589,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", 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"] diff --git a/dom/media/test/mochitest_eme.toml b/dom/media/test/mochitest_eme.toml index d7f39c3eb8..fb3c12fbc6 100644 --- a/dom/media/test/mochitest_eme.toml +++ b/dom/media/test/mochitest_eme.toml @@ -27,12 +27,6 @@ skip-if = ["os == 'linux' && (asan || debug)"] # Bug 1476870: common fatal error 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", diff --git a/dom/media/test/mochitest_eme_compat.toml b/dom/media/test/mochitest_eme_compat.toml index 43a5b510fc..cc093b3d28 100644 --- a/dom/media/test/mochitest_eme_compat.toml +++ b/dom/media/test/mochitest_eme_compat.toml @@ -28,12 +28,6 @@ skip-if = ["os == 'linux' && (asan || debug)"] # Bug 1476870: common fatal error 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", @@ -403,63 +397,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", @@ -478,14 +428,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", @@ -565,8 +509,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", @@ -621,14 +563,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", @@ -650,8 +584,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", diff --git a/dom/media/test/mochitest_media_recorder.toml b/dom/media/test/mochitest_media_recorder.toml index a4893d9cf4..3bebaab839 100644 --- a/dom/media/test/mochitest_media_recorder.toml +++ b/dom/media/test/mochitest_media_recorder.toml @@ -27,12 +27,6 @@ tags = "mtg" 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,10 @@ 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 +514,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 +568,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 +589,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", @@ -793,7 +727,7 @@ skip-if = ["os == 'android'"] # android(bug 1232305) ["test_mediarecorder_principals.html"] skip-if = [ - "os == 'win' && os_version == '10.0'", # Bug 1453375 + "os == 'win' && os_version == '10.2009'", # Bug 1453375 "os == 'android'", # Bug 1694645 ] diff --git a/dom/media/test/mochitest_seek.toml b/dom/media/test/mochitest_seek.toml index d71aac775a..7d7e703ab3 100644 --- a/dom/media/test/mochitest_seek.toml +++ b/dom/media/test/mochitest_seek.toml @@ -27,12 +27,6 @@ tags = "media-gpu" 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", 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) diff --git a/dom/media/test/multiple-bos.ogg b/dom/media/test/multiple-bos.ogg deleted file mode 100644 index 193200868e..0000000000 Binary files a/dom/media/test/multiple-bos.ogg and /dev/null differ diff --git a/dom/media/test/reftest/color_quads/reftest.list b/dom/media/test/reftest/color_quads/reftest.list index 63a538b78a..10b62dc817 100644 --- a/dom/media/test/reftest/color_quads/reftest.list +++ b/dom/media/test/reftest/color_quads/reftest.list @@ -18,7 +18,7 @@ fuzzy(16-51,5234-5622) fuzzy-if(swgl,32-38,1600-91746) fuzzy-if(useDrawSnapshot, fuzzy-if(winWidget&&swgl,0-20,0-5620) fuzzy-if(winWidget&&!swgl,0-1,0-78) fuzzy-if(Android,254-255,273680-273807) fuzzy-if(cocoaWidget,0-35,0-1947) fuzzy-if(cocoaWidget&&swgl,0-67,0-5451) fuzzy-if(appleSilicon,30-48,1760-187409) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.vp9.webm ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.webm fuzzy-if(winWidget,0-1,0-78) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.mp4 ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.webm skip-if(winWidget&&isCoverageBuild) fuzzy(0-16,75-1941) fuzzy-if(Android,28-255,273680-359920) fuzzy-if(cocoaWidget,30-32,187326-187407) fuzzy-if(appleSilicon,30-48,1835-187409) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.h264.mp4 ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.webm -fuzzy-if(winWidget&&swgl,0-20,0-5620) fuzzy-if(winWidget&&!swgl,0-1,0-78) fuzzy-if(Android,254-255,273680-273807) fuzzy-if(cocoaWidget,0-35,0-1947) fuzzy-if(cocoaWidget&&swgl,0-67,0-5451) fuzzy-if(appleSilicon,30-48,1760-187409) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.vp9.mp4 ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.webm +fuzzy-if(winWidget&&swgl,0-20,0-5620) fuzzy-if(winWidget&&!swgl,0-1,0-78) skip-if(Android) fuzzy-if(cocoaWidget,0-35,0-1947) fuzzy-if(cocoaWidget&&swgl,0-67,0-5451) fuzzy-if(appleSilicon,30-48,1760-187409) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.vp9.mp4 ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.tv.yuv420p.av1.webm skip-if(Android) fuzzy(16-48,8107-8818) fuzzy-if(winWidget&&swgl,31-38,8240-184080) fuzzy-if(appleSilicon,33-38,8819-11705) fuzzy-if(useDrawSnapshot,20-20,187200-187200) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.pc.yuv420p.av1.webm ../reftest_img.html?src=color_quads/720p.png skip-if(Android) == ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.pc.yuv420p.av1.mp4 ../reftest_video.html?src=color_quads/720p.png.bt709.bt709.pc.yuv420p.av1.webm diff --git a/dom/media/test/reftest/reftest.list b/dom/media/test/reftest/reftest.list index 0f709a35ee..bd4cb2d030 100644 --- a/dom/media/test/reftest/reftest.list +++ b/dom/media/test/reftest/reftest.list @@ -1,15 +1,15 @@ skip-if(Android) fuzzy-if(cocoaWidget,0-80,0-76800) fuzzy-if(appleSilicon,0-80,0-76800) fuzzy-if(winWidget,0-63,0-76799) fuzzy-if(gtkWidget,0-70,0-2032) HTTP(..) == short.mp4.firstframe.html short.mp4.firstframe-ref.html skip-if(Android) fuzzy-if(cocoaWidget,0-87,0-76797) fuzzy-if(appleSilicon,0-87,0-76797) fuzzy-if(winWidget,0-60,0-76797) fuzzy-if(gtkWidget,0-60,0-6070) HTTP(..) == short.mp4.lastframe.html short.mp4.lastframe-ref.html skip-if(Android) skip-if(cocoaWidget) skip-if(winWidget) fuzzy-if(gtkWidget,0-57,0-4282) fuzzy-if(cocoaWidget,55-80,4173-4417) HTTP(..) == bipbop_300_215kbps.mp4.lastframe.html bipbop_300_215kbps.mp4.lastframe-ref.html -skip-if(Android) fuzzy-if(cocoaWidget,0-25,0-175921) fuzzy-if(appleSilicon,34-34,40100-40100) fuzzy-if(winWidget,0-71,0-179198) HTTP(..) == gizmo.mp4.seek.html gizmo.mp4.55thframe-ref.html +skip-if(Android) fuzzy-if(cocoaWidget,0-25,0-175921) fuzzy-if(appleSilicon,34-34,40100-40100) fuzzy-if(winWidget,0-71,0-179198) fuzzy-if(gtkWidget,0-46,0-173482) HTTP(..) == gizmo.mp4.seek.html gizmo.mp4.55thframe-ref.html # Bug 1758718 skip-if(Android) skip-if(cocoaWidget) fuzzy(0-10,0-778236) == image-10bits-rendering-video.html image-10bits-rendering-ref.html skip-if(Android) fuzzy(0-10,0-778536) fuzzy-if(appleSilicon,0-37,0-699614) == image-10bits-rendering-90-video.html image-10bits-rendering-90-ref.html # Bug 1758718 skip-if(Android) fuzzy(0-27,0-573106) skip-if(cocoaWidget) == image-10bits-rendering-720-video.html image-10bits-rendering-720-ref.html skip-if(Android) fuzzy(0-31,0-573249) fuzzy-if(appleSilicon,0-37,0-543189) == image-10bits-rendering-720-90-video.html image-10bits-rendering-720-90-ref.html -skip-if(Android) fuzzy(0-84,0-771156) fails-if(useDrawSnapshot) == uneven_frame_duration_video.html uneven_frame_duration_video-ref.html # Skip on Windows 7 as the resolution of the video is too high for test machines and will fail in the decoder. +skip-if(Android) fuzzy(0-84,0-774213) fails-if(useDrawSnapshot) == uneven_frame_duration_video.html uneven_frame_duration_video-ref.html # Skip on Windows 7 as the resolution of the video is too high for test machines and will fail in the decoder. # Set media.dormant-on-pause-timeout-ms to avoid decoders becoming dormant and busting test, skip on android as test is too noisy and unstable skip-if(Android) pref(media.dormant-on-pause-timeout-ms,-1) fuzzy(0-20,0-500) == frame_order_mp4.html frame_order_mp4-ref.html skip-if(Android) fuzzy(0-30,0-270000) == incorrect_display_in_bytestream_vp8.html incorrect_display_in_bytestream_vp8-ref.html -skip-if(Android) fuzzy(0-22,0-377335) == incorrect_display_in_bytestream_vp9.html incorrect_display_in_bytestream_vp9-ref.html +skip-if(Android) fuzzy(0-22,0-381481) == incorrect_display_in_bytestream_vp9.html incorrect_display_in_bytestream_vp9-ref.html diff --git a/dom/media/test/sample-fisbone-skeleton4.ogv b/dom/media/test/sample-fisbone-skeleton4.ogv deleted file mode 100644 index 8afe0be7a4..0000000000 Binary files a/dom/media/test/sample-fisbone-skeleton4.ogv and /dev/null differ diff --git a/dom/media/test/sample-fisbone-wrong-header.ogv b/dom/media/test/sample-fisbone-wrong-header.ogv deleted file mode 100644 index 46c3933da5..0000000000 Binary files a/dom/media/test/sample-fisbone-wrong-header.ogv and /dev/null differ diff --git a/dom/media/test/seek-short.ogv b/dom/media/test/seek-short.ogv deleted file mode 100644 index a5ca6951d0..0000000000 Binary files a/dom/media/test/seek-short.ogv and /dev/null differ diff --git a/dom/media/test/seek.ogv b/dom/media/test/seek.ogv deleted file mode 100644 index ac7ece3519..0000000000 Binary files a/dom/media/test/seek.ogv and /dev/null differ diff --git a/dom/media/test/seekLies.sjs b/dom/media/test/seekLies.sjs index 4fc528a0a5..3b2b19921a 100644 --- a/dom/media/test/seekLies.sjs +++ b/dom/media/test/seekLies.sjs @@ -6,7 +6,7 @@ function handleRequest(request, response) { var bis = Cc["@mozilla.org/binaryinputstream;1"].createInstance( Ci.nsIBinaryInputStream ); - var paths = "tests/dom/media/test/seek.ogv"; + var paths = "tests/dom/media/test/vp9.webm"; var split = paths.split("/"); for (var i = 0; i < split.length; ++i) { file.append(split[i]); @@ -15,7 +15,7 @@ function handleRequest(request, response) { bis.setInputStream(fis); var bytes = bis.readBytes(bis.available()); response.setHeader("Content-Length", "" + bytes.length, false); - response.setHeader("Content-Type", "video/ogg", false); + response.setHeader("Content-Type", "video/webm", false); response.setHeader("Accept-Ranges", "bytes", false); response.write(bytes, bytes.length); bis.close(); diff --git a/dom/media/test/short-video.ogv b/dom/media/test/short-video.ogv deleted file mode 100644 index 68dee3cf2b..0000000000 Binary files a/dom/media/test/short-video.ogv and /dev/null differ diff --git a/dom/media/test/test_bug1248229.html b/dom/media/test/test_bug1248229.html index 3165795622..e0ca1c96b5 100644 --- a/dom/media/test/test_bug1248229.html +++ b/dom/media/test/test_bug1248229.html @@ -7,7 +7,7 @@ - +
diff --git a/dom/media/test/test_error_in_video_document.html b/dom/media/test/test_error_in_video_document.html index e376ea95e3..b48e7745d0 100644 --- a/dom/media/test/test_error_in_video_document.html +++ b/dom/media/test/test_error_in_video_document.html @@ -31,7 +31,7 @@ function check() { // Debug info for Bug 608634 ok(true, "iframe src=" + document.body.getElementsByTagName("iframe")[0].src); - is(v.readyState, v.HAVE_NOTHING, "Ready state"); + is(v.readyState, v.HAVE_NOTHING, "Ready state for " + document.body.getElementsByTagName("iframe")[0].src); isnot(v.error, null, "Error object"); is(v.networkState, v.NETWORK_NO_SOURCE, "Network state"); @@ -40,15 +40,16 @@ function check() { } // Find an error test that we'd think we should be able to play (if it -// wasn't already known to fail). -var t = getPlayableVideo(gErrorTests); +// wasn't already known to fail). This needs to fail early: for example, +// incorrect metadata, not correct metadata but incorrect encoded packets. +var t = "bug1535980.webm"; if (!t) { todo(false, "No types supported"); } else { SimpleTest.waitForExplicitFinish(); var f = document.createElement("iframe"); - f.src = t.name; + f.src = t; f.addEventListener("load", check); document.body.appendChild(f); } diff --git a/dom/media/test/test_load_same_resource.html b/dom/media/test/test_load_same_resource.html index f3e6992e8c..d3351226cd 100644 --- a/dom/media/test/test_load_same_resource.html +++ b/dom/media/test/test_load_same_resource.html @@ -78,7 +78,7 @@ async function initTest(test, token) { e.token = token; manager.started(token); - // Since 320x240.ogv is less than 32KB, we need to wait for the + // Since 320x240.webm is less than 32KB, we need to wait for the // 'suspend' event to ensure the partial block is flushed to the cache // otherwise the cloned resource will create a new channel when it // has no data to read at position 0. The new channel will download diff --git a/dom/media/test/test_media_selection.html b/dom/media/test/test_media_selection.html index 33ecabfd58..72bde2dd9e 100644 --- a/dom/media/test/test_media_selection.html +++ b/dom/media/test/test_media_selection.html @@ -111,7 +111,7 @@ for (var i = 0; i < gSmallTests.length; ++i) { checkMetadata(t.name, e, t); }}(test); - var otherType = type.match(/^video\//) ? "audio/x-wav" : "video/ogg"; + var otherType = type.match(/^video\//) ? "audio/x-wav" : "video/webm"; subtests.push(maketest(set_src, src, null, check), maketest(add_source, src, null, check), maketest(add_source, src, type, check), diff --git a/dom/media/test/test_preload_suspend.html b/dom/media/test/test_preload_suspend.html index b715a58dc8..5fefe251ae 100644 --- a/dom/media/test/test_preload_suspend.html +++ b/dom/media/test/test_preload_suspend.html @@ -89,7 +89,7 @@ function startTest(test) { var v = document.createElement("video"); v.name = test.name; var key = Math.random(); - v.src = "seek.ogv?key=" + key + "&id=" + v.name; + v.src = "vp9.webm?key=" + key + "&id=" + v.name; v.preload = test.preload; v.suspendCount = 0; v.expectedSuspendCount = test.expectedSuspendCount; diff --git a/dom/media/test/test_standalone.html b/dom/media/test/test_standalone.html index 620878a394..3b61f66d0a 100644 --- a/dom/media/test/test_standalone.html +++ b/dom/media/test/test_standalone.html @@ -6,56 +6,41 @@ - - -
 
-
diff --git a/dom/media/test/test_streams_element_capture.html b/dom/media/test/test_streams_element_capture.html index 098136dba7..8695dbf63b 100644 --- a/dom/media/test/test_streams_element_capture.html +++ b/dom/media/test/test_streams_element_capture.html @@ -109,6 +109,11 @@ async function startTest(test, token) { let tests = gPlayTests; // Filter out bug1377278.webm due to bug 1541401. tests = tests.filter(t => !t.name.includes("1377278")); + // bug 1372457, bug 1526207 for drawImage -- restrict to codecs that can be + // decoded in software. + if (navigator.userAgent.includes("Android")) { + tests = tests.filter(t => !t.name.includes("mp4")); + } manager.runTests(tests, async (test, token) => { try { diff --git a/dom/media/test/test_streams_element_capture_twice.html b/dom/media/test/test_streams_element_capture_twice.html index 0e30be1801..f180fd12fd 100644 --- a/dom/media/test/test_streams_element_capture_twice.html +++ b/dom/media/test/test_streams_element_capture_twice.html @@ -66,7 +66,7 @@ async function startTest(src) { (async function() { try { - await startTest("short-video.ogv"); + await startTest("vp9cake.webm"); } catch(e) { ok(false, `Caught error: ${e}${e.stack ? '\n' + e.stack : ''}`); } finally { diff --git a/dom/media/test/test_videoDocumentTitle.html b/dom/media/test/test_videoDocumentTitle.html index dd52dba26c..b03c41a30c 100644 --- a/dom/media/test/test_videoDocumentTitle.html +++ b/dom/media/test/test_videoDocumentTitle.html @@ -21,8 +21,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=463830 /** Test for Bug 463830 **/ var gTests = [ - { file: "320x240.ogv", title: "320x240.ogv" }, - { file: "bug461281.ogg", title: "bug461281.ogg" }, + { file: "vp9.webm", title: "vp9.webm" }, + { file: "vp9cake.webm", title: "vp9cake.webm" }, ]; var gTestNum = 0; diff --git a/dom/media/test/test_video_stats_resistfingerprinting.html b/dom/media/test/test_video_stats_resistfingerprinting.html index 2bc239b367..90c8d2a3d3 100644 --- a/dom/media/test/test_video_stats_resistfingerprinting.html +++ b/dom/media/test/test_video_stats_resistfingerprinting.html @@ -35,7 +35,6 @@ https://trac.torproject.org/projects/tor/ticket/15757 ["privacy.resistFingerprinting.target_video_res", 240] ); var testCases = [ - { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.266, drop: false }, { name:"seek.webm", type:"video/webm", width:320, height:240, duration:3.966, drop: false }, { name:"gizmo.mp4", type:"video/mp4", width:560, height:320, duration:5.56, drop: true } ]; -- cgit v1.2.3