diff --git a/.prettierignore b/.prettierignore
index 206f3bd6ce82..dbfc022d782c 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -911,6 +911,7 @@ mobile/android/geckoview/src/androidTest/assets/www/autoplay.html
 mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html
 mobile/android/geckoview/src/androidTest/assets/www/context_menu_video.html
 mobile/android/geckoview/src/androidTest/assets/www/mp4.html
+mobile/android/geckoview/src/androidTest/assets/www/ogg.html
 mobile/android/geckoview/src/androidTest/assets/www/webm.html
 netwerk/test/browser/103_preload_iframe.html
 netwerk/test/browser/post.html
diff --git a/browser/base/content/test/contextMenu/browser.toml b/browser/base/content/test/contextMenu/browser.toml
index 660f6a955b7d..ccaefa3cfdc4 100644
--- a/browser/base/content/test/contextMenu/browser.toml
+++ b/browser/base/content/test/contextMenu/browser.toml
@@ -8,6 +8,7 @@ support-files = [
   "subtst_contextmenu_xul.xhtml",
   "ctxmenu-image.png",
   "../general/head.js",
+  "../general/video.ogg",
   "../general/audio.ogg",
   "../../../../../toolkit/components/pdfjs/test/file_pdfjs_test.pdf",
   "contextmenu_common.js",
@@ -18,7 +19,6 @@ support-files = [
 ["browser_bug1798178.js"]
 
 ["browser_contextmenu.js"]
-support-files = [ "../general/video.webm"  ]
 tags = "fullscreen"
 skip-if = [
   "os == 'linux'",
diff --git a/browser/base/content/test/contextMenu/browser_contextmenu.js b/browser/base/content/test/contextMenu/browser_contextmenu.js
index 00da3113c643..ebeb4bdb0449 100644
--- a/browser/base/content/test/contextMenu/browser_contextmenu.js
+++ b/browser/base/content/test/contextMenu/browser_contextmenu.js
@@ -137,7 +137,7 @@ add_task(async function test_setup_html() {
     audio.loop = true;
     audio.src = "audio.ogg";
     video.loop = true;
-    video.src = "video.webm";
+    video.src = "video.ogg";
 
     let awaitPause = ContentTaskUtils.waitForEvent(audio, "pause");
     await ContentTaskUtils.waitForCondition(
diff --git a/browser/base/content/test/contextMenu/subtst_contextmenu.html b/browser/base/content/test/contextMenu/subtst_contextmenu.html
index 2facd9fecce8..2c263fbce496 100644
--- a/browser/base/content/test/contextMenu/subtst_contextmenu.html
+++ b/browser/base/content/test/contextMenu/subtst_contextmenu.html
@@ -26,14 +26,14 @@ document.getElementById("shadow-host-in-link").attachShadow({ mode: "closed" }).
   <image id="test-svg-image" href="ctxmenu-image.png"/>
 </svg>
 <canvas id="test-canvas" width="100" height="100" style="background-color: blue"></canvas>
-<video controls id="test-video-ok"  src="video.webm" width="100" height="100" style="background-color: green"></video>
+<video controls id="test-video-ok"  src="video.ogg" width="100" height="100" style="background-color: green"></video>
 <video id="test-audio-in-video" src="audio.ogg" width="100" height="100" style="background-color: red"></video>
 <video controls id="test-video-bad" src="bogus.duh" width="100" height="100" style="background-color: orange"></video>
 <video controls id="test-video-bad2" width="100" height="100" style="background-color: yellow">
   <source src="bogus.duh" type="video/durrrr;">
 </video>
 <iframe id="test-iframe" width="98"  height="98" style="border: 1px solid black"></iframe>
-<iframe id="test-video-in-iframe" src="video.webm" width="98" height="98" style="border: 1px solid black"></iframe>
+<iframe id="test-video-in-iframe" src="video.ogg" width="98" height="98" style="border: 1px solid black"></iframe>
 <iframe id="test-audio-in-iframe" src="audio.ogg" width="98" height="98" style="border: 1px solid black"></iframe>
 <iframe id="test-image-in-iframe" src="ctxmenu-image.png" width="98" height="98" style="border: 1px solid black"></iframe>
 <iframe id="test-pdf-viewer-in-frame" src="file_pdfjs_test.pdf" width="100" height="100" style="border: 1px solid black"></iframe>
diff --git a/browser/base/content/test/contextMenu/subtst_contextmenu_webext.html b/browser/base/content/test/contextMenu/subtst_contextmenu_webext.html
index be45c2ddd08d..ac3b5415ddaf 100644
--- a/browser/base/content/test/contextMenu/subtst_contextmenu_webext.html
+++ b/browser/base/content/test/contextMenu/subtst_contextmenu_webext.html
@@ -7,6 +7,6 @@
 <body>
   Browser context menu subtest.
   <a href="moz-extension://foo-bar/tab.html" id="link">Link to an extension resource</a>
-  <video src="moz-extension://foo-bar/video.webm" id="video"></video>
+  <video src="moz-extension://foo-bar/video.ogg" id="video"></video>
 </body>
 </html>
diff --git a/browser/base/content/test/general/browser.toml b/browser/base/content/test/general/browser.toml
index 31d519d550a5..6928ba2d4ba0 100644
--- a/browser/base/content/test/general/browser.toml
+++ b/browser/base/content/test/general/browser.toml
@@ -37,6 +37,10 @@ support-files = [
   "title_test.svg",
   "unknownContentType_file.pif",
   "unknownContentType_file.pif^headers^",
+  "video.ogg",
+  "web_video.html",
+  "web_video1.ogv",
+  "web_video1.ogv^headers^",
   "!/image/test/mochitest/blue.png",
   "!/toolkit/content/tests/browser/common/mockTransfer.js",
 ]
@@ -207,7 +211,6 @@ support-files = [
   "dummy.ics",
   "dummy.ics^headers^",
   "redirect_download.sjs",
-  "video.webm",
 ]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 
@@ -432,19 +435,9 @@ skip-if = [
  "os == 'win' && debug",
  "os =='linux'", #Bug 1212419
 ]
-support-files = [
-  "web_video.html",
-  "web_video1.webm",
-  "web_video1.webm^headers^",
-]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 
 ["browser_save_video_frame.js"]
-support-files = [
-  "web_video.html",
-  "web_video1.webm",
-  "web_video1.webm^headers^",
-]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 
 ["browser_selectTabAtIndex.js"]
diff --git a/browser/base/content/test/general/browser_bug676619.js b/browser/base/content/test/general/browser_bug676619.js
index 90dd8f4f7c72..1381d64ea7f2 100644
--- a/browser/base/content/test/general/browser_bug676619.js
+++ b/browser/base/content/test/general/browser_bug676619.js
@@ -116,8 +116,8 @@ async function runTest(url) {
   await BrowserTestUtils.browserLoaded(browser);
 
   await testLink("link1", "test.txt");
-  await testLink("link2", "video.webm");
-  await testLink("link3", "just some video.webm");
+  await testLink("link2", "video.ogg");
+  await testLink("link3", "just some video.ogg");
   await testLink("link4", "with-target.txt");
   await testLink("link5", "javascript.html");
   await testLink("link6", "test.blob");
@@ -132,8 +132,8 @@ async function runTest(url) {
   // Check that we enforce the correct extension if the website's
   // is bogus or missing. These extensions can differ slightly (ogx vs ogg,
   // htm vs html) on different OSes.
-  let webmExtension = getMIMEInfoForType("video/webm").primaryExtension;
-  await testLink("link13", "no file extension." + webmExtension);
+  let oggExtension = getMIMEInfoForType("application/ogg").primaryExtension;
+  await testLink("link13", "no file extension." + oggExtension);
 
   // See https://bugzilla.mozilla.org/show_bug.cgi?id=1690051#c8
   if (AppConstants.platform != "win") {
diff --git a/browser/base/content/test/general/browser_save_video.js b/browser/base/content/test/general/browser_save_video.js
index dad14aa289de..e9701d702307 100644
--- a/browser/base/content/test/general/browser_save_video.js
+++ b/browser/base/content/test/general/browser_save_video.js
@@ -52,7 +52,7 @@ add_task(async function () {
 
       is(
         fileName,
-        "web-video1-expectedName.webm",
+        "web-video1-expectedName.ogv",
         "Video file name is correctly retrieved from Content-Disposition http header"
       );
       resolve();
diff --git a/browser/base/content/test/general/download_page.html b/browser/base/content/test/general/download_page.html
index 625ff46aab1c..dc86806b8573 100644
--- a/browser/base/content/test/general/download_page.html
+++ b/browser/base/content/test/general/download_page.html
@@ -13,10 +13,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=676619
     <ul>
         <li><a href="download_page_1.txt"
                 download="test.txt" id="link1">Download "test.txt"</a></li>
-        <li><a href="video.webm"
-                download id="link2">Download "video.webm"</a></li>
-        <li><a href="video.webm"
-                download="just some video.webm" id="link3">Download "just some video.webm"</a></li>
+        <li><a href="video.ogg"
+                download id="link2">Download "video.ogg"</a></li>
+        <li><a href="video.ogg"
+                download="just some video.ogg" id="link3">Download "just some video.ogg"</a></li>
         <li><a href="download_page_2.txt"
                 download="with-target.txt" id="link4">Download "with-target.txt"</a></li>
         <li><a href="javascript:(1+2)+''"
@@ -33,7 +33,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=676619
             download="download_page_4.txt" id="link11">Download "download_page_4.txt"</a></li>
         <li><a href="http://example.com/"
             download="example.com" id="link12" target="_blank">Download "example.com"</a></li>
-        <li><a href="video.webm"
+        <li><a href="video.ogg"
             download="no file extension" id="link13">Download "force extension"</a></li>
         <li><a href="dummy.ics"
             download="dummy.not-ics" id="link14">Download "dummy.not-ics"</a></li>
diff --git a/browser/base/content/test/general/video.ogg b/browser/base/content/test/general/video.ogg
new file mode 100644
index 000000000000..ac7ece3519ac
Binary files /dev/null and b/browser/base/content/test/general/video.ogg differ
diff --git a/browser/base/content/test/general/video.webm b/browser/base/content/test/general/video.webm
deleted file mode 100644
index 0ca38d3cf0ac..000000000000
Binary files a/browser/base/content/test/general/video.webm and /dev/null differ
diff --git a/browser/base/content/test/general/web_video.html b/browser/base/content/test/general/web_video.html
index e03c85d1dc8e..467fb0ce1cb5 100644
--- a/browser/base/content/test/general/web_video.html
+++ b/browser/base/content/test/general/web_video.html
@@ -5,6 +5,6 @@
   <body>
     This document has some web video in it.
     <br>
-    <video src="web_video1.webm" id="video1"> </video>
+    <video src="web_video1.ogv" id="video1"> </video>
   </body>
 </html>
diff --git a/browser/base/content/test/general/web_video1.ogv b/browser/base/content/test/general/web_video1.ogv
new file mode 100644
index 000000000000..093158432ac6
Binary files /dev/null and b/browser/base/content/test/general/web_video1.ogv differ
diff --git a/browser/base/content/test/general/web_video1.ogv^headers^ b/browser/base/content/test/general/web_video1.ogv^headers^
new file mode 100644
index 000000000000..4511e9255258
--- /dev/null
+++ b/browser/base/content/test/general/web_video1.ogv^headers^
@@ -0,0 +1,3 @@
+Content-Disposition: filename="web-video1-expectedName.ogv" 
+Content-Type: video/ogg
+
diff --git a/browser/base/content/test/general/web_video1.webm b/browser/base/content/test/general/web_video1.webm
deleted file mode 100644
index 2c9d7dad8df4..000000000000
Binary files a/browser/base/content/test/general/web_video1.webm and /dev/null differ
diff --git a/browser/base/content/test/general/web_video1.webm^headers^ b/browser/base/content/test/general/web_video1.webm^headers^
deleted file mode 100644
index d027132ea201..000000000000
--- a/browser/base/content/test/general/web_video1.webm^headers^
+++ /dev/null
@@ -1,3 +0,0 @@
-Content-Disposition: filename="web-video1-expectedName.webm" 
-Content-Type: video/webm
-
diff --git a/browser/base/content/test/pageinfo/browser.toml b/browser/base/content/test/pageinfo/browser.toml
index 9e143924501a..ae70eb68ff3c 100644
--- a/browser/base/content/test/pageinfo/browser.toml
+++ b/browser/base/content/test/pageinfo/browser.toml
@@ -5,7 +5,7 @@ support-files = [
   "image.html",
   "../general/audio.ogg",
   "../general/moz.png",
-  "../general/video.webm",
+  "../general/video.ogg",
 ]
 
 ["browser_pageinfo_iframe_media.js"]
diff --git a/browser/base/content/test/pageinfo/image.html b/browser/base/content/test/pageinfo/image.html
index 35e2d78e1e9a..1261be8e7b2d 100644
--- a/browser/base/content/test/pageinfo/image.html
+++ b/browser/base/content/test/pageinfo/image.html
@@ -1,5 +1,5 @@
 <html>
   <img src='moz.png' height=100 width=150 id='test-image'>
-  <video src='video.webm' id='test-video'></video>
+  <video src='video.ogg' id='test-video'></video>
   <audio src='audio.ogg' id='test-audio'></audio>
 </html>
diff --git a/browser/base/content/test/zoom/browser.toml b/browser/base/content/test/zoom/browser.toml
index e2aa0c077ac2..281fb9329c03 100644
--- a/browser/base/content/test/zoom/browser.toml
+++ b/browser/base/content/test/zoom/browser.toml
@@ -34,7 +34,7 @@ https_first_disabled = true
 
 ["browser_sitespecific_video_zoom.js"]
 https_first_disabled = true
-support-files = ["../general/video.webm"]
+support-files = ["../general/video.ogg"]
 skip-if = [
   "os == 'win' && debug", # Bug 1315042
   "verify && debug && os == 'linux'", # Bug 1315042
diff --git a/browser/base/content/test/zoom/browser_sitespecific_video_zoom.js b/browser/base/content/test/zoom/browser_sitespecific_video_zoom.js
index 94fd0dee56f1..589e3d09cf84 100644
--- a/browser/base/content/test/zoom/browser_sitespecific_video_zoom.js
+++ b/browser/base/content/test/zoom/browser_sitespecific_video_zoom.js
@@ -8,7 +8,7 @@ const TEST_PAGE =
   "http://example.org/browser/browser/base/content/test/zoom/zoom_test.html";
 const TEST_VIDEO =
   // eslint-disable-next-line @microsoft/sdl/no-insecure-url
-  "http://example.org/browser/browser/base/content/test/general/video.webm";
+  "http://example.org/browser/browser/base/content/test/general/video.ogg";
 
 var gTab1, gTab2, gLevel1;
 
diff --git a/browser/components/originattributes/test/browser/browser.toml b/browser/components/originattributes/test/browser/browser.toml
index 59c9d1c3c6bd..5585b2a9146d 100644
--- a/browser/components/originattributes/test/browser/browser.toml
+++ b/browser/components/originattributes/test/browser/browser.toml
@@ -32,7 +32,7 @@ support-files = [
   "file_thirdPartyChild.script.js",
   "file_thirdPartyChild.sharedworker.js",
   "file_thirdPartyChild.track.vtt",
-  "file_thirdPartyChild.video.webm",
+  "file_thirdPartyChild.video.ogv",
   "file_thirdPartyChild.worker.fetch.html",
   "file_thirdPartyChild.worker.js",
   "file_thirdPartyChild.worker.request.html",
diff --git a/browser/components/originattributes/test/browser/browser_cache.js b/browser/components/originattributes/test/browser/browser_cache.js
index 4c2369fc0044..493f972cef20 100644
--- a/browser/components/originattributes/test/browser/browser_cache.js
+++ b/browser/components/originattributes/test/browser/browser_cache.js
@@ -28,7 +28,7 @@ let suffixes = [
   "xhr.html",
   "worker.xhr.html",
   "audio.ogg",
-  "video.webm",
+  "video.ogv",
   "track.vtt",
   "fetch.html",
   "worker.fetch.html",
@@ -176,7 +176,7 @@ async function doTest(aBrowser) {
   await SpecialPowers.spawn(aBrowser, [argObj], async function (arg) {
     content.windowUtils.clearSharedStyleSheetCache();
 
-    let videoURL = arg.urlPrefix + "file_thirdPartyChild.video.webm";
+    let videoURL = arg.urlPrefix + "file_thirdPartyChild.video.ogv";
     let audioURL = arg.urlPrefix + "file_thirdPartyChild.audio.ogg";
     let trackURL = arg.urlPrefix + "file_thirdPartyChild.track.vtt";
     let URLSuffix = "?r=" + arg.randomSuffix;
diff --git a/browser/components/originattributes/test/browser/browser_firstPartyIsolation_saveAs.js b/browser/components/originattributes/test/browser/browser_firstPartyIsolation_saveAs.js
index e6e65170495b..c54bb1aec1ec 100644
--- a/browser/components/originattributes/test/browser/browser_firstPartyIsolation_saveAs.js
+++ b/browser/components/originattributes/test/browser/browser_firstPartyIsolation_saveAs.js
@@ -15,7 +15,7 @@ const TEST_ORIGIN = `http://${TEST_FIRST_PARTY}`;
 const TEST_BASE_PATH =
   "/browser/browser/components/originattributes/test/browser/";
 const TEST_PATH = `${TEST_BASE_PATH}file_saveAs.sjs`;
-const TEST_PATH_VIDEO = `${TEST_BASE_PATH}file_thirdPartyChild.video.webm`;
+const TEST_PATH_VIDEO = `${TEST_BASE_PATH}file_thirdPartyChild.video.ogv`;
 const TEST_PATH_IMAGE = `${TEST_BASE_PATH}file_favicon.png`;
 
 // For the "Save Page As" test, we will check the channel of the sub-resource
diff --git a/browser/components/originattributes/test/browser/file_saveAs.sjs b/browser/components/originattributes/test/browser/file_saveAs.sjs
index 8e1cc60dae39..9b16250c76e6 100644
--- a/browser/components/originattributes/test/browser/file_saveAs.sjs
+++ b/browser/components/originattributes/test/browser/file_saveAs.sjs
@@ -2,8 +2,8 @@ const HTTP_ORIGIN = "http://example.com";
 const SECOND_ORIGIN = "http://example.org";
 const URI_PATH = "/browser/browser/components/originattributes/test/browser/";
 const LINK_PATH = `${URI_PATH}file_saveAs.sjs`;
-// Reusing existing webm file for testing.
-const VIDEO_PATH = `${URI_PATH}file_thirdPartyChild.video.webm`;
+// Reusing existing ogv file for testing.
+const VIDEO_PATH = `${URI_PATH}file_thirdPartyChild.video.ogv`;
 // Reusing existing png file for testing.
 const IMAGE_PATH = `${URI_PATH}file_favicon.png`;
 const FRAME_PATH = `${SECOND_ORIGIN}${URI_PATH}file_saveAs.sjs?image=1`;
diff --git a/browser/components/originattributes/test/browser/file_thirdPartyChild.video.ogv b/browser/components/originattributes/test/browser/file_thirdPartyChild.video.ogv
new file mode 100644
index 000000000000..68dee3cf2b1d
Binary files /dev/null and b/browser/components/originattributes/test/browser/file_thirdPartyChild.video.ogv differ
diff --git a/browser/components/originattributes/test/browser/file_thirdPartyChild.video.webm b/browser/components/originattributes/test/browser/file_thirdPartyChild.video.webm
deleted file mode 100644
index 5ad699fc1ab0..000000000000
Binary files a/browser/components/originattributes/test/browser/file_thirdPartyChild.video.webm and /dev/null differ
diff --git a/dom/canvas/test/crossorigin/mochitest.toml b/dom/canvas/test/crossorigin/mochitest.toml
index 0b62b02eabcd..e45b2624cd7c 100644
--- a/dom/canvas/test/crossorigin/mochitest.toml
+++ b/dom/canvas/test/crossorigin/mochitest.toml
@@ -7,10 +7,6 @@ support-files = [
   "image.png",
   "video.sjs",
 ]
-# The video used in those tests crash the Android emulator's VP9 decoder.
-prefs = [
-  "media.android-media-codec.enabled=false",
-]
 
 ["test_canvas2d_crossorigin.html"]
 skip-if = [
diff --git a/dom/canvas/test/mochitest.toml b/dom/canvas/test/mochitest.toml
index 6ab48c09c636..3e96fff26bc2 100644
--- a/dom/canvas/test/mochitest.toml
+++ b/dom/canvas/test/mochitest.toml
@@ -36,11 +36,7 @@ support-files = [
   "offscreencanvas_serviceworker_inner.html",
   "crossorigin/image.png",
   "crossorigin/video.sjs",
-  "../../media/test/320x240.webm",
-]
-# The video used in those tests crash the Android emulator's VP9 decoder.
-prefs = [
-  "media.android-media-codec.enabled=false",
+  "../../media/test/320x240.ogv",
 ]
 
 ["test_2d.clearRect.image.offscreen.html"]
diff --git a/dom/canvas/test/test_imagebitmap.html b/dom/canvas/test/test_imagebitmap.html
index 3c7958242b10..7a68db08df07 100644
--- a/dom/canvas/test/test_imagebitmap.html
+++ b/dom/canvas/test/test_imagebitmap.html
@@ -6,7 +6,7 @@
 <body>
 
 <img src="image_anim-gr.gif" id="image" class="resource">
-<video width="320" height="240" src="http://example.com/tests/dom/canvas/test/crossorigin/video.sjs?name=tests/dom/canvas/test/320x240.webm&type=video/webm&cors=anonymous" id="video" crossOrigin="anonymous" autoplay></video>
+<video width="320" height="240" src="http://example.com/tests/dom/canvas/test/crossorigin/video.sjs?name=tests/dom/canvas/test/320x240.ogv&type=video/ogg&cors=anonymous" id="video" crossOrigin="anonymous" autoplay></video>
 
 <canvas id="c1" class="output" width="128" height="128"></canvas>
 <canvas id="c2" width="128" height="128"></canvas>
@@ -226,7 +226,7 @@ function testSecurityErrors() {
         reject();
       }
 
-      uncleanVideo.src = "http://example.com/tests/dom/canvas/test/crossorigin/video.sjs?name=tests/dom/canvas/test/320x240.webm&type=video/webm";
+      uncleanVideo.src = "http://example.com/tests/dom/canvas/test/crossorigin/video.sjs?name=tests/dom/canvas/test/320x240.ogv&type=video/ogg";
       uncleanVideo.play();
     });
   }
diff --git a/dom/canvas/test/test_imagebitmap_cropping.html b/dom/canvas/test/test_imagebitmap_cropping.html
index bb0f06f42387..56ccbf62e2cc 100644
--- a/dom/canvas/test/test_imagebitmap_cropping.html
+++ b/dom/canvas/test/test_imagebitmap_cropping.html
@@ -33,7 +33,7 @@ function isPixel(ctx, x, y, c, d) {
 }
 
 //
-//  The pattern of the 320x240.webm video.
+//  The pattern of the 320x240.ogv video.
 //  .------------------------------------------------.
 //  | 255  | 255  | 0    | 0    | 255  | 255  | 0    |
 //  | 255  | 255  | 255  | 255  | 0    | 0    | 0    |
@@ -135,7 +135,7 @@ var gJPEGBlob;
 
 function prepareSources() {
   gVideo = document.createElement("video");
-  gVideo.src = "http://example.com/tests/dom/canvas/test/crossorigin/video.sjs?name=tests/dom/canvas/test/320x240.webm&type=video/webm&cors=anonymous";
+  gVideo.src = "http://example.com/tests/dom/canvas/test/crossorigin/video.sjs?name=tests/dom/canvas/test/320x240.ogv&type=video/ogg&cors=anonymous";
   gVideo.crossOrigin = "anonymous";
   gVideo.autoplay = "true"
 
diff --git a/dom/canvas/test/webgl-mochitest/mochitest.toml b/dom/canvas/test/webgl-mochitest/mochitest.toml
index 88b9b8ae91d1..88e2fab88b7c 100644
--- a/dom/canvas/test/webgl-mochitest/mochitest.toml
+++ b/dom/canvas/test/webgl-mochitest/mochitest.toml
@@ -8,6 +8,7 @@ support-files = [
   "webgl-util.js",
   "test_video_fastpath.js",
   "red-green.mp4",
+  "red-green.theora.ogv",
   "red-green.webmvp8.webm",
   "red-green.webmvp9.webm",
 ]
@@ -198,12 +199,20 @@ support-files = ["blank_15000x10000.png"]
 ["test_video_fastpath_mp4.html"]
 skip-if = ["win11_2009 && bits == 32"] # No fast video path for h264 decoder (done in RDD, can't be read in content)
 
+["test_video_fastpath_theora.html"]
+skip-if = [
+  "os == 'linux' && os_version == '18.04'",
+  "apple_catalina",
+  "apple_silicon",
+  "win11_2009 && bits == 32", # No fast video path for theora decoder (done in RDD, can't be read in content)
+]
+
 ["test_video_fastpath_vp8.html"]
 skip-if = [
   "os == 'linux' && os_version == '18.04'",
   "apple_catalina",
   "apple_silicon",
-  "win11_2009 && bits == 32", # No fast video path for vp8 decoder (done in RDD, can't be read in content)
+  "win11_2009 && bits == 32", # No fast video path for theora decoder (done in RDD, can't be read in content)
 ]
 
 ["test_video_fastpath_vp9.html"]
@@ -211,7 +220,7 @@ skip-if = [
   "os == 'linux' && os_version == '18.04'",
   "apple_catalina",
   "apple_silicon",
-  "win11_2009 && bits == 32", # No fast video path for vp9 decoder (done in RDD, can't be read in content)
+  "win11_2009 && bits == 32", # No fast video path for theora decoder (done in RDD, can't be read in content)
 ]
 
 ["test_webgl2_alpha_luminance.html"]
diff --git a/dom/canvas/test/webgl-mochitest/red-green.theora.ogv b/dom/canvas/test/webgl-mochitest/red-green.theora.ogv
new file mode 100644
index 000000000000..1543915a1080
Binary files /dev/null and b/dom/canvas/test/webgl-mochitest/red-green.theora.ogv differ
diff --git a/dom/canvas/test/webgl-mochitest/test_video_fastpath_theora.html b/dom/canvas/test/webgl-mochitest/test_video_fastpath_theora.html
new file mode 100644
index 000000000000..4f4fbab88b55
--- /dev/null
+++ b/dom/canvas/test/webgl-mochitest/test_video_fastpath_theora.html
@@ -0,0 +1,21 @@
+<html>
+    <head>
+        <meta name="timeout" content="long"/>
+        <meta http-equiv="Content-type" content="text/html;charset=UTF-8"/>
+        <title>Video Fastpath upload test</title>
+        <script src="/tests/SimpleTest/SimpleTest.js"></script>
+        <script src="test_video_fastpath.js"></script>
+        <link rel="stylesheet" href="/tests/SimpleTest/test.css">
+    </head>
+    <body>
+        <script>
+
+            function runTest() {
+                startTest("red-green.theora.ogv");
+            }
+
+            SimpleTest.waitForExplicitFinish();
+            SpecialPowers.pushPrefEnv({"set" : [["webgl.enable-privileged-extensions", true]]}, runTest);
+        </script>
+    </body>
+</html>
diff --git a/dom/html/test/test_document-element-inserted.html b/dom/html/test/test_document-element-inserted.html
index 59228b393e04..6d7e8695cebd 100644
--- a/dom/html/test/test_document-element-inserted.html
+++ b/dom/html/test/test_document-element-inserted.html
@@ -28,7 +28,7 @@ var observe = function(doc){
 
 var media = document.getElementById('media');
 var tests = [
-    "../../../media/test/vp9.webm",
+    "../../../media/test/short-video.ogv",
     "../../../media/test/sound.ogg",
     "../../content/test/image.png"
 ]
diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index 7c84690832c2..aecfe90a2a0c 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -2331,16 +2331,16 @@ class MediaDecoderStateMachine::NextFrameSeekingState
     }
 
     // Otherwise, we need to do the seek operation asynchronously for a special
-    // case (video with no data)which has no data at all, the 1st
-    // seekToNextFrame() operation reaches the end of the media. If we did the
-    // seek operation synchronously, we immediately resolve the SeekPromise in
-    // mSeekJob and then switch to the CompletedState which dispatches an
-    // "ended" event. However, the ThenValue of the SeekPromise has not yet been
-    // set, so the promise resolving is postponed and then the JS developer
-    // receives the "ended" event before the seek promise is resolved. An
-    // asynchronous seek operation helps to solve this issue since while the
-    // seek is actually performed, the ThenValue of SeekPromise has already been
-    // set so that it won't be postponed.
+    // case (bug504613.ogv) which has no data at all, the 1st seekToNextFrame()
+    // operation reaches the end of the media. If we did the seek operation
+    // synchronously, we immediately resolve the SeekPromise in mSeekJob and
+    // then switch to the CompletedState which dispatches an "ended" event.
+    // However, the ThenValue of the SeekPromise has not yet been set, so the
+    // promise resolving is postponed and then the JS developer receives the
+    // "ended" event before the seek promise is resolved.
+    // An asynchronous seek operation helps to solve this issue since while the
+    // seek is actually performed, the ThenValue of SeekPromise has already
+    // been set so that it won't be postponed.
     RefPtr<Runnable> r = mAsyncSeekTask = new AysncNextFrameSeekTask(this);
     nsresult rv = OwnerThread()->Dispatch(r.forget());
     MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
diff --git a/dom/media/autoplay/test/mochitest/mochitest.toml b/dom/media/autoplay/test/mochitest/mochitest.toml
index 76cb353ffec8..0b6f0a169f14 100644
--- a/dom/media/autoplay/test/mochitest/mochitest.toml
+++ b/dom/media/autoplay/test/mochitest/mochitest.toml
@@ -3,6 +3,7 @@ subsuite = "media"
 tags = "autoplay"
 support-files = [
   "../../../test/manifest.js",
+  "../../../test/320x240.ogv",
   "../../../test/bogus.duh",
   "../../../test/detodos-short.opus",
   "../../../test/flac-s24.flac",
@@ -22,7 +23,6 @@ support-files = [
   "../../../test/small-shot-mp3.mp4",
   "../../../test/small-shot.ogg",
   "../../../test/vp9-short.webm",
-  "../../../test/vp9.webm",
   "AutoplayTestUtils.js",
   "file_autoplay_gv_play_request_frame.html",
   "file_autoplay_gv_play_request_window.html",
diff --git a/dom/media/autoplay/test/mochitest/test_autoplay_policy_play_before_loadedmetadata.html b/dom/media/autoplay/test/mochitest/test_autoplay_policy_play_before_loadedmetadata.html
index d76aa9634852..b5f70be22742 100644
--- a/dom/media/autoplay/test/mochitest/test_autoplay_policy_play_before_loadedmetadata.html
+++ b/dom/media/autoplay/test/mochitest/test_autoplay_policy_play_before_loadedmetadata.html
@@ -28,12 +28,12 @@
 
         let testCases = [
           {
-            resource: "vp9.webm", // Only video track.
+            resource: "320x240.ogv", // Only video track.
             shouldPlay: false,
             muted: false,
           },
           {
-            resource: "vp9.webm", // Only video track.
+            resource: "320x240.ogv", // Only video track.
             shouldPlay: true,
             muted: true,
           },
diff --git a/dom/media/mediacontrol/tests/browser/browser.toml b/dom/media/mediacontrol/tests/browser/browser.toml
index faeebc0e9451..8b52f2aed4db 100644
--- a/dom/media/mediacontrol/tests/browser/browser.toml
+++ b/dom/media/mediacontrol/tests/browser/browser.toml
@@ -16,6 +16,7 @@ support-files = [
   "file_non_eligible_media.html",
   "file_non_looping_media.html",
   "head.js",
+  "../../../test/bogus.ogv",
   "../../../test/gizmo.mp4",
   "../../../test/gizmo-noaudio.webm",
   "../../../test/gizmo-short.mp4",
diff --git a/dom/media/mediacontrol/tests/browser/file_error_media.html b/dom/media/mediacontrol/tests/browser/file_error_media.html
index dfcdeab65f2a..7f54340dd1fb 100644
--- a/dom/media/mediacontrol/tests/browser/file_error_media.html
+++ b/dom/media/mediacontrol/tests/browser/file_error_media.html
@@ -4,6 +4,6 @@
 <title>Error media</title>
 </head>
 <body>
-<video id="video" src="bogus.webm"></video>
+<video id="video" src="bogus.ogv"></video>
 </body>
 </html>
diff --git a/dom/media/ogg/OggDecoder.cpp b/dom/media/ogg/OggDecoder.cpp
index 1bacafcf3e76..5f6d61f694c2 100644
--- a/dom/media/ogg/OggDecoder.cpp
+++ b/dom/media/ogg/OggDecoder.cpp
@@ -24,10 +24,7 @@ bool OggDecoder::IsSupportedType(const MediaContainerType& aContainerType) {
     return false;
   }
 
-  const bool isOggVideo = (aContainerType.Type() == MEDIAMIMETYPE(VIDEO_OGG));
-  if (isOggVideo && !StaticPrefs::media_theora_enabled()) {
-    return false;
-  }
+  const bool isOggVideo = (aContainerType.Type() != MEDIAMIMETYPE(AUDIO_OGG));
 
   const MediaCodecs& codecs = aContainerType.ExtendedType().Codecs();
   if (codecs.IsEmpty()) {
@@ -43,9 +40,8 @@ bool OggDecoder::IsSupportedType(const MediaContainerType& aContainerType) {
     }
     // Note: Only accept Theora in a video container type, not in an audio
     // container type.
-    if (aContainerType.Type() != MEDIAMIMETYPE(AUDIO_OGG) &&
-        codec.EqualsLiteral("theora")) {
-      return StaticPrefs::media_theora_enabled();
+    if (isOggVideo && codec.EqualsLiteral("theora")) {
+      continue;
     }
     // Some unsupported codec.
     return false;
diff --git a/dom/media/platforms/agnostic/AgnosticDecoderModule.cpp b/dom/media/platforms/agnostic/AgnosticDecoderModule.cpp
index 753dee02381f..7bdc30b43248 100644
--- a/dom/media/platforms/agnostic/AgnosticDecoderModule.cpp
+++ b/dom/media/platforms/agnostic/AgnosticDecoderModule.cpp
@@ -36,9 +36,8 @@ static bool IsAvailableInDefault(DecoderType type) {
     case DecoderType::AV1:
       return StaticPrefs::media_av1_enabled();
 #endif
-    case DecoderType::Theora:
-      return StaticPrefs::media_theora_enabled();
     case DecoderType::Opus:
+    case DecoderType::Theora:
     case DecoderType::Vorbis:
     case DecoderType::VPX:
     case DecoderType::Wave:
@@ -57,8 +56,7 @@ static bool IsAvailableInRdd(DecoderType type) {
     case DecoderType::Opus:
       return StaticPrefs::media_rdd_opus_enabled();
     case DecoderType::Theora:
-      return StaticPrefs::media_rdd_theora_enabled() &&
-             StaticPrefs::media_theora_enabled();
+      return StaticPrefs::media_rdd_theora_enabled();
     case DecoderType::Vorbis:
 #if defined(__MINGW32__)
       // If this is a MinGW build we need to force AgnosticDecoderModule to
@@ -131,8 +129,7 @@ media::DecodeSupportSet AgnosticDecoderModule::Supports(
       (AOMDecoder::IsAV1(mimeType) && IsAvailable(DecoderType::AV1)) ||
 #endif
       (VPXDecoder::IsVPX(mimeType) && IsAvailable(DecoderType::VPX)) ||
-      (TheoraDecoder::IsTheora(mimeType) && IsAvailable(DecoderType::Theora) &&
-       StaticPrefs::media_theora_enabled());
+      (TheoraDecoder::IsTheora(mimeType) && IsAvailable(DecoderType::Theora));
   MOZ_LOG(sPDMLog, LogLevel::Debug,
           ("Agnostic decoder %s requested type '%s'",
            supports ? "supports" : "rejects", mimeType.BeginReading()));
@@ -167,8 +164,7 @@ already_AddRefed<MediaDataDecoder> AgnosticDecoderModule::CreateVideoDecoder(
     }
   }
 #endif
-  else if (TheoraDecoder::IsTheora(aParams.mConfig.mMimeType) &&
-           StaticPrefs::media_theora_enabled()) {
+  else if (TheoraDecoder::IsTheora(aParams.mConfig.mMimeType)) {
     m = new TheoraDecoder(aParams);
   }
 
diff --git a/dom/media/test/320x240.ogv b/dom/media/test/320x240.ogv
new file mode 100644
index 000000000000..093158432ac6
Binary files /dev/null and b/dom/media/test/320x240.ogv differ
diff --git a/dom/media/test/320x240.webm^headers^ b/dom/media/test/320x240.ogv^headers^
similarity index 100%
rename from dom/media/test/320x240.webm^headers^
rename to dom/media/test/320x240.ogv^headers^
diff --git a/dom/media/test/320x240.webm b/dom/media/test/320x240.webm
deleted file mode 100644
index 16ecdbf688bd..000000000000
Binary files a/dom/media/test/320x240.webm and /dev/null differ
diff --git a/dom/media/test/448636.ogv b/dom/media/test/448636.ogv
new file mode 100644
index 000000000000..628df924f83e
Binary files /dev/null and b/dom/media/test/448636.ogv differ
diff --git a/dom/media/test/bogus.ogv b/dom/media/test/bogus.ogv
new file mode 100644
index 000000000000..528ae275d0f4
--- /dev/null
+++ b/dom/media/test/bogus.ogv
@@ -0,0 +1,45 @@
+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/bug482461-theora.ogv b/dom/media/test/bug482461-theora.ogv
new file mode 100644
index 000000000000..941b8d8efd30
Binary files /dev/null and b/dom/media/test/bug482461-theora.ogv differ
diff --git a/dom/media/test/bug482461.ogv b/dom/media/test/bug482461.ogv
new file mode 100644
index 000000000000..6cf6aed330f8
Binary files /dev/null and b/dom/media/test/bug482461.ogv differ
diff --git a/dom/media/test/bug495129.ogv b/dom/media/test/bug495129.ogv
new file mode 100644
index 000000000000..44eb9296f56a
Binary files /dev/null and b/dom/media/test/bug495129.ogv differ
diff --git a/dom/media/test/bug498380.ogv b/dom/media/test/bug498380.ogv
new file mode 100644
index 000000000000..1179ecb70aee
Binary files /dev/null and b/dom/media/test/bug498380.ogv differ
diff --git a/dom/media/test/bug498855-1.ogv b/dom/media/test/bug498855-1.ogv
new file mode 100644
index 000000000000..95a524da4ce7
Binary files /dev/null and b/dom/media/test/bug498855-1.ogv differ
diff --git a/dom/media/test/bug498855-2.ogv b/dom/media/test/bug498855-2.ogv
new file mode 100644
index 000000000000..795a308ae1f9
Binary files /dev/null and b/dom/media/test/bug498855-2.ogv differ
diff --git a/dom/media/test/bug498855-3.ogv b/dom/media/test/bug498855-3.ogv
new file mode 100644
index 000000000000..714858dfeddf
Binary files /dev/null and b/dom/media/test/bug498855-3.ogv differ
diff --git a/dom/media/test/bug499519.ogv b/dom/media/test/bug499519.ogv
new file mode 100644
index 000000000000..62c0922d3684
Binary files /dev/null and b/dom/media/test/bug499519.ogv differ
diff --git a/dom/media/test/bug500311.ogv b/dom/media/test/bug500311.ogv
new file mode 100644
index 000000000000..2cf27ef1ee05
Binary files /dev/null and b/dom/media/test/bug500311.ogv differ
diff --git a/dom/media/test/bug504613.ogv b/dom/media/test/bug504613.ogv
new file mode 100644
index 000000000000..5c7fd015e9ed
Binary files /dev/null and b/dom/media/test/bug504613.ogv differ
diff --git a/dom/media/test/bug504644.ogv b/dom/media/test/bug504644.ogv
new file mode 100644
index 000000000000..46fb4a876bd4
Binary files /dev/null and b/dom/media/test/bug504644.ogv differ
diff --git a/dom/media/test/bug504843.ogv b/dom/media/test/bug504843.ogv
new file mode 100644
index 000000000000..94b475086536
Binary files /dev/null and b/dom/media/test/bug504843.ogv differ
diff --git a/dom/media/test/bug506094.ogv b/dom/media/test/bug506094.ogv
new file mode 100644
index 000000000000..142b7b9ad1a7
Binary files /dev/null and b/dom/media/test/bug506094.ogv differ
diff --git a/dom/media/test/bug516323.indexed.ogv b/dom/media/test/bug516323.indexed.ogv
new file mode 100644
index 000000000000..7bd76eeccc2e
Binary files /dev/null and b/dom/media/test/bug516323.indexed.ogv differ
diff --git a/dom/media/test/bug516323.ogv b/dom/media/test/bug516323.ogv
new file mode 100644
index 000000000000..8f2f38b983d6
Binary files /dev/null and b/dom/media/test/bug516323.ogv differ
diff --git a/dom/media/test/bug523816.ogv b/dom/media/test/bug523816.ogv
new file mode 100644
index 000000000000..ca9a31b6da00
Binary files /dev/null and b/dom/media/test/bug523816.ogv differ
diff --git a/dom/media/test/bug556821.ogv b/dom/media/test/bug556821.ogv
new file mode 100644
index 000000000000..8d76fee45e6f
Binary files /dev/null and b/dom/media/test/bug556821.ogv differ
diff --git a/dom/media/test/bug557094.ogv b/dom/media/test/bug557094.ogv
new file mode 100644
index 000000000000..b4fc0799a600
Binary files /dev/null and b/dom/media/test/bug557094.ogv differ
diff --git a/dom/media/test/can_play_type_ogg.js b/dom/media/test/can_play_type_ogg.js
index e2c974d601fe..6572ab7c0f9b 100644
--- a/dom/media/test/can_play_type_ogg.js
+++ b/dom/media/test/can_play_type_ogg.js
@@ -5,23 +5,18 @@ function check_ogg(v, enabled, finish) {
 
   function basic_test() {
     return new Promise(function (resolve) {
-      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", "");
-      }
+      // Ogg types
+      check("video/ogg", "maybe");
       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
new file mode 100644
index 000000000000..a6288ef6c9e4
Binary files /dev/null and b/dom/media/test/chained-video.ogv differ
diff --git a/dom/media/test/crashtests/576612-1.html b/dom/media/test/crashtests/576612-1.html
new file mode 100644
index 000000000000..04f993e78004
--- /dev/null
+++ b/dom/media/test/crashtests/576612-1.html
@@ -0,0 +1,15 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script>
+function boom()
+{
+
+  var v = document.getElementById("v");
+  v.src = "data:text/plain,_";
+  document.documentElement.appendChild(v);
+
+}
+</script>
+</head>
+<body onload="boom();"><video id="v" src="data:video/ogg;codecs=&quot;theora,vorbis&quot;,1"></video></body>
+</html>
diff --git a/dom/media/test/make-headers.sh b/dom/media/test/make-headers.sh
index d2ac0610e2d4..35d9bd90f8dc 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 *.webm *.mp3 *.opus *.mp4 *.m4s *.wav`)
+FILES=(`ls *.ogg *.ogv *.webm *.mp3 *.opus *.mp4 *.m4s *.wav`)
 
-rm -f *.ogg^headers^ *.webm^headers^ *.mp3^headers^ *.opus^headers^ *.mp4^headers^ *.m4s^headers^ *.wav^headers^
+rm -f *.ogg^headers^ *.ogv^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 686e5b07ed2a..c35730902132 100644
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -51,6 +51,14 @@ 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",
@@ -86,6 +94,7 @@ 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 },
 ];
 
@@ -96,6 +105,13 @@ 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",
@@ -129,6 +145,15 @@ 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" },
@@ -137,6 +162,7 @@ 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 },
@@ -161,14 +187,14 @@ if (
 // anything for testing clone-specific bugs.
 var cloneKey = Math.floor(Math.random() * 100000000);
 var gCloneTests = [
-  // vp9.webm is more like 4s, so if you load this twice you'll get an unexpected duration
+  // short-video is more like 1s, so if you load this twice you'll get an unexpected duration
   {
     name:
       "dynamic_resource.sjs?key=" +
       cloneKey +
-      "&res1=seek-short.webm&res2=vp9.webm",
-    type: "video/webm",
-    duration: 0.23,
+      "&res1=320x240.ogv&res2=short-video.ogv",
+    type: "video/ogg",
+    duration: 0.266,
   },
 ];
 
@@ -196,6 +222,23 @@ 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",
@@ -214,6 +257,10 @@ 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 = [
@@ -271,6 +318,36 @@ 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.
@@ -278,7 +355,45 @@ 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 },
 
@@ -287,8 +402,9 @@ var gPlayTests = [
 
   // Test playback/metadata work after a redirect
   {
-    name: "redirect.sjs?domain=mochi.test:8888&file=vp9.webm",
-    type: "video/webm",
+    name: "redirect.sjs?domain=mochi.test:8888&file=320x240.ogv",
+    type: "video/ogg",
+    duration: 0.266,
   },
 
   // Test playback of a webm file
@@ -443,6 +559,14 @@ 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.
   {
@@ -527,11 +651,37 @@ 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=vp9.webm",
-    type: "video/webm",
+    name: "redirect.sjs?domain=mochi.test:8888&file=320x240.ogv",
+    type: "video/ogg",
+    duration: 0.266,
   },
   // Test playback of a webm file
   { name: "seek-short.webm", type: "video/webm", duration: 0.23 },
@@ -548,6 +698,14 @@ 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.
@@ -585,20 +743,49 @@ 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",
@@ -609,6 +796,12 @@ 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",
@@ -671,6 +864,14 @@ 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),
@@ -679,6 +880,10 @@ 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),
@@ -691,6 +896,10 @@ 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",
@@ -716,6 +925,9 @@ 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" },
@@ -731,8 +943,11 @@ 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 },
@@ -743,6 +958,9 @@ 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 = [
@@ -753,6 +971,14 @@ 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
@@ -793,6 +1019,7 @@ 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" },
@@ -807,6 +1034,7 @@ 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" },
 ];
@@ -834,6 +1062,12 @@ 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 },
@@ -851,6 +1085,36 @@ 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: {
@@ -1944,6 +2208,7 @@ 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 99bd1c41c8e0..3c8a382766e1 100644
--- a/dom/media/test/mochitest.toml
+++ b/dom/media/test/mochitest.toml
@@ -31,7 +31,12 @@ prefs = [
 support-files = [
   "16bit_wave_extrametadata.wav",
   "16bit_wave_extrametadata.wav^headers^",
-  "320x240.webm",
+  "320x240.ogv",
+  "320x240.ogv^headers^",
+  "448636.ogv",
+  "448636.ogv^headers^",
+  "A4.ogv",
+  "A4.ogv^headers^",
   "VID_0001.ogg",
   "VID_0001.ogg^headers^",
   "allowed.sjs",
@@ -405,19 +410,63 @@ 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",
@@ -438,10 +487,14 @@ 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",
@@ -522,6 +575,8 @@ 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",
@@ -576,6 +631,14 @@ 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",
@@ -588,6 +651,7 @@ 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^",
@@ -614,6 +678,7 @@ 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 6eed2c3eb870..e1bc54226409 100644
--- a/dom/media/test/mochitest_background_video.toml
+++ b/dom/media/test/mochitest_background_video.toml
@@ -27,6 +27,12 @@ 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",
@@ -400,19 +406,63 @@ 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",
@@ -431,8 +481,14 @@ 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",
@@ -512,6 +568,8 @@ 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",
@@ -566,6 +624,14 @@ 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",
@@ -587,6 +653,8 @@ 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 9e5f785408d5..5c68d0e795ea 100644
--- a/dom/media/test/mochitest_bugs.toml
+++ b/dom/media/test/mochitest_bugs.toml
@@ -27,6 +27,12 @@ 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",
@@ -400,19 +406,63 @@ 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",
@@ -433,8 +483,14 @@ 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",
@@ -514,6 +570,8 @@ 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",
@@ -568,6 +626,14 @@ 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",
@@ -589,6 +655,8 @@ 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 11b0add24a42..86f76f1464d4 100644
--- a/dom/media/test/mochitest_compat.toml
+++ b/dom/media/test/mochitest_compat.toml
@@ -35,6 +35,12 @@ 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",
@@ -410,19 +416,63 @@ 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",
@@ -441,8 +491,14 @@ 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",
@@ -536,6 +592,8 @@ 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",
@@ -590,6 +648,14 @@ 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",
@@ -611,6 +677,8 @@ 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.toml b/dom/media/test/mochitest_eme.toml
index fb3c12fbc694..d7f39c3eb8f4 100644
--- a/dom/media/test/mochitest_eme.toml
+++ b/dom/media/test/mochitest_eme.toml
@@ -27,6 +27,12 @@ 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",
@@ -400,19 +406,63 @@ 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",
@@ -431,8 +481,14 @@ 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",
@@ -512,6 +568,8 @@ 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",
@@ -566,6 +624,14 @@ 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",
@@ -587,6 +653,8 @@ 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 cc093b3d2892..43a5b510fc0b 100644
--- a/dom/media/test/mochitest_eme_compat.toml
+++ b/dom/media/test/mochitest_eme_compat.toml
@@ -28,6 +28,12 @@ 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",
@@ -397,19 +403,63 @@ 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",
@@ -428,8 +478,14 @@ 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",
@@ -509,6 +565,8 @@ 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",
@@ -563,6 +621,14 @@ 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",
@@ -584,6 +650,8 @@ 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 017af2d9a999..a4893d9cf429 100644
--- a/dom/media/test/mochitest_media_recorder.toml
+++ b/dom/media/test/mochitest_media_recorder.toml
@@ -27,6 +27,12 @@ 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",
@@ -400,19 +406,63 @@ 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",
@@ -431,10 +481,14 @@ 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",
@@ -514,6 +568,8 @@ 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",
@@ -568,6 +624,14 @@ 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",
@@ -589,6 +653,8 @@ 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_seek.toml b/dom/media/test/mochitest_seek.toml
index 7d7e703ab3ed..d71aac775a18 100644
--- a/dom/media/test/mochitest_seek.toml
+++ b/dom/media/test/mochitest_seek.toml
@@ -27,6 +27,12 @@ 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",
@@ -400,19 +406,63 @@ 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",
@@ -431,8 +481,14 @@ 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",
@@ -512,6 +568,8 @@ 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",
@@ -566,6 +624,14 @@ 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",
@@ -587,6 +653,8 @@ 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 429e694a966f..0badfc52ab55 100644
--- a/dom/media/test/mochitest_stream.toml
+++ b/dom/media/test/mochitest_stream.toml
@@ -27,6 +27,12 @@ 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",
@@ -400,19 +406,63 @@ 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",
@@ -431,8 +481,14 @@ 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",
@@ -512,6 +568,8 @@ 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",
@@ -566,6 +624,14 @@ 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",
@@ -587,6 +653,8 @@ 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",
@@ -695,15 +763,11 @@ 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"]
 
@@ -724,7 +788,9 @@ 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
new file mode 100644
index 000000000000..193200868ed7
Binary files /dev/null and b/dom/media/test/multiple-bos.ogg differ
diff --git a/dom/media/test/sample-fisbone-skeleton4.ogv b/dom/media/test/sample-fisbone-skeleton4.ogv
new file mode 100644
index 000000000000..8afe0be7a48a
Binary files /dev/null and b/dom/media/test/sample-fisbone-skeleton4.ogv differ
diff --git a/dom/media/test/sample-fisbone-wrong-header.ogv b/dom/media/test/sample-fisbone-wrong-header.ogv
new file mode 100644
index 000000000000..46c3933da506
Binary files /dev/null and b/dom/media/test/sample-fisbone-wrong-header.ogv differ
diff --git a/dom/media/test/seek-short.ogv b/dom/media/test/seek-short.ogv
new file mode 100644
index 000000000000..a5ca6951d030
Binary files /dev/null and b/dom/media/test/seek-short.ogv differ
diff --git a/dom/media/test/seek.ogv b/dom/media/test/seek.ogv
new file mode 100644
index 000000000000..ac7ece3519ac
Binary files /dev/null and b/dom/media/test/seek.ogv differ
diff --git a/dom/media/test/seekLies.sjs b/dom/media/test/seekLies.sjs
index 3b2b19921ab7..4fc528a0a588 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/vp9.webm";
+  var paths = "tests/dom/media/test/seek.ogv";
   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/webm", false);
+  response.setHeader("Content-Type", "video/ogg", 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
new file mode 100644
index 000000000000..68dee3cf2b1d
Binary files /dev/null and b/dom/media/test/short-video.ogv differ
diff --git a/dom/media/test/test_bug1248229.html b/dom/media/test/test_bug1248229.html
index e0ca1c96b52a..316579562233 100644
--- a/dom/media/test/test_bug1248229.html
+++ b/dom/media/test/test_bug1248229.html
@@ -7,7 +7,7 @@
   <script type="text/javascript" src="manifest.js"></script>
 </head>
 <body onload="doTest()">
-<video id="v" src="vp9.webm"></video>
+<video id="v" src="black100x100-aspect3to2.ogv"></video>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
diff --git a/dom/media/test/test_closing_connections.html b/dom/media/test/test_closing_connections.html
index fc438d8531f9..c5eb56544731 100644
--- a/dom/media/test/test_closing_connections.html
+++ b/dom/media/test/test_closing_connections.html
@@ -32,7 +32,7 @@ window.onload = function() {
      we've got the first frame.
 */
 
-var resource = getPlayableVideo(gPlayTests);
+var resource = getPlayableVideo(gClosingConnectionsTest);
 
 SimpleTest.waitForExplicitFinish();
 function beginTest() {
diff --git a/dom/media/test/test_decoder_disable.html b/dom/media/test/test_decoder_disable.html
index d29b62a5fa52..dd0d2cc51b9e 100644
--- a/dom/media/test/test_decoder_disable.html
+++ b/dom/media/test/test_decoder_disable.html
@@ -66,10 +66,10 @@ function videoError(event, id) {
 </div>
 <script>
 function makeVideos() {
-  document.getElementById('content').innerHTML = '<video id="video1" preload="metadata"><source type="video/webm" src="vp9.webm?decoder_disabled=1" onerror="videoError(event, \'video1\');"/><source type="audio/wave" src="r11025_u8_c1.wav?decoder_disabled=1" id=\'s2\' onerror="videoError(event, \'video1\');"/></video><video id="video2" preload="metadata" src="vp9.webm?decoder_disabled=2" onerror="videoError(event, \'video2\');"></video><video id="video3" preload="metadata" src="r11025_u8_c1.wav?decoder_disabled=2" onerror="videoError(event, \'video3\');"></video>';
+  document.getElementById('content').innerHTML = '<video id="video1" preload="metadata"><source type="video/ogg" src="320x240.ogv?decoder_disabled=1" onerror="videoError(event, \'video1\');"/><source type="audio/wave" src="r11025_u8_c1.wav?decoder_disabled=1" id=\'s2\' onerror="videoError(event, \'video1\');"/></video><video id="video2" preload="metadata" src="320x240.ogv?decoder_disabled=2" onerror="videoError(event, \'video2\');"></video><video id="video3" preload="metadata" src="r11025_u8_c1.wav?decoder_disabled=2" onerror="videoError(event, \'video3\');"></video>';
 }
 
-SpecialPowers.pushPrefEnv({"set": [["media.webm.enabled", false], ["media.wave.enabled", false]]}, makeVideos);
+SpecialPowers.pushPrefEnv({"set": [["media.ogg.enabled", false], ["media.wave.enabled", false]]}, makeVideos);
 </script>
 
 </pre>
diff --git a/dom/media/test/test_error_in_video_document.html b/dom/media/test/test_error_in_video_document.html
index b48e7745d085..e376ea95e341 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 for " + document.body.getElementsByTagName("iframe")[0].src);
+  is(v.readyState, v.HAVE_NOTHING, "Ready state");
 
   isnot(v.error, null, "Error object");
   is(v.networkState, v.NETWORK_NO_SOURCE, "Network state");
@@ -40,16 +40,15 @@ function check() {
 }
 
 // Find an error test that we'd think we should be able to play (if it
-// 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";
+// wasn't already known to fail).
+var t = getPlayableVideo(gErrorTests);
 if (!t) {
   todo(false, "No types supported");
 } else {
   SimpleTest.waitForExplicitFinish();
 
   var f = document.createElement("iframe");
-  f.src = t;
+  f.src = t.name;
   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 d3351226cd0e..f3e6992e8c6a 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.webm is less than 32KB, we need to wait for the
+  // Since 320x240.ogv 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 72bde2dd9e11..33ecabfd58c1 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/webm";
+  var otherType = type.match(/^video\//) ? "audio/x-wav" : "video/ogg";
   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 5fefe251ae3a..b715a58dc8a3 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 = "vp9.webm?key=" + key + "&id=" + v.name;
+  v.src = "seek.ogv?key=" + key + "&id=" + v.name;
   v.preload = test.preload;
   v.suspendCount = 0;
   v.expectedSuspendCount = test.expectedSuspendCount;
diff --git a/dom/media/test/test_streams_element_capture.html b/dom/media/test/test_streams_element_capture.html
index 8695dbf63b94..098136dba7c6 100644
--- a/dom/media/test/test_streams_element_capture.html
+++ b/dom/media/test/test_streams_element_capture.html
@@ -109,11 +109,6 @@ 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 f180fd12fd94..0e30be18019a 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("vp9cake.webm");
+    await startTest("short-video.ogv");
   } 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 b03c41a30c06..dd52dba26cc1 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: "vp9.webm", title: "vp9.webm" },
-  { file: "vp9cake.webm", title: "vp9cake.webm" },
+  { file: "320x240.ogv", title: "320x240.ogv" },
+  { file: "bug461281.ogg", title: "bug461281.ogg" },
 ];
 
 var gTestNum = 0;
diff --git a/dom/media/test/test_video_stats_resistfingerprinting.html b/dom/media/test/test_video_stats_resistfingerprinting.html
index 90c8d2a3d329..2bc239b36730 100644
--- a/dom/media/test/test_video_stats_resistfingerprinting.html
+++ b/dom/media/test/test_video_stats_resistfingerprinting.html
@@ -35,6 +35,7 @@ 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 }
   ];
diff --git a/dom/media/webaudio/test/mochitest_audio.toml b/dom/media/webaudio/test/mochitest_audio.toml
index 1f037c0ec695..56e612b102aa 100644
--- a/dom/media/webaudio/test/mochitest_audio.toml
+++ b/dom/media/webaudio/test/mochitest_audio.toml
@@ -6,6 +6,7 @@ support-files = [
   "audio-mono-expected-2.wav",
   "audio-mono-expected.wav",
   "audio-quad.wav",
+  "audio.ogv",
   "audiovideo.mp4",
   "audioBufferSourceNodeDetached_worker.js",
   "corsServer.sjs",
diff --git a/dom/media/webaudio/test/test_mediaDecoding.html b/dom/media/webaudio/test/test_mediaDecoding.html
index c2105b53b994..e76a533e4acb 100644
--- a/dom/media/webaudio/test/test_mediaDecoding.html
+++ b/dom/media/webaudio/test/test_mediaDecoding.html
@@ -197,6 +197,18 @@
     { url: "invalid.txt", valid: false, sampleRate: 44100 },
     // A webm file with no audio
     { url: "noaudio.webm", valid: false, sampleRate: 48000 },
+    // A video ogg file with audio
+    {
+      url: "audio.ogv",
+      valid: true,
+      expectedUrl: "audio-expected.wav",
+      numberOfChannels: 2,
+      sampleRate: 44100,
+      frames: 47680,
+      duration: 1.0807,
+      fuzzTolerance: 106,
+      fuzzToleranceMobile: 3482
+    },
     {
       url: "nil-packet.ogg",
       expectedUrl: null,
diff --git a/dom/security/test/https-first/browser.toml b/dom/security/test/https-first/browser.toml
index 6c06595676eb..0c63b8317d38 100644
--- a/dom/security/test/https-first/browser.toml
+++ b/dom/security/test/https-first/browser.toml
@@ -7,7 +7,7 @@ support-files = ["file_beforeunload_permit_http.html"]
 support-files = [
   "file_mixed_content_auto_upgrade.html",
   "pass.png",
-  "test.webm",
+  "test.ogv",
   "test.wav",
 ]
 
diff --git a/dom/security/test/https-first/file_mixed_content_auto_upgrade.html b/dom/security/test/https-first/file_mixed_content_auto_upgrade.html
index 5a8bef6bb033..7dda8909a554 100644
--- a/dom/security/test/https-first/file_mixed_content_auto_upgrade.html
+++ b/dom/security/test/https-first/file_mixed_content_auto_upgrade.html
@@ -6,7 +6,7 @@
 <body>
    <!--upgradeable resources--->
   <img src="http://example.com/browser/dom/security/test/https-first/pass.png">
-  <video src="http://example.com/browser/dom/security/test/https-first/test.webm">
+  <video src="http://example.com/browser/dom/security/test/https-first/test.ogv">
   <audio src="http://example.com/browser/dom/security/test/https-first/test.wav">
 </body>
 </html>
diff --git a/dom/security/test/https-first/test.ogv b/dom/security/test/https-first/test.ogv
new file mode 100644
index 000000000000..0f83996e5dcf
Binary files /dev/null and b/dom/security/test/https-first/test.ogv differ
diff --git a/dom/security/test/https-first/test.webm b/dom/security/test/https-first/test.webm
deleted file mode 100644
index 221877e303a9..000000000000
Binary files a/dom/security/test/https-first/test.webm and /dev/null differ
diff --git a/dom/security/test/mixedcontentblocker/browser.toml b/dom/security/test/mixedcontentblocker/browser.toml
index 402e8b91b174..5b0b85cb0b04 100644
--- a/dom/security/test/mixedcontentblocker/browser.toml
+++ b/dom/security/test/mixedcontentblocker/browser.toml
@@ -15,7 +15,7 @@ support-files = [
 support-files = [
   "file_csp_block_all_mixedcontent_and_mixed_content_display_upgrade.html",
   "pass.png",
-  "test.webm",
+  "test.ogv",
   "test.wav",
 ]
 
diff --git a/dom/security/test/mixedcontentblocker/file_csp_block_all_mixedcontent_and_mixed_content_display_upgrade.html b/dom/security/test/mixedcontentblocker/file_csp_block_all_mixedcontent_and_mixed_content_display_upgrade.html
index 62e705227f51..80e97443ed62 100644
--- a/dom/security/test/mixedcontentblocker/file_csp_block_all_mixedcontent_and_mixed_content_display_upgrade.html
+++ b/dom/security/test/mixedcontentblocker/file_csp_block_all_mixedcontent_and_mixed_content_display_upgrade.html
@@ -8,7 +8,7 @@
 <body>
    <!--upgradeable resources--->
   <img id="some-img" src="http://test1.example.com/browser/dom/security/test/mixedcontentblocker/pass.png" width="100px">
-  <video id="some-video" src="http://test1.example.com/browser/dom/security/test/mixedcontentblocker/test.webm" width="100px">
+  <video id="some-video" src="http://test1.example.com/browser/dom/security/test/mixedcontentblocker/test.ogv" width="100px">
   <audio id="some-audio" src="http://test1.example.com/browser/dom/security/test/mixedcontentblocker/test.wav" width="100px">
 </body>
 </html>
diff --git a/dom/security/test/mixedcontentblocker/file_server.sjs b/dom/security/test/mixedcontentblocker/file_server.sjs
index 90034dad3f2f..4f86c282ee82 100644
--- a/dom/security/test/mixedcontentblocker/file_server.sjs
+++ b/dom/security/test/mixedcontentblocker/file_server.sjs
@@ -96,8 +96,8 @@ function handleRequest(request, response) {
       break;
 
     case "media":
-      response.setHeader("Content-Type", "video/webm", false);
-      response.write(loadContentFromFile("tests/dom/media/test/vp9.webm"));
+      response.setHeader("Content-Type", "video/ogg", false);
+      response.write(loadContentFromFile("tests/dom/media/test/320x240.ogv"));
       break;
 
     case "iframe":
diff --git a/dom/security/test/mixedcontentblocker/mochitest.toml b/dom/security/test/mixedcontentblocker/mochitest.toml
index cf1d4827a061..17d8cb4608f2 100644
--- a/dom/security/test/mixedcontentblocker/mochitest.toml
+++ b/dom/security/test/mixedcontentblocker/mochitest.toml
@@ -16,9 +16,7 @@ support-files = [
   "file_main_bug803225.html",
   "file_main_bug803225_websocket_wsh.py",
   "file_server.sjs",
-  "!/dom/media/test/vp9.webm",
-  "test.webm",
-  "test.wav",
+  "!/dom/media/test/320x240.ogv",
   "!/image/test/mochitest/blue.png",
   "file_redirect.html",
   "file_redirect_handler.sjs",
diff --git a/dom/security/test/mixedcontentblocker/test.ogv b/dom/security/test/mixedcontentblocker/test.ogv
new file mode 100644
index 000000000000..0f83996e5dcf
Binary files /dev/null and b/dom/security/test/mixedcontentblocker/test.ogv differ
diff --git a/dom/security/test/mixedcontentblocker/test.webm b/dom/security/test/mixedcontentblocker/test.webm
deleted file mode 100644
index 221877e303a9..000000000000
Binary files a/dom/security/test/mixedcontentblocker/test.webm and /dev/null differ
diff --git a/layout/generic/crashtests/481921.ogg b/layout/generic/crashtests/481921.ogg
new file mode 100644
index 000000000000..0c41c3cd6b0e
Binary files /dev/null and b/layout/generic/crashtests/481921.ogg differ
diff --git a/layout/reftests/moz.build b/layout/reftests/moz.build
index 261ea6db09cc..14b30d92a371 100644
--- a/layout/reftests/moz.build
+++ b/layout/reftests/moz.build
@@ -171,6 +171,8 @@ with Files("native-theme/**"):
     BUG_COMPONENT = ("Core", "Layout")
 with Files("object/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
+with Files("ogg-video/**"):
+    BUG_COMPONENT = ("Core", "Audio/Video")
 with Files("outline/**"):
     BUG_COMPONENT = ("Core", "Layout")
 with Files("pagination/**"):
diff --git a/layout/reftests/ogg-video/444-1-ref.html b/layout/reftests/ogg-video/444-1-ref.html
new file mode 100644
index 000000000000..08e4df28eefc
--- /dev/null
+++ b/layout/reftests/ogg-video/444-1-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<body>
+<video id="v1" style="position:absolute; left:0; top:0"></video>
+<!-- hide bottom of video -->
+<div style="position:absolute; top:120px; left:0; right:0; bottom:0; background:black"></div>
+<script>
+function doTest() {
+  // Set source now so that the loadeddata event can't fire before
+  // this function runs.
+  v1.src = "seek420.ogv";
+  v1.play();
+  v1.addEventListener("loadeddata", function() {
+    setTimeout(function() {
+      document.documentElement.removeAttribute('class');
+    }, 50);
+  });
+}
+document.addEventListener("MozReftestInvalidate", doTest);
+</script>
diff --git a/layout/reftests/ogg-video/444-1.html b/layout/reftests/ogg-video/444-1.html
new file mode 100644
index 000000000000..02e7b3ddb889
--- /dev/null
+++ b/layout/reftests/ogg-video/444-1.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<body>
+<video id="v1" style="position:absolute; left:0; top:0"></video>
+<!-- hide bottom of video -->
+<div style="position:absolute; top:120px; left:0; right:0; bottom:0; background:black"></div>
+<script>
+function doTest() {
+  // Set source now so that the loadeddata event can't fire before
+  // this function runs.
+  v1.src = "seek444.ogv";
+  v1.play();
+  v1.addEventListener("loadeddata", function() {
+    setTimeout(function() {
+      document.documentElement.removeAttribute('class');
+    }, 50);
+  });
+}
+document.addEventListener("MozReftestInvalidate", doTest);
+</script>
diff --git a/layout/reftests/ogg-video/aspect-ratio-1-ref.html b/layout/reftests/ogg-video/aspect-ratio-1-ref.html
new file mode 100644
index 000000000000..93391ed83cca
--- /dev/null
+++ b/layout/reftests/ogg-video/aspect-ratio-1-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<div style="width:140px; height:100px; position:relative; left:100px; top:100px; background:black;"></div>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/aspect-ratio-1a.xhtml b/layout/reftests/ogg-video/aspect-ratio-1a.xhtml
new file mode 100644
index 000000000000..c70d3248f59e
--- /dev/null
+++ b/layout/reftests/ogg-video/aspect-ratio-1a.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<video src="black140x100.ogv" style="width:340px; height:100px; position:relative; top:100px;"></video>
+</body>
+</html>
+</foreignObject>
+</svg>
diff --git a/layout/reftests/ogg-video/aspect-ratio-1b.xhtml b/layout/reftests/ogg-video/aspect-ratio-1b.xhtml
new file mode 100644
index 000000000000..b59352b516d7
--- /dev/null
+++ b/layout/reftests/ogg-video/aspect-ratio-1b.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<video src="black140x100.ogv" style="width:140px; height:300px; position:relative; left:100px;"></video>
+</body>
+</html>
+</foreignObject>
+</svg>  
diff --git a/layout/reftests/ogg-video/aspect-ratio-2-ref.html b/layout/reftests/ogg-video/aspect-ratio-2-ref.html
new file mode 100644
index 000000000000..4f78ab4d2f04
--- /dev/null
+++ b/layout/reftests/ogg-video/aspect-ratio-2-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<div style="width:280px; height:200px; position:relative; left:200px; top:200px; background:black;"></div>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/aspect-ratio-2a.xhtml b/layout/reftests/ogg-video/aspect-ratio-2a.xhtml
new file mode 100644
index 000000000000..f708ec90afbf
--- /dev/null
+++ b/layout/reftests/ogg-video/aspect-ratio-2a.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<video src="black140x100.ogv" style="width:680px; height:200px; position:relative; top:200px;"></video>
+</body>
+</html>
+</foreignObject>
+</svg>
diff --git a/layout/reftests/ogg-video/aspect-ratio-2b.xhtml b/layout/reftests/ogg-video/aspect-ratio-2b.xhtml
new file mode 100644
index 000000000000..e7469031a807
--- /dev/null
+++ b/layout/reftests/ogg-video/aspect-ratio-2b.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<video src="black140x100.ogv" style="width:280px; height:600px; position:relative; left:200px;"></video>
+</body>
+</html>
+</foreignObject>
+</svg>  
diff --git a/layout/reftests/ogg-video/aspect-ratio-3-ref.xhtml b/layout/reftests/ogg-video/aspect-ratio-3-ref.xhtml
new file mode 100644
index 000000000000..73662654f885
--- /dev/null
+++ b/layout/reftests/ogg-video/aspect-ratio-3-ref.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<video src="black140x100.ogv" style="width:280px; height:200px;"></video>
+</body>
+</html>
+</foreignObject>
+</svg>
diff --git a/layout/reftests/ogg-video/aspect-ratio-3a.xhtml b/layout/reftests/ogg-video/aspect-ratio-3a.xhtml
new file mode 100644
index 000000000000..3c253e8f811b
--- /dev/null
+++ b/layout/reftests/ogg-video/aspect-ratio-3a.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<video src="black140x100.ogv" width="280"></video>
+</body>
+</html>
+</foreignObject>
+</svg>  
diff --git a/layout/reftests/ogg-video/aspect-ratio-3b.xhtml b/layout/reftests/ogg-video/aspect-ratio-3b.xhtml
new file mode 100644
index 000000000000..cc6ec4c750d3
--- /dev/null
+++ b/layout/reftests/ogg-video/aspect-ratio-3b.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<video src="black140x100.ogv" height="200"></video>
+</body>
+</html>
+</foreignObject>
+</svg>
diff --git a/layout/reftests/ogg-video/basic-1-ref.html b/layout/reftests/ogg-video/basic-1-ref.html
new file mode 100644
index 000000000000..aca3dcb9ca79
--- /dev/null
+++ b/layout/reftests/ogg-video/basic-1-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<div style="width:140px; height:100px; background:black;"></div>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/basic-1.xhtml b/layout/reftests/ogg-video/basic-1.xhtml
new file mode 100644
index 000000000000..4899dc29f7ee
--- /dev/null
+++ b/layout/reftests/ogg-video/basic-1.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<video src="black140x100.ogv"></video>
+</body>
+</html>
+</foreignObject>
+</svg>
diff --git a/layout/reftests/ogg-video/black100x100-aspect3to2.ogv b/layout/reftests/ogg-video/black100x100-aspect3to2.ogv
new file mode 100644
index 000000000000..81fe51ffb3e7
Binary files /dev/null and b/layout/reftests/ogg-video/black100x100-aspect3to2.ogv differ
diff --git a/layout/reftests/ogg-video/black140x100.ogv b/layout/reftests/ogg-video/black140x100.ogv
new file mode 100644
index 000000000000..ab146ebe285f
Binary files /dev/null and b/layout/reftests/ogg-video/black140x100.ogv differ
diff --git a/layout/reftests/ogg-video/black29x19offset.ogv b/layout/reftests/ogg-video/black29x19offset.ogv
new file mode 100644
index 000000000000..b515ebd1f3e4
Binary files /dev/null and b/layout/reftests/ogg-video/black29x19offset.ogv differ
diff --git a/layout/reftests/ogg-video/blue140x100.png b/layout/reftests/ogg-video/blue140x100.png
new file mode 100644
index 000000000000..f4c3973fcc7b
Binary files /dev/null and b/layout/reftests/ogg-video/blue140x100.png differ
diff --git a/layout/reftests/ogg-video/blue250x200.png b/layout/reftests/ogg-video/blue250x200.png
new file mode 100644
index 000000000000..5eb0b52511b5
Binary files /dev/null and b/layout/reftests/ogg-video/blue250x200.png differ
diff --git a/layout/reftests/ogg-video/canvas-1a.xhtml b/layout/reftests/ogg-video/canvas-1a.xhtml
new file mode 100644
index 000000000000..9f115e785f96
--- /dev/null
+++ b/layout/reftests/ogg-video/canvas-1a.xhtml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1" class="reftest-wait">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body>
+<canvas id="canvas" width="200" height="200"></canvas>
+<script>
+var video = document.createElement("video");
+video.src = "black140x100.ogv";
+video.load();
+function draw() {
+  var canvas = document.getElementById("canvas");
+  var ctx = canvas.getContext("2d");
+  try {
+    ctx.drawImage(video, 0, 0, video.videoWidth, video.videoHeight);
+  } catch (e) {
+  }
+  document.documentElement.removeAttribute("class");
+}
+video.addEventListener("loadeddata", draw, false);
+</script>
+</body>
+</html>
+</foreignObject>
+</svg>  
diff --git a/layout/reftests/ogg-video/canvas-1b.xhtml b/layout/reftests/ogg-video/canvas-1b.xhtml
new file mode 100644
index 000000000000..4524593e9e82
--- /dev/null
+++ b/layout/reftests/ogg-video/canvas-1b.xhtml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body>
+<canvas id="canvas" width="200" height="200"></canvas>
+<script>
+function draw() {
+  var video = document.getElementById("video");
+  var canvas = document.getElementById("canvas");
+  var ctx = canvas.getContext("2d");
+  try {
+    ctx.drawImage(video, 0, 0, video.videoWidth, video.videoHeight);
+  } catch (e) {
+  }
+  document.documentElement.removeAttribute("class");
+}
+</script>
+<video id="video" src="black140x100.ogv" onloadeddata="draw()" style="opacity:0"></video>
+</body>
+</html>
+</foreignObject>
+</svg>  
diff --git a/layout/reftests/ogg-video/clipping-1-ref.html b/layout/reftests/ogg-video/clipping-1-ref.html
new file mode 100644
index 000000000000..67782811c5e4
--- /dev/null
+++ b/layout/reftests/ogg-video/clipping-1-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white">
+<div style="position:absolute; left:0; top:0; width:200px; height:600px;">
+  <video src="black140x100.ogv" style="width:400px; margin-left:-100px;"></video>
+</div>
+<div style="position:absolute; left:200px; top:0; background:white; width:200px; height:600px;"></div>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/clipping-1a.html b/layout/reftests/ogg-video/clipping-1a.html
new file mode 100644
index 000000000000..cfae72cedda0
--- /dev/null
+++ b/layout/reftests/ogg-video/clipping-1a.html
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white">
+<div style="overflow:hidden; position:absolute; left:0; top:0; width:200px; height:600px;">
+  <video src="black140x100.ogv" style="width:400px; margin-left:-100px;"></video>
+</div>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/empty-1-ref.html b/layout/reftests/ogg-video/empty-1-ref.html
new file mode 100644
index 000000000000..fcc7693202cc
--- /dev/null
+++ b/layout/reftests/ogg-video/empty-1-ref.html
@@ -0,0 +1,5 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/empty-1a.html b/layout/reftests/ogg-video/empty-1a.html
new file mode 100644
index 000000000000..fc1421a81051
--- /dev/null
+++ b/layout/reftests/ogg-video/empty-1a.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<video src="black140x100.ogv" style="width:0"></video>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/empty-1b.html b/layout/reftests/ogg-video/empty-1b.html
new file mode 100644
index 000000000000..9dd17dbbaad5
--- /dev/null
+++ b/layout/reftests/ogg-video/empty-1b.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<video src="black140x100.ogv" style="height:0"></video>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/encoded-aspect-ratio-1-ref.html b/layout/reftests/ogg-video/encoded-aspect-ratio-1-ref.html
new file mode 100644
index 000000000000..d9c0054eb508
--- /dev/null
+++ b/layout/reftests/ogg-video/encoded-aspect-ratio-1-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<div style="background-color: black; width: 150px; height: 100px; position: absolute; left: 10px; top: 10px;"></div>
+
+<!-- Left side vertical. -->
+<div style="position: absolute; left: 9px; top: 9px; width: 2px; height: 102px; z-index: 2; background: red;"></div>
+
+<!-- Right side vertical. -->
+<div style="position: absolute; left: 159px; top: 9px; width: 2px; height: 102px; z-index: 2; background: red;"></div>
+
+<!-- Top horizontal bar. -->
+<div style="position: absolute; left: 9px; top: 9px; width: 152px; height: 2px; z-index: 2; background: red;"></div>
+
+<!-- Bottom horizontal bar. -->
+<div style="position: absolute; left: 9px; top: 109px; width: 152px; height: 2px; z-index: 2; background: red;"></div>
+
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/encoded-aspect-ratio-1.html b/layout/reftests/ogg-video/encoded-aspect-ratio-1.html
new file mode 100644
index 000000000000..238fdbfe8dbb
--- /dev/null
+++ b/layout/reftests/ogg-video/encoded-aspect-ratio-1.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<!--
+     Test if video displays correctly with a 3:2 aspect ratio.
+     It should display at w=150 h=100.
+     On some Linux systems, the scaling to preserve the aspect ratio can sample
+     the pixels outside visible region. This results in a thin grey line down
+     some sides of the scaled picture. We add red bars over the edges to
+     overwrite such happenings, to make the test reliable.
+-->
+<video src="black100x100-aspect3to2.ogv"
+       style="position:absolute; left: 10px; top: 10px; z-index: 1;">
+</video>
+
+<!-- Left side vertical. -->
+<div style="position: absolute; left: 9px; top: 9px; width: 2px; height: 102px; z-index: 2; background: red;"></div>
+
+<!-- Right side vertical. -->
+<div style="position: absolute; left: 159px; top: 9px; width: 2px; height: 102px; z-index: 2; background: red;"></div>
+
+<!-- Top horizontal bar. -->
+<div style="position: absolute; left: 9px; top: 9px; width: 152px; height: 2px; z-index: 2; background: red;"></div>
+
+<!-- Bottom horizontal bar. -->
+<div style="position: absolute; left: 9px; top: 109px; width: 152px; height: 2px; z-index: 2; background: red;"></div>
+
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/green70x30.png b/layout/reftests/ogg-video/green70x30.png
new file mode 100644
index 000000000000..b2bf32762d7d
Binary files /dev/null and b/layout/reftests/ogg-video/green70x30.png differ
diff --git a/layout/reftests/ogg-video/object-aspect-ratio-1a.xhtml b/layout/reftests/ogg-video/object-aspect-ratio-1a.xhtml
new file mode 100644
index 000000000000..29fd619fd720
--- /dev/null
+++ b/layout/reftests/ogg-video/object-aspect-ratio-1a.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<object data="black140x100.ogv" style="width:340px; height:100px; position:relative; top:100px;"></object>
+</body>
+</html>
+</foreignObject>
+</svg>
diff --git a/layout/reftests/ogg-video/object-aspect-ratio-1b.xhtml b/layout/reftests/ogg-video/object-aspect-ratio-1b.xhtml
new file mode 100644
index 000000000000..ea1f02ff7401
--- /dev/null
+++ b/layout/reftests/ogg-video/object-aspect-ratio-1b.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<object data="black140x100.ogv" style="width:140px; height:300px; position:relative; left:100px;"></object>
+</body>
+</html>
+</foreignObject>
+</svg>  
diff --git a/layout/reftests/ogg-video/object-aspect-ratio-2a.xhtml b/layout/reftests/ogg-video/object-aspect-ratio-2a.xhtml
new file mode 100644
index 000000000000..36b4cc0c1e98
--- /dev/null
+++ b/layout/reftests/ogg-video/object-aspect-ratio-2a.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<object data="black140x100.ogv" style="width:680px; height:200px; position:relative; top:200px;"></object>
+</body>
+</html>
+</foreignObject>
+</svg>
diff --git a/layout/reftests/ogg-video/object-aspect-ratio-2b.xhtml b/layout/reftests/ogg-video/object-aspect-ratio-2b.xhtml
new file mode 100644
index 000000000000..d557921d2fba
--- /dev/null
+++ b/layout/reftests/ogg-video/object-aspect-ratio-2b.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<object data="black140x100.ogv" style="width:280px; height:600px; position:relative; left:200px;"></object>
+</body>
+</html>
+</foreignObject>
+</svg>
diff --git a/layout/reftests/ogg-video/offset-1-ref.html b/layout/reftests/ogg-video/offset-1-ref.html
new file mode 100644
index 000000000000..61a1dc83a727
--- /dev/null
+++ b/layout/reftests/ogg-video/offset-1-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<div style="width:29px; height:29px; background:black;"></div>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/offset-1.xhtml b/layout/reftests/ogg-video/offset-1.xhtml
new file mode 100644
index 000000000000..3504734907dd
--- /dev/null
+++ b/layout/reftests/ogg-video/offset-1.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject filter="url(../filters.svg#ThresholdRGB)" x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white;">
+<video src="black29x19offset.ogv"></video>
+</body>
+</html>
+</foreignObject>
+</svg>
diff --git a/layout/reftests/ogg-video/poster-1.html b/layout/reftests/ogg-video/poster-1.html
new file mode 100644
index 000000000000..15e3cb546279
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-1.html
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<!-- Ensure video element displays at poster size when video's intrinsic size isn't available. -->
+<video preload="none" src="black140x100.ogv" poster="blue250x200.png"></video>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-10.html b/layout/reftests/ogg-video/poster-10.html
new file mode 100644
index 000000000000..546b96a46f4d
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-10.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<!-- Test: Create video, add poster, load. Should display poster. -->
+<script>
+function runTest() {
+  var v = document.createElement('video');
+  v.addEventListener('loadeddata', function(){setTimeout(function(){document.documentElement.className = '';}, 0);});
+  v.id = 'v';
+  v.src = "black140x100.ogv";
+  v.poster = "blue250x200.png";
+  v.preload = "auto";
+  document.body.appendChild(v);
+}
+
+</script>
+<body style="background:white;" onload="runTest();">
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-11.html b/layout/reftests/ogg-video/poster-11.html
new file mode 100644
index 000000000000..a2f186a4bb41
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-11.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<!-- Test: Create video, load. Add poster frame, load again, poster should show. -->
+<script>
+function runTest() {
+  var v = document.createElement('video');
+  
+  var endTest = function() {
+    setTimeout(function(){document.documentElement.className = '';}, 0);
+  };  
+  
+  var addPoster = function() {
+    v.removeEventListener('loadeddata', addPoster);
+    v.poster = "blue140x100.png";
+    v.addEventListener('loadeddata', endTest);
+    v.load();
+  };
+  
+  v.addEventListener('loadeddata', addPoster);
+  v.id = 'v';
+  v.src = "black140x100.ogv";
+  v.preload = "auto";
+  document.body.appendChild(v);
+}
+
+</script>
+<body style="background:white;" onload="runTest();">
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-12.html b/layout/reftests/ogg-video/poster-12.html
new file mode 100644
index 000000000000..49b6dbfebff7
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-12.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<!-- Test: Create video, load, play. Add poster frame, load again, poster should show. -->
+<script>
+function runTest() {
+  var v = document.createElement('video');
+  
+  var endTest = function() {
+    setTimeout(function(){document.documentElement.className = '';}, 0);
+  };
+  
+  var play = 
+    function() {
+      v.removeEventListener('loadeddata', play);
+      v.play();
+    }
+
+  var addPoster = function() {
+    v.removeEventListener('playing', addPoster);
+    v.poster = "blue140x100.png";
+    v.addEventListener('loadeddata', endTest);
+    v.load();
+  };
+
+  v.addEventListener('loadeddata',
+                     play);
+  v.addEventListener('playing',
+                     addPoster);
+  v.id = 'v';
+  v.src = "black140x100.ogv";
+  v.preload = "auto";
+  document.body.appendChild(v);
+}
+
+</script>
+<body style="background:white;" onload="runTest();">
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-13.html b/layout/reftests/ogg-video/poster-13.html
new file mode 100644
index 000000000000..79c3b8c58295
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-13.html
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<!-- Test that poster is resized, maintaining its aspect ratio. -->
+<video src="black140x100.ogv" poster="blue250x200.png" style="width: 288px; height: 216px;"></video>
+
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-15.html b/layout/reftests/ogg-video/poster-15.html
new file mode 100644
index 000000000000..01c25b660eaf
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-15.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+<html>
+<!-- Test that poster is correctly laid out inside borders. Also test that 
+     poster frames smaller than video don't have the video frame drawn behind
+     them etc. -->
+<body style="background:white;">
+<video src="black140x100.ogv"
+       poster="green70x30.png"
+       preload="none"
+       style="border: solid blue 2px;">
+</video>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-2.html b/layout/reftests/ogg-video/poster-2.html
new file mode 100644
index 000000000000..28b38f398ca7
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-2.html
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<!-- Test if poster frame with invalid poster displays video frame. -->
+<video src="black140x100.ogv" poster="not-a-valid-file"></video>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-3.html b/layout/reftests/ogg-video/poster-3.html
new file mode 100644
index 000000000000..ae12c1b65d2e
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-3.html
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<body style="background:white;">
+<!-- Test if poster hides after playing with autoplay. -->
+<video src="black140x100.ogv"
+       poster="blue250x200.png"
+       preload="auto"
+       autoplay
+       onplaying="setTimeout(function(){document.documentElement.className = '';},0);"></video>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-4.html b/layout/reftests/ogg-video/poster-4.html
new file mode 100644
index 000000000000..85453638c808
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-4.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<body style="background:white;"
+      onload="setTimeout(function(){document.documentElement.className = '';}, 0);">
+<!-- Test if we show video frame after removing valid poster. -->
+<video src="black140x100.ogv"
+       preload="auto"
+       id="v"
+       poster="blue250x200.png"></video>
+<script type="text/javascript">
+  document.getElementById('v').poster = '';
+</script>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-5.html b/layout/reftests/ogg-video/poster-5.html
new file mode 100644
index 000000000000..94049c92d7a6
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-5.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<body style="background:white;">
+<!-- Test to ensure that changing the poster after video has painted its first
+     frame doesn't render the poster. The video frame should not change to the
+     poster, since it's already painted its first video frame. -->
+<video src="black140x100.ogv"
+       preload="auto"
+       id="v"
+       autoplay
+       onended="document.getElementById('v').poster = 'blue250x200.png'; setTimeout(function(){document.documentElement.className = '';},0);"></video>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-6.html b/layout/reftests/ogg-video/poster-6.html
new file mode 100644
index 000000000000..c9ae5b88f55a
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-6.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<body style="background:white;">
+<!-- Test that poster frame should hide after completing a seek. -->
+<video src="black140x100.ogv"
+       preload="auto"
+       id="v"
+       onloadeddata="var v = document.getElementById('v'); v.currentTime = v.duration;"
+       onseeked="setTimeout(function(){document.documentElement.className = '';}, 0);"
+       poster="blue250x200.png"></video>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-7.html b/layout/reftests/ogg-video/poster-7.html
new file mode 100644
index 000000000000..4c3e002d37c9
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-7.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<body style="background:white;"
+      onload="setTimeout(function(){document.documentElement.className = '';}, 0);">
+<!-- Test that poster frame changes when you change the poster attribute. -->
+<video src="black140x100.ogv"
+       preload="none"
+       id="v"
+       poster="blue250x200.png"></video>
+<script type="text/javascript">
+  document.getElementById('v').poster = 'red140x100.png';
+</script>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-8.html b/layout/reftests/ogg-video/poster-8.html
new file mode 100644
index 000000000000..c9e1fa37a0d1
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-8.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<body style="background:white;">
+<!-- Test if poster hides after playing with play() call. -->
+<video src="black140x100.ogv"
+       poster="blue250x200.png"
+       id="v"
+       preload="auto"
+       onloadeddata="document.getElementById('v').play();"
+       onplaying="setTimeout(function(){document.documentElement.className = '';}, 0);"></video>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-ref-black140x100.html b/layout/reftests/ogg-video/poster-ref-black140x100.html
new file mode 100644
index 000000000000..98f1a4cba7fc
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-ref-black140x100.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<video src="black140x100.ogv" preload="auto"></video>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-ref-blue125x100.html b/layout/reftests/ogg-video/poster-ref-blue125x100.html
new file mode 100644
index 000000000000..90795ae911b0
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-ref-blue125x100.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<img src="blue140x100.png" alt="poster" style="position: absolute; height: 100px; width: 125px; left: 16px">
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-ref-blue140x100.html b/layout/reftests/ogg-video/poster-ref-blue140x100.html
new file mode 100644
index 000000000000..66540b8e854d
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-ref-blue140x100.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<img src="blue140x100.png" alt="poster">
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-ref-blue250x200.html b/layout/reftests/ogg-video/poster-ref-blue250x200.html
new file mode 100644
index 000000000000..050d53dfb3cf
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-ref-blue250x200.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<img src="blue250x200.png" alt="poster">
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-ref-blue400x300.html b/layout/reftests/ogg-video/poster-ref-blue400x300.html
new file mode 100644
index 000000000000..8c32ff715d10
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-ref-blue400x300.html
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<img src="blue250x200.png" style="position: relative; width: 270px; height: 216px; left: 9px;">
+</body>
+</html>
+
+
diff --git a/layout/reftests/ogg-video/poster-ref-green70x30.html b/layout/reftests/ogg-video/poster-ref-green70x30.html
new file mode 100644
index 000000000000..f979220a6a3a
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-ref-green70x30.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<img src="green70x30.png" alt="poster" style="border: solid blue 2px;">
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/poster-ref-red140x100.html b/layout/reftests/ogg-video/poster-ref-red140x100.html
new file mode 100644
index 000000000000..3ac08d29e2eb
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-ref-red140x100.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<img src="red140x100.png" alt="poster">
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/red140x100.png b/layout/reftests/ogg-video/red140x100.png
new file mode 100644
index 000000000000..20250771f3d3
Binary files /dev/null and b/layout/reftests/ogg-video/red140x100.png differ
diff --git a/layout/reftests/ogg-video/red160x120.png b/layout/reftests/ogg-video/red160x120.png
new file mode 100644
index 000000000000..21737a0e8eb8
Binary files /dev/null and b/layout/reftests/ogg-video/red160x120.png differ
diff --git a/layout/reftests/ogg-video/reftest.list b/layout/reftests/ogg-video/reftest.list
new file mode 100644
index 000000000000..2c9a96f8ee45
--- /dev/null
+++ b/layout/reftests/ogg-video/reftest.list
@@ -0,0 +1,35 @@
+# NOTE: bug 1084564 covers "fails"/"skip" annotations for android below:
+fuzzy(0-255,0-5000) == 444-1.html 444-1-ref.html
+fails-if(Android) == aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
+fails-if(Android) == aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
+fails-if(Android) skip-if(gtkWidget) == aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
+fails-if(Android) skip-if(gtkWidget) == aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
+== aspect-ratio-3a.xhtml aspect-ratio-3-ref.xhtml
+== aspect-ratio-3b.xhtml aspect-ratio-3-ref.xhtml
+fails-if(Android) random == encoded-aspect-ratio-1.html encoded-aspect-ratio-1-ref.html
+fails-if(Android) == basic-1.xhtml basic-1-ref.html
+== canvas-1a.xhtml basic-1-ref.html
+fails-if(Android) == canvas-1b.xhtml basic-1-ref.html
+== clipping-1a.html clipping-1-ref.html
+== empty-1a.html empty-1-ref.html
+== empty-1b.html empty-1-ref.html
+#these is skipped because we hang on the htmlparser tests when this is ran
+random == object-aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
+random == object-aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
+== offset-1.xhtml offset-1-ref.html
+random == object-aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
+random == object-aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
+fuzzy-if(winWidget,0-1,0-56000) fuzzy-if(cocoaWidget,0-1,0-56000) == zoomed-1.xhtml zoomed-1-ref.html # bug 778995 for fuzzy
+== poster-1.html poster-ref-blue250x200.html
+== poster-2.html poster-ref-black140x100.html
+== poster-3.html poster-ref-black140x100.html
+== poster-4.html poster-ref-black140x100.html
+== poster-5.html poster-ref-black140x100.html
+== poster-6.html poster-ref-black140x100.html
+== poster-7.html poster-ref-red140x100.html
+== poster-8.html poster-ref-black140x100.html
+random == poster-10.html poster-ref-blue125x100.html
+random == poster-11.html poster-ref-blue140x100.html
+random == poster-12.html poster-ref-blue140x100.html
+== poster-13.html poster-ref-blue400x300.html
+== poster-15.html poster-ref-green70x30.html
diff --git a/layout/reftests/ogg-video/seek420.ogv b/layout/reftests/ogg-video/seek420.ogv
new file mode 100644
index 000000000000..2221cfef42c7
Binary files /dev/null and b/layout/reftests/ogg-video/seek420.ogv differ
diff --git a/layout/reftests/ogg-video/seek444.ogv b/layout/reftests/ogg-video/seek444.ogv
new file mode 100644
index 000000000000..a2453afeae05
Binary files /dev/null and b/layout/reftests/ogg-video/seek444.ogv differ
diff --git a/layout/reftests/ogg-video/zoomed-1-ref.html b/layout/reftests/ogg-video/zoomed-1-ref.html
new file mode 100644
index 000000000000..01929db7e769
--- /dev/null
+++ b/layout/reftests/ogg-video/zoomed-1-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white; margin:0;">
+<div style="width:280px; height:200px; background:#010101;"></div>
+</body>
+</html>
diff --git a/layout/reftests/ogg-video/zoomed-1.xhtml b/layout/reftests/ogg-video/zoomed-1.xhtml
new file mode 100644
index 000000000000..e68e1290f419
--- /dev/null
+++ b/layout/reftests/ogg-video/zoomed-1.xhtml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     version="1.1" reftest-zoom="2"
+     width="50%" height="50%">
+<!-- use an empty g to force filters.svg to load before onload -->
+<use xlink:href="../filters.svg#empty" />
+<foreignObject x="0" y="0" height="100%" width="100%">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<body style="background:white; margin:0">
+<video src="black140x100.ogv"></video>
+</body>
+</html>
+</foreignObject>
+</svg>
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index 97f04542ff7f..9587c7079894 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -273,6 +273,9 @@ include outline/reftest.list
 # object/
 include object/reftest.list
 
+# ogg-video/
+skip include ogg-video/reftest.list
+
 # webm-video/
 skip include webm-video/reftest.list
 
diff --git a/mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html b/mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html
index 2b3300ba5cae..d9b34843fde6 100644
--- a/mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html
+++ b/mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html
@@ -5,7 +5,7 @@
     </head>
     <body>
         <video controls preload>
-            <source src="videos/fileDoesNotExist.webm"></source>
+            <source src="videos/fileDoesNotExist.ogg"></source>
         </video>
     </body>
 </html>
diff --git a/mobile/android/geckoview/src/androidTest/assets/www/ogg.html b/mobile/android/geckoview/src/androidTest/assets/www/ogg.html
new file mode 100644
index 000000000000..dd478d3b3ffa
--- /dev/null
+++ b/mobile/android/geckoview/src/androidTest/assets/www/ogg.html
@@ -0,0 +1,11 @@
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>OGG Video</title>
+    </head>
+    <body>
+        <video controls preload>
+            <source src="videos/video.ogg"></source>
+        </video>
+    </body>
+</html>
diff --git a/mobile/android/geckoview/src/androidTest/assets/www/videos/video.ogg b/mobile/android/geckoview/src/androidTest/assets/www/videos/video.ogg
new file mode 100644
index 000000000000..ac7ece3519ac
Binary files /dev/null and b/mobile/android/geckoview/src/androidTest/assets/www/videos/video.ogg differ
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt
index 9bcba0f5b778..d57cd8f157aa 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt
@@ -76,6 +76,7 @@ open class BaseSessionTest(
         const val TEST_GIF_PATH = "/assets/www/images/test.gif"
         const val TITLE_CHANGE_HTML_PATH = "/assets/www/titleChange.html"
         const val TRACKERS_PATH = "/assets/www/trackers.html"
+        const val VIDEO_OGG_PATH = "/assets/www/ogg.html"
         const val VIDEO_MP4_PATH = "/assets/www/mp4.html"
         const val VIDEO_WEBM_PATH = "/assets/www/webm.html"
         const val VIDEO_BAD_PATH = "/assets/www/badVideoPath.html"
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index 83b21c643a7a..6fa7f8b1a95e 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -11186,12 +11186,6 @@
     mirror: always
 #endif
 
-# Bug 1860492 - Deprecate and remove theora
--  name: media.theora.enabled
-   type: RelaxedAtomicBool
-   value: @IS_NOT_NIGHTLY_BUILD@
-   mirror: always
-
 #---------------------------------------------------------------------------
 # Prefs starting with "memory."
 #---------------------------------------------------------------------------
diff --git a/testing/docs/mochitest-plain/faq.md b/testing/docs/mochitest-plain/faq.md
index a852f135d8fa..47a8bbed18de 100644
--- a/testing/docs/mochitest-plain/faq.md
+++ b/testing/docs/mochitest-plain/faq.md
@@ -268,7 +268,7 @@ state available to SJS scripts running in Mochitest:
 function handleRequest(req, res) {
   var file;
   getObjectState("SERVER_ROOT", function(serverRoot) {
-    file = serverRoot.getFile("tests/content/media/test/320x240.webm");
+    file = serverRoot.getFile("tests/content/media/test/320x240.ogv");
   });
   // file is now an XPCOM object referring to the given file
   res.write("file: " + file);
diff --git a/testing/web-platform/meta/document-policy/experimental-features/unsized-media.tentative.https.sub.html.ini b/testing/web-platform/meta/document-policy/experimental-features/unsized-media.tentative.https.sub.html.ini
index 33eae65a1565..936598f1ebb5 100644
--- a/testing/web-platform/meta/document-policy/experimental-features/unsized-media.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/document-policy/experimental-features/unsized-media.tentative.https.sub.html.ini
@@ -26,7 +26,7 @@
   [Test video with attribute style=height:800px; and attribute undefined=undefined]
     expected:
       if (os == "mac") and not debug: [FAIL, TIMEOUT]
-      [FAIL, TIMEOUT]
+      FAIL
 
   [Test image with attribute undefined=undefined and attribute undefined=undefined on src /document-policy/experimental-features/resources/image.svg]
     expected: FAIL
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html.ini
index ba67c1ca90a3..ca8e7f411a1b 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html.ini
@@ -1,39 +1,16 @@
 [canPlayType.html]
   [video/3gpp (optional)]
-    expected: PRECONDITION_FAILED
+    expected: FAIL
 
   [video/3gpp; codecs="samr" (optional)]
-    expected: PRECONDITION_FAILED
+    expected: FAIL
 
   [video/3gpp; codecs="mp4v.20.8" (optional)]
-    expected: PRECONDITION_FAILED
+    expected: FAIL
 
   [video/mp4; codecs="mp4v.20.8" (optional)]
-    expected: PRECONDITION_FAILED
+    expected: FAIL
 
   [video/mp4; codecs="mp4v.20.240" (optional)]
-    expected: PRECONDITION_FAILED
+    expected: FAIL
 
-  [video/ogg (optional)]
-    expected: PRECONDITION_FAILED
-
-  [video/ogg; codecs="opus" (optional)]
-    expected: PRECONDITION_FAILED
-
-  [video/ogg; codecs="vorbis" (optional)]
-    expected: PRECONDITION_FAILED
-
-  [video/ogg; codecs="theora" (optional)]
-    expected: PRECONDITION_FAILED
-
-  [video/3gpp codecs subset]
-    expected: PRECONDITION_FAILED
-
-  [video/3gpp codecs order]
-    expected: PRECONDITION_FAILED
-
-  [video/ogg codecs subset]
-    expected: PRECONDITION_FAILED
-
-  [video/ogg codecs order]
-    expected: PRECONDITION_FAILED
diff --git a/testing/web-platform/meta/resource-timing/initiator-type/video.html.ini b/testing/web-platform/meta/resource-timing/initiator-type/video.html.ini
index dcb7b7194710..e1bc6eafb412 100644
--- a/testing/web-platform/meta/resource-timing/initiator-type/video.html.ini
+++ b/testing/web-platform/meta/resource-timing/initiator-type/video.html.ini
@@ -13,5 +13,5 @@
   [The initiator type for <track src> must be 'track']
     expected: FAIL
 
-  [The initiator type for <source src> with type="video/webm" must be 'video']
+  [The initiator type for <source src> with type="video/ogg" must be 'video']
     expected: FAIL
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/video/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/video/cts.https.html.ini
index 5ba4c8575cd3..3ed5e19fd32d 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/video/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/video/cts.https.html.ini
@@ -23,6 +23,30 @@
       if os == "linux" and not debug: FAIL
       if os == "mac": FAIL
 
+  [:videoName="four-colors-theora-bt601.ogv";sourceType="VideoElement";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "win": FAIL
+      if os == "linux" and not debug: FAIL
+      if os == "mac": FAIL
+
+  [:videoName="four-colors-theora-bt601.ogv";sourceType="VideoElement";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "win": FAIL
+      if os == "linux" and not debug: FAIL
+      if os == "mac": FAIL
+
+  [:videoName="four-colors-theora-bt601.ogv";sourceType="VideoFrame";srcDoFlipYDuringCopy=false]
+    expected:
+      if os == "win": FAIL
+      if os == "linux" and not debug: FAIL
+      if os == "mac": FAIL
+
+  [:videoName="four-colors-theora-bt601.ogv";sourceType="VideoFrame";srcDoFlipYDuringCopy=true]
+    expected:
+      if os == "win": FAIL
+      if os == "linux" and not debug: FAIL
+      if os == "mac": FAIL
+
   [:videoName="four-colors-vp8-bt601.webm";sourceType="VideoElement";srcDoFlipYDuringCopy=false]
     expected:
       if os == "win": FAIL
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/external_texture/video/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/external_texture/video/cts.https.html.ini
index 70716d915b4d..115683ba2e02 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/external_texture/video/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/external_texture/video/cts.https.html.ini
@@ -5,6 +5,12 @@
       if os == "linux" and not debug: FAIL
       if os == "mac": FAIL
 
+  [:sourceType="VideoElement";videoName="four-colors-theora-bt601.ogv"]
+    expected:
+      if os == "win": FAIL
+      if os == "linux" and not debug: FAIL
+      if os == "mac": FAIL
+
   [:sourceType="VideoElement";videoName="four-colors-vp8-bt601.webm"]
     expected:
       if os == "win": FAIL
@@ -29,6 +35,12 @@
       if os == "linux" and not debug: FAIL
       if os == "mac": FAIL
 
+  [:sourceType="VideoFrame";videoName="four-colors-theora-bt601.ogv"]
+    expected:
+      if os == "win": FAIL
+      if os == "linux" and not debug: FAIL
+      if os == "mac": FAIL
+
   [:sourceType="VideoFrame";videoName="four-colors-vp8-bt601.webm"]
     expected:
       if os == "win": FAIL
@@ -55,6 +67,12 @@
       if os == "linux" and not debug: FAIL
       if os == "mac": FAIL
 
+  [:sourceType="VideoElement";videoName="four-colors-theora-bt601.ogv"]
+    expected:
+      if os == "win": FAIL
+      if os == "linux" and not debug: FAIL
+      if os == "mac": FAIL
+
   [:sourceType="VideoElement";videoName="four-colors-vp8-bt601.webm"]
     expected:
       if os == "win": FAIL
@@ -79,6 +97,12 @@
       if os == "linux" and not debug: FAIL
       if os == "mac": FAIL
 
+  [:sourceType="VideoFrame";videoName="four-colors-theora-bt601.ogv"]
+    expected:
+      if os == "win": FAIL
+      if os == "linux" and not debug: FAIL
+      if os == "mac": FAIL
+
   [:sourceType="VideoFrame";videoName="four-colors-vp8-bt601.webm"]
     expected:
       if os == "win": FAIL
@@ -143,6 +167,12 @@
       if os == "linux" and not debug: FAIL
       if os == "mac": FAIL
 
+  [:videoName="four-colors-theora-bt601.ogv"]
+    expected:
+      if os == "win": FAIL
+      if os == "linux" and not debug: FAIL
+      if os == "mac": FAIL
+
   [:videoName="four-colors-vp8-bt601.webm"]
     expected:
       if os == "win": FAIL
diff --git a/testing/web-platform/mozilla/tests/media/2x2-green.ogv b/testing/web-platform/mozilla/tests/media/2x2-green.ogv
new file mode 100644
index 000000000000..29903c0a8173
Binary files /dev/null and b/testing/web-platform/mozilla/tests/media/2x2-green.ogv differ
diff --git a/testing/web-platform/mozilla/tests/media/2x2-green.webm b/testing/web-platform/mozilla/tests/media/2x2-green.webm
deleted file mode 100644
index 71ddce9099b4..000000000000
Binary files a/testing/web-platform/mozilla/tests/media/2x2-green.webm and /dev/null differ
diff --git a/testing/web-platform/mozilla/tests/service-workers/resources/fetch_video.py b/testing/web-platform/mozilla/tests/service-workers/resources/fetch_video.py
index 0d2967b73168..3945506f3037 100644
--- a/testing/web-platform/mozilla/tests/service-workers/resources/fetch_video.py
+++ b/testing/web-platform/mozilla/tests/service-workers/resources/fetch_video.py
@@ -2,11 +2,11 @@ import os
 
 
 def main(request, response):
-    filename = os.path.join(request.doc_root, "media", "2x2-green.webm")
+    filename = os.path.join(request.doc_root, "media", "2x2-green.ogv")
     body = open(filename, "rb").read()
     length = len(body)
     headers = [
-        (b"Content-Type", b"video/webm"),
+        (b"Content-Type", b"video/ogg"),
         (b"Accept-Ranges", b"bytes"),
         (b"Content-Length", b"%d" % length),
         (b"Content-Range", b"bytes 0-%d/%d" % (length - 1, length)),
diff --git a/testing/web-platform/mozilla/tests/webgpu/resources/README.md b/testing/web-platform/mozilla/tests/webgpu/resources/README.md
index 28f23f288b92..824f82b998f2 100644
--- a/testing/web-platform/mozilla/tests/webgpu/resources/README.md
+++ b/testing/web-platform/mozilla/tests/webgpu/resources/README.md
@@ -4,6 +4,7 @@ on the context (WPT, standalone, worker, etc.)
 
 The test video files were generated with the ffmpeg cmds below:
 ffmpeg.exe -loop 1 -i .\four-colors.png -c:v libvpx -pix_fmt yuv420p -frames 500 -colorspace smpte170m -color_primaries smpte170m -color_trc smpte170m -color_range tv four-colors-vp8-bt601.webm
+ffmpeg.exe -loop 1 -i .\four-colors.png -c:v libtheora -pix_fmt yuv420p -frames 500 -colorspace smpte170m -color_primaries smpte170m -color_trc smpte170m -color_range tv four-colors-theora-bt601.ogv
 ffmpeg.exe -loop 1 -i .\four-colors.png -c:v libx264 -pix_fmt yuv420p -frames 500 -colorspace smpte170m -color_primaries smpte170m -color_trc smpte170m -color_range tv four-colors-h264-bt601.mp4
 ffmpeg.exe -loop 1 -i .\four-colors.png -c:v libvpx-vp9 -pix_fmt yuv420p -frames 500 -colorspace smpte170m -color_primaries smpte170m -color_trc smpte170m -color_range tv four-colors-vp9-bt601.webm
 ffmpeg.exe -loop 1 -i .\four-colors.png -c:v libvpx-vp9 -pix_fmt yuv420p -frames 500 -colorspace bt709 -color_primaries bt709 -color_trc bt709 -color_range tv -vf scale=out_color_matrix=bt709:out_range=tv four-colors-vp9-bt709.webm
@@ -11,4 +12,4 @@ ffmpeg.exe -loop 1 -i .\four-colors.png -c:v libvpx-vp9 -pix_fmt yuv420p -frames
 These rotation test files are copies of four-colors-h264-bt601.mp4 with metadata changes.
 ffmpeg.exe -i .\four-colors-h264-bt601.mp4 -c copy -metadata:s:v rotate=90 four-colors-h264-bt601-rotate-90.mp4
 ffmpeg.exe -i .\four-colors-h264-bt601.mp4 -c copy -metadata:s:v rotate=180 four-colors-h264-bt601-rotate-180.mp4
-ffmpeg.exe -i .\four-colors-h264-bt601.mp4 -c copy -metadata:s:v rotate=270 four-colors-h264-bt601-rotate-270.mp4
+ffmpeg.exe -i .\four-colors-h264-bt601.mp4 -c copy -metadata:s:v rotate=270 four-colors-h264-bt601-rotate-270.mp4
\ No newline at end of file
diff --git a/testing/web-platform/mozilla/tests/webgpu/resources/four-colors-theora-bt601.ogv b/testing/web-platform/mozilla/tests/webgpu/resources/four-colors-theora-bt601.ogv
new file mode 100644
index 000000000000..79ed41163c3b
Binary files /dev/null and b/testing/web-platform/mozilla/tests/webgpu/resources/four-colors-theora-bt601.ogv differ
diff --git a/testing/web-platform/mozilla/tests/webgpu/webgpu/web_platform/util.js b/testing/web-platform/mozilla/tests/webgpu/webgpu/web_platform/util.js
index df4b02447f1a..f34723510c50 100644
--- a/testing/web-platform/mozilla/tests/webgpu/webgpu/web_platform/util.js
+++ b/testing/web-platform/mozilla/tests/webgpu/webgpu/web_platform/util.js
@@ -19,6 +19,7 @@ makeTable(
   [undefined], {
     // All video names
     'four-colors-vp8-bt601.webm': ['video/webm; codecs=vp8'],
+    'four-colors-theora-bt601.ogv': ['video/ogg; codecs=theora'],
     'four-colors-h264-bt601.mp4': ['video/mp4; codecs=avc1.4d400c'],
     'four-colors-vp9-bt601.webm': ['video/webm; codecs=vp9'],
     'four-colors-vp9-bt709.webm': ['video/webm; codecs=vp9'],
@@ -65,6 +66,13 @@ export const kVideoExpectations = [
   _blueExpectation: kBt601Blue,
   _yellowExpectation: kBt601Yellow
 },
+{
+  videoName: 'four-colors-theora-bt601.ogv',
+  _redExpectation: kBt601Red,
+  _greenExpectation: kBt601Green,
+  _blueExpectation: kBt601Blue,
+  _yellowExpectation: kBt601Yellow
+},
 {
   videoName: 'four-colors-h264-bt601.mp4',
   _redExpectation: kBt601Red,
@@ -296,4 +304,4 @@ timeoutMessage)
   });
   const promise = raceWithRejectOnTimeout(promiseWithoutTimeout, 2000, timeoutMessage);
   return { promise, callbackAndResolve: callbackAndResolve };
-}
+}
\ No newline at end of file
diff --git a/testing/web-platform/tests/audio-output/setSinkId-with-selectAudioOutput.https.html b/testing/web-platform/tests/audio-output/setSinkId-with-selectAudioOutput.https.html
index a78d91dd12f9..dbe32e260695 100644
--- a/testing/web-platform/tests/audio-output/setSinkId-with-selectAudioOutput.https.html
+++ b/testing/web-platform/tests/audio-output/setSinkId-with-selectAudioOutput.https.html
@@ -29,7 +29,7 @@ promise_test(async t => {
   assert_equals(r, undefined, "resetting sinkid on default audio output should always work");
 }, "setSinkId() after selectAudioOutput()");
 
-const src = "/media/movie_5.webm";
+const src = "/media/movie_5.ogv";
 
 promise_test(async t => {
   assert_not_equals(deviceId, undefined, "selectAudioOutput() resolved");
diff --git a/testing/web-platform/tests/common/media.js b/testing/web-platform/tests/common/media.js
index a5a8e957e9b5..800593f5343a 100644
--- a/testing/web-platform/tests/common/media.js
+++ b/testing/web-platform/tests/common/media.js
@@ -14,6 +14,9 @@ function getVideoURI(base)
       if (videotag.canPlayType('video/webm; codecs="vp9, opus"') )
       {
           extension = '.webm';
+      } else if ( videotag.canPlayType('video/ogg; codecs="theora, vorbis"') )
+      {
+          extension = '.ogv';
       }
     }
 
@@ -49,6 +52,7 @@ function getMediaContentType(url) {
     var extension = new URL(url, location).pathname.split(".").pop();
     var map = {
         "mp4" : "video/mp4",
+        "ogv" : "application/ogg",
         "webm": "video/webm",
         "mp3" : "audio/mp3",
         "oga" : "application/ogg",
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1.html
index 9cf142185a64..8fd094e95537 100644
--- a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1.html
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1.html
@@ -35,14 +35,14 @@
     <video id="videoObject" width="320" height="240" controls
            onloadeddata="media_loaded(source_test)">
         <source id="videoSourceObject"
-                type="video/webm"
+                type="video/ogg"
                 onerror="media_error_handler(source_test)"
-                src="/media/A4.webm">
+                src="/media/A4.ogv">
     </video>
     <video id="videoObject2" width="320" height="240" controls
            onerror="media_error_handler(src_test)"
            onloadeddata="media_loaded(src_test)"
-           src="/media/A4.webm">
+           src="/media/A4.ogv">
 
 </body>
 </html>
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1_2.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1_2.sub.html
index 579668c83ee9..8312defb2e18 100644
--- a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1_2.sub.html
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1_2.sub.html
@@ -24,7 +24,7 @@
       }));
 
       // we assume tests are run from 'hostname' and 'www.hostname' or 'www2.hostname' is a valid alias
-      var mediaURL = location.protocol + "//{{domains[www2]}}:{{ports[http][0]}}/media/A4.webm";
+      var mediaURL = location.protocol + "//{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv";
 
     function media_loaded(t) {
       t.step( function () {
@@ -41,7 +41,7 @@
     <video id="videoObject" width="320" height="240" controls
            onloadeddata="media_loaded(source_test)">
         <source id="videoSourceObject"
-                type="video/webm"
+                type="video/ogg"
                 onerror="media_error_handler(source_test)">
     </video>
     <video id="videoObject2" width="320" height="240" controls
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_2_2.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_2_2.sub.html
index e1627b138c91..ce6b8add3c83 100644
--- a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_2_2.sub.html
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_2_2.sub.html
@@ -48,7 +48,7 @@
     <script>
         let source = document.createElement("source");
         source.src = mediaURL;
-        source.type = "audio/webm";
+        source.type = "audio/ogg";
         source.onerror = _ => { media_error_handler(source_test); }
         document.getElementById("audioObject").appendChild(source);
         document.getElementById("audioObject2").src = mediaURL;
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3.sub.html
index 2acae07b7edd..46489e2668f4 100644
--- a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3.sub.html
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3.sub.html
@@ -37,8 +37,8 @@
     <video id="videoObject" width="320" height="240" controls
            onloadeddata="media_loaded(source_test)" crossorigin>
         <source id="audioSourceObject"
-                type="video/webm"
-                src="/media/A4.webm">
+                type="audio/ogg"
+                src="/media/A4.ogv">
         <track id="trackObject"
                kind="subtitles"
                srclang="en"
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3_2.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3_2.sub.html
index cb3558e6c2a3..431a58608ab7 100644
--- a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3_2.sub.html
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3_2.sub.html
@@ -43,8 +43,8 @@
            onerror="media_error_handler(source_test)"
            crossorigin>
         <source id="audioSourceObject"
-                type="video/webm"
-                src="/media/A4.webm">
+                type="audio/ogg"
+                src="/media/A4.ogv">
         <track default
                id="trackObject"
                kind="subtitles"
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-blocked.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-blocked.sub.html
index 16c36dfb2047..b2b57dec64e4 100644
--- a/testing/web-platform/tests/content-security-policy/media-src/media-src-blocked.sub.html
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-blocked.sub.html
@@ -14,7 +14,7 @@
   <script>
     const otherOrigin = get_host_info().OTHER_ORIGIN;
     const audioUrl = otherOrigin + "/media/sound_5.oga";
-    const videoUrl = otherOrigin + "/media/A4.webm";
+    const videoUrl = otherOrigin + "/media/A4.ogv";
 
     // Asynchronously returns the next `securitypolicyviolation` event.
     async function nextViolation() {
@@ -29,7 +29,7 @@
       const violationPromise = nextViolation();
 
       const video = document.createElement("video");
-      video.type = "video/webm";
+      video.type = "video/ogg";
       video.src = videoUrl;
       video.onloadeddata = reject;
       video.onerror = () => { resolve(violationPromise); };
@@ -49,7 +49,7 @@
       video.onloadeddata = reject;
 
       const source = document.createElement("source");
-      source.type = "video/webm";
+      source.type = "video/ogg";
       source.src = videoUrl;
       source.onerror = () => { resolve(violationPromise); };
 
@@ -64,7 +64,7 @@
       const violationPromise = nextViolation();
 
       const audio = document.createElement("audio");
-      audio.type = "audio/webm";
+      audio.type = "audio/ogg";
       audio.src = audioUrl;
       audio.oncanplay = reject;
       audio.onloadedmetadata = reject;
@@ -86,7 +86,7 @@
       audio.onloadeddata = reject;
 
       const source = document.createElement("source");
-      source.type = "audio/webm";
+      source.type = "audio/ogg";
       source.src = audioUrl;
       source.onerror = () => { resolve(violationPromise); };
 
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
index ac8c167d5fe1..a0708bf5ed3c 100644
--- a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
@@ -44,28 +44,28 @@
     <video id="videoObject" width="320" height="240" controls
            onloadeddata="media_loaded(source_test)">
         <source id="videoSourceObject"
-                type="video/webm"
+                type="video/ogg"
                 onerror="media_error_handler(source_test)"
-                src="http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.webm">
+                src="http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv">
     </video>
 
     <video id="videoObject2" width="320" height="240" controls
            onerror="media_error_handler(src_test)"
            onloadeddata="media_loaded(src_test)"
-           src="http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.webm">
+           src="http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv">
 
     <video id="videoObject3" width="320" height="240" controls
            onloadeddata="media_loaded(source_redir_test)">
         <source id="videoSourceObject"
-                type="video/webm"
+                type="video/ogg"
                 onerror="media_error_handler(source_test)"
-                src="/common/redirect.py?location=http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.webm">
+                src="/common/redirect.py?location=http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv">
     </video>
 
     <video id="videoObject2" width="320" height="240" controls
            onerror="media_error_handler(src_redir_test)"
            onloadeddata="media_loaded(src_redir_test)"
-           src="/common/redirect.py?location=http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.webm">
+           src="/common/redirect.py?location=http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv">
 
 </body>
 </html>
diff --git a/testing/web-platform/tests/css/compositing/mix-blend-mode/support/RGB_Circles.oggtheora.ogv b/testing/web-platform/tests/css/compositing/mix-blend-mode/support/RGB_Circles.oggtheora.ogv
new file mode 100644
index 000000000000..baed6e2f5df3
Binary files /dev/null and b/testing/web-platform/tests/css/compositing/mix-blend-mode/support/RGB_Circles.oggtheora.ogv differ
diff --git a/testing/web-platform/tests/css/css-masking/clip-path/clip-path-scaled-video.html b/testing/web-platform/tests/css/css-masking/clip-path/clip-path-scaled-video.html
index 03e1b21d1752..c92702d8e78c 100644
--- a/testing/web-platform/tests/css/css-masking/clip-path/clip-path-scaled-video.html
+++ b/testing/web-platform/tests/css/css-masking/clip-path/clip-path-scaled-video.html
@@ -14,32 +14,32 @@
   </clipPath>
   <g clip-path="url(#clip)" transform="scale(0.112)">
     <foreignObject width="320" height="240">
-      <video src="/media/test.webm" autoplay loop></video>
+      <video src="/media/test.ogv" autoplay loop></video>
     </foreignObject>
   </g>
   <g clip-path="url(#clip)" transform="scale(0.345)">
     <foreignObject width="320" height="240">
-      <video src="/media/test.webm" autoplay loop></video>
+      <video src="/media/test.ogv" autoplay loop></video>
     </foreignObject>
   </g>
   <g clip-path="url(#clip)" transform="scale(0.778)">
     <foreignObject width="320" height="240">
-      <video src="/media/test.webm" autoplay loop></video>
+      <video src="/media/test.ogv" autoplay loop></video>
     </foreignObject>
   </g>
   <g clip-path="url(#clip)" transform="scale(0.912)">
     <foreignObject width="320" height="240">
-      <video src="/media/test.webm" autoplay loop></video>
+      <video src="/media/test.ogv" autoplay loop></video>
     </foreignObject>
   </g>
   <g clip-path="url(#clip)" transform="scale(1.678)">
     <foreignObject width="320" height="240">
-      <video src="/media/test.webm" autoplay loop></video>
+      <video src="/media/test.ogv" autoplay loop></video>
     </foreignObject>
   </g>
   <g clip-path="url(#clip)" transform="scale(3.333)">
     <foreignObject width="320" height="240">
-      <video src="/media/test.webm" oncanplaythrough="takeScreenshot()" autoplay loop></video>
+      <video src="/media/test.ogv" oncanplaythrough="takeScreenshot()" autoplay loop></video>
     </foreignObject>
   </g>
 </svg>
diff --git a/testing/web-platform/tests/css/css-sizing/aspect-ratio/support/2x2-green.ogv b/testing/web-platform/tests/css/css-sizing/aspect-ratio/support/2x2-green.ogv
new file mode 100644
index 000000000000..29903c0a8173
Binary files /dev/null and b/testing/web-platform/tests/css/css-sizing/aspect-ratio/support/2x2-green.ogv differ
diff --git a/testing/web-platform/tests/css/css-sizing/aspect-ratio/support/2x2-green.webm b/testing/web-platform/tests/css/css-sizing/aspect-ratio/support/2x2-green.webm
deleted file mode 100644
index 74af43afebe3..000000000000
Binary files a/testing/web-platform/tests/css/css-sizing/aspect-ratio/support/2x2-green.webm and /dev/null differ
diff --git a/testing/web-platform/tests/css/css-ui/resize-014.html b/testing/web-platform/tests/css/css-ui/resize-014.html
index c3e292438b57..fdbd77e38ae5 100644
--- a/testing/web-platform/tests/css/css-ui/resize-014.html
+++ b/testing/web-platform/tests/css/css-ui/resize-014.html
@@ -18,5 +18,8 @@ video { resize: both; }
   <source
     src="support/test.mp4"
     type="video/mp4">
+  <source
+    src="support/test.ogv"
+    type="video/ogg">
   &lt;video&gt; is not supported. This test is non conclusive.
 </video>
diff --git a/testing/web-platform/tests/css/css-ui/support/test.ogv b/testing/web-platform/tests/css/css-ui/support/test.ogv
new file mode 100644
index 000000000000..50d59dfb38b0
Binary files /dev/null and b/testing/web-platform/tests/css/css-ui/support/test.ogv differ
diff --git a/testing/web-platform/tests/custom-elements/reactions/customized-builtins/HTMLMediaElement.html b/testing/web-platform/tests/custom-elements/reactions/customized-builtins/HTMLMediaElement.html
index dd830b776798..58e002c52ca2 100644
--- a/testing/web-platform/tests/custom-elements/reactions/customized-builtins/HTMLMediaElement.html
+++ b/testing/web-platform/tests/custom-elements/reactions/customized-builtins/HTMLMediaElement.html
@@ -62,7 +62,7 @@ testReflectBooleanAttributeWithDependentAttributes(
 );
 
 testReflectAttribute(
-  'src', 'src', '/media/video.webm',
+  'src', 'src', '/media/video.ogv',
   '/media/movie_5.mp4', 'src on HTMLMediaElement in video', 'video',
   HTMLVideoElement
 );
diff --git a/testing/web-platform/tests/custom-elements/reactions/customized-builtins/HTMLSourceElement.html b/testing/web-platform/tests/custom-elements/reactions/customized-builtins/HTMLSourceElement.html
index 8168fd1c2e71..f7d567ebcb94 100644
--- a/testing/web-platform/tests/custom-elements/reactions/customized-builtins/HTMLSourceElement.html
+++ b/testing/web-platform/tests/custom-elements/reactions/customized-builtins/HTMLSourceElement.html
@@ -22,7 +22,7 @@ function getParentElement(id) {
 }
 
 testReflectAttributeWithParentNode(
-  'src', 'src', '/media/video.webm',
+  'src', 'src', '/media/video.ogv',
   '/media/white.mp4', 'src on HTMLSourceElement', 'source',
   () => getParentElement('video'), HTMLSourceElement
 );
diff --git a/testing/web-platform/tests/document-policy/experimental-features/resources/video.ogv b/testing/web-platform/tests/document-policy/experimental-features/resources/video.ogv
new file mode 100644
index 000000000000..c9ee910fc667
Binary files /dev/null and b/testing/web-platform/tests/document-policy/experimental-features/resources/video.ogv differ
diff --git a/testing/web-platform/tests/document-policy/experimental-features/resources/video.webm b/testing/web-platform/tests/document-policy/experimental-features/resources/video.webm
deleted file mode 100644
index 10a1ae5d0717..000000000000
Binary files a/testing/web-platform/tests/document-policy/experimental-features/resources/video.webm and /dev/null differ
diff --git a/testing/web-platform/tests/document-policy/experimental-features/unsized-media.tentative.https.sub.html b/testing/web-platform/tests/document-policy/experimental-features/unsized-media.tentative.https.sub.html
index 4e5fbc65558a..d7bb72524902 100644
--- a/testing/web-platform/tests/document-policy/experimental-features/unsized-media.tentative.https.sub.html
+++ b/testing/web-platform/tests/document-policy/experimental-features/unsized-media.tentative.https.sub.html
@@ -60,7 +60,7 @@ for (var test of test_cases) {
     }));
     var expected_width = test.expected_width;
     var expected_height = test.expected_height;
-    video.setAttribute("src", "/document-policy/experimental-features/resources/video.webm");
+    video.setAttribute("src", "/document-policy/experimental-features/resources/video.ogv");
     if (typeof test.attribute !== "undefined") {
       video.setAttribute(test.attribute, test.value);
     }
diff --git a/testing/web-platform/tests/fetch/api/request/destination/resources/dummy_video.ogv b/testing/web-platform/tests/fetch/api/request/destination/resources/dummy_video.ogv
new file mode 100644
index 000000000000..de99616ecebe
Binary files /dev/null and b/testing/web-platform/tests/fetch/api/request/destination/resources/dummy_video.ogv differ
diff --git a/testing/web-platform/tests/html/browsers/browsing-the-web/read-media/cross-origin-video.html b/testing/web-platform/tests/html/browsers/browsing-the-web/read-media/cross-origin-video.html
index a3badfcb5ea4..5f3e95cce40e 100644
--- a/testing/web-platform/tests/html/browsers/browsing-the-web/read-media/cross-origin-video.html
+++ b/testing/web-platform/tests/html/browsers/browsing-the-web/read-media/cross-origin-video.html
@@ -22,7 +22,8 @@ promise_test(async () => {
     + 'VIDEO%26PartialContent';
 
   let v = document.createElement("video");
-  frame.src += "%26mp4";
+  if (v.canPlayType("video/ogv") == "")
+    frame.src += "%26mp4";
 
   document.body.appendChild(frame);
   await new Promise(resolve => frame.onload = resolve);
diff --git a/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js b/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
index 8422ea4b3c97..74c4c2e9975d 100644
--- a/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
+++ b/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
@@ -201,6 +201,8 @@ onload = function() {
       var video_ext = '';
       if (elm.canPlayType('video/webm; codecs="vp9,opus"')) {
         video_ext = 'webm';
+      } else if (elm.canPlayType('video/ogg; codecs="theora,flac"')) {
+        video_ext = 'ogv';
       } else if (elm.canPlayType('video/mp4; codecs="avc1.42E01E,mp4a.40.2"')) {
         video_ext = 'mp4';
       }
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html b/testing/web-platform/tests/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html
index 855f02d3b19e..56edf25aa8fb 100644
--- a/testing/web-platform/tests/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html
+++ b/testing/web-platform/tests/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html
@@ -55,13 +55,10 @@ function type_codecs_test(type, audioCodecs, videoCodecs) {
   var typeSupported = false;
   var codecSupported = false;
 
-  var mimeSupported = canPlayType(type);
-
   // Test 'type' without codecs.
   // Spec: Generally, a user agent should never return "probably" for a type
   // that allows the codecs parameter if that parameter is not present.
   test(function() {
-    assert_implements_optional(mimeSupported, type)
     t(type, 'maybe');
     t(type + ';', 'maybe');
     t(type + ';codecs', 'maybe');
@@ -72,7 +69,6 @@ function type_codecs_test(type, audioCodecs, videoCodecs) {
   function test_codec(codec) {
     var typeWithCodec = mime(type, [codec]);
     test(function() {
-      assert_implements_optional(canPlayType(typeWithCodec), type)
       t(typeWithCodec, 'probably');
       codecSupported = true;
     }, typeWithCodec + ' (optional)');
@@ -85,7 +81,6 @@ function type_codecs_test(type, audioCodecs, videoCodecs) {
   // Test different pairings and orderings of audio+video codecs.
   if (audioCodecs.length > 0 && videoCodecs.length > 0) {
     test(function() {
-      assert_implements_optional(mimeSupported, type)
       audioCodecs.forEach(function(ac) {
         videoCodecs.forEach(function(vc) {
           var canPlayBoth = canPlayType(mime(type, [ac, vc]));
@@ -98,7 +93,6 @@ function type_codecs_test(type, audioCodecs, videoCodecs) {
     }, type + ' codecs subset');
 
     test(function() {
-      assert_implements_optional(mimeSupported, type)
       audioCodecs.forEach(function(ac) {
         videoCodecs.forEach(function(vc) {
           assert_equals(canPlayType(mime(type, [ac, vc])),
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-inline.html b/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-inline.html
index 1a8aabcaff1d..3b4c3542a92e 100644
--- a/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-inline.html
+++ b/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-inline.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <video>
     <source src="/media/test.mp4" type="video/mp4">
-    <source src="/media/test.webm" type="video/webm">
+    <source src="/media/test.ogv" type="video/ogg">
 </video>
 <script>
 test(function() {
@@ -13,4 +13,4 @@ test(function() {
     track.addCue(new VTTCue(0.0, 10.0, 'wow wow'));
     track.mode = 'showing';
 });
-</script>
+</script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/media/A4.ogv b/testing/web-platform/tests/media/A4.ogv
new file mode 100644
index 000000000000..de99616ecebe
Binary files /dev/null and b/testing/web-platform/tests/media/A4.ogv differ
diff --git a/testing/web-platform/tests/media/counting.ogv b/testing/web-platform/tests/media/counting.ogv
new file mode 100644
index 000000000000..ce03c19e50e5
Binary files /dev/null and b/testing/web-platform/tests/media/counting.ogv differ
diff --git a/testing/web-platform/tests/media/green-at-15.ogv b/testing/web-platform/tests/media/green-at-15.ogv
new file mode 100644
index 000000000000..50d59dfb38b0
Binary files /dev/null and b/testing/web-platform/tests/media/green-at-15.ogv differ
diff --git a/testing/web-platform/tests/media/movie_300.ogv b/testing/web-platform/tests/media/movie_300.ogv
new file mode 100644
index 000000000000..0f83996e5dcf
Binary files /dev/null and b/testing/web-platform/tests/media/movie_300.ogv differ
diff --git a/testing/web-platform/tests/media/movie_5.ogv b/testing/web-platform/tests/media/movie_5.ogv
new file mode 100644
index 000000000000..e8990d1120ab
Binary files /dev/null and b/testing/web-platform/tests/media/movie_5.ogv differ
diff --git a/testing/web-platform/tests/media/test.ogv b/testing/web-platform/tests/media/test.ogv
new file mode 100644
index 000000000000..0c55f6c7226a
Binary files /dev/null and b/testing/web-platform/tests/media/test.ogv differ
diff --git a/testing/web-platform/tests/media/video.ogv b/testing/web-platform/tests/media/video.ogv
new file mode 100644
index 000000000000..5cb5f8784811
Binary files /dev/null and b/testing/web-platform/tests/media/video.ogv differ
diff --git a/testing/web-platform/tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html b/testing/web-platform/tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html
index 44dfa801537c..eb7b443df39b 100644
--- a/testing/web-platform/tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html
+++ b/testing/web-platform/tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html
@@ -67,11 +67,11 @@
         var otherHost = get_host_info().HTTP_NOTSAMESITE_ORIGIN.slice(0, -4); // cut of http port
         var url = new URL(
           otherHost +
-            "{{ports[https][0]}}/mixed-content/tentative/resources/test.webm?pipe=header(Access-Control-Allow-Origin,*)"
+            "{{ports[https][0]}}/mixed-content/tentative/resources/test.ogv?pipe=header(Access-Control-Allow-Origin,*)"
         );
         var i = document.createElement("video");
         i.oncanplaythrough = test.step_func_done((_) => {
-          assert_equals(Math.floor(i.duration), 1, "Length. Other host");
+          assert_equals(Math.floor(i.duration), 300, "Length. Other host");
         });
         i.crossOrigin = "anonymous";
         i.onerror = test.unreached_func(
diff --git a/testing/web-platform/tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html b/testing/web-platform/tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html
index d9ad3dda392f..ea2d07309c06 100644
--- a/testing/web-platform/tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html
+++ b/testing/web-platform/tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html
@@ -13,10 +13,10 @@
 
     function assert_video_loads(test) {
         // Since autoupgrades don't upgrade custom ports, we use the https port with an HTTP scheme. A successful autoupgrade will result in the right URL loading (and no autoupgrade will result in failure).
-        var url = new URL("http://{{host}}:{{ports[https][0]}}/mixed-content/tentative/resources/test.webm")
+        var url = new URL("http://{{host}}:{{ports[https][0]}}/mixed-content/tentative/resources/test.ogv")
         var i = document.createElement('video');
         i.oncanplaythrough = test.step_func_done(_ => {
-            assert_equals(Math.floor(i.duration), 1, "Length.");
+            assert_equals(Math.floor(i.duration), 300, "Length.");
         });
         i.onerror = test.unreached_func("Video should load successfully from " + url);
         i.src = url;
@@ -28,10 +28,10 @@
     function assert_other_host_video_loads(test) {
         // Since autoupgrades don't upgrade custom ports, we use the https port with an HTTP scheme. A successful autoupgrade will result in the right URL loading (and no autoupgrade will result in failure).
         var otherHost = get_host_info().HTTP_NOTSAMESITE_ORIGIN.slice(0,-4); // cut of http port
-        var url = new URL( otherHost + "{{ports[https][0]}}/mixed-content/tentative/resources/test.webm")
+        var url = new URL( otherHost + "{{ports[https][0]}}/mixed-content/tentative/resources/test.ogv")
         var i = document.createElement('video');
         i.oncanplaythrough = test.step_func_done(_ => {
-            assert_equals(Math.floor(i.duration), 1, "Length. Other host");
+            assert_equals(Math.floor(i.duration), 300, "Length. Other host");
         });
         i.onerror = test.unreached_func("Video of other host should load successfully from " + url);
         i.src = url;
diff --git a/testing/web-platform/tests/mixed-content/tentative/resources/test.ogv b/testing/web-platform/tests/mixed-content/tentative/resources/test.ogv
new file mode 100644
index 000000000000..0f83996e5dcf
Binary files /dev/null and b/testing/web-platform/tests/mixed-content/tentative/resources/test.ogv differ
diff --git a/testing/web-platform/tests/mixed-content/tentative/resources/test.webm b/testing/web-platform/tests/mixed-content/tentative/resources/test.webm
deleted file mode 100644
index e3e4cb0baca8..000000000000
Binary files a/testing/web-platform/tests/mixed-content/tentative/resources/test.webm and /dev/null differ
diff --git a/testing/web-platform/tests/preload/resources/A4.ogv b/testing/web-platform/tests/preload/resources/A4.ogv
new file mode 100644
index 000000000000..de99616ecebe
Binary files /dev/null and b/testing/web-platform/tests/preload/resources/A4.ogv differ
diff --git a/testing/web-platform/tests/resource-timing/initiator-type/video.html b/testing/web-platform/tests/resource-timing/initiator-type/video.html
index 2d8c9dcc474c..16f3b3dea5f1 100644
--- a/testing/web-platform/tests/resource-timing/initiator-type/video.html
+++ b/testing/web-platform/tests/resource-timing/initiator-type/video.html
@@ -19,14 +19,14 @@
     src="/resource-timing/resources/empty.py?id=track">
 </video>
 <video autoplay="true">
-  <source src="/media/test.webm?id=source-webm" type="video/webm">
+  <source src="/media/test.ogv?id=source-ogv" type="video/ogg">
 </video>
 <script>
   initiator_type_test("blue.png?id=poster", "video", "<video poster>");
   initiator_type_test("media/test.mp4?id=src", "video", "<video src>");
   initiator_type_test("media/test.mp4?id=source-mp4", "video", "<source src> with type=\"video/mp4\"");
   initiator_type_test("empty.py?id=track", "track", "<track src>");
-  initiator_type_test("media/test.webm?id=source-webm", "video", "<source src> with type=\"video/webm\"");
+  initiator_type_test("media/test.ogv?id=source-ogv", "video", "<source src> with type=\"video/ogg\"");
 </script>
 </body>
 </html>
diff --git a/testing/web-platform/tests/speculation-rules/prerender/resources/request-picture-in-picture.html b/testing/web-platform/tests/speculation-rules/prerender/resources/request-picture-in-picture.html
index 360cf3b20076..9aea3d33d5cb 100644
--- a/testing/web-platform/tests/speculation-rules/prerender/resources/request-picture-in-picture.html
+++ b/testing/web-platform/tests/speculation-rules/prerender/resources/request-picture-in-picture.html
@@ -3,7 +3,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/speculation-rules/prerender/resources/utils.js"></script>
 <video id="target"
-       onloadstart="loadstart()" src="/media/test.webm"></video>
+       onloadstart="loadstart()" src="/media/test.ogv"></video>
 <script>
 
 assert_true(document.prerendering);
diff --git a/testing/web-platform/tests/tools/wptserve/wptserve/constants.py b/testing/web-platform/tests/tools/wptserve/wptserve/constants.py
index 292f0085dc20..584f2cc1c703 100644
--- a/testing/web-platform/tests/tools/wptserve/wptserve/constants.py
+++ b/testing/web-platform/tests/tools/wptserve/wptserve/constants.py
@@ -25,6 +25,7 @@ content_types = utils.invert_dict({
     "text/plain": ["txt", "md"],
     "text/vtt": ["vtt"],
     "video/mp4": ["mp4", "m4v"],
+    "video/ogg": ["ogg", "ogv"],
     "video/webm": ["webm"],
 })
 
diff --git a/toolkit/components/antitracking/test/browser/browser.toml b/toolkit/components/antitracking/test/browser/browser.toml
index edb429b49e52..3e825f7b0c0c 100644
--- a/toolkit/components/antitracking/test/browser/browser.toml
+++ b/toolkit/components/antitracking/test/browser/browser.toml
@@ -200,7 +200,7 @@ support-files = [
   "!/browser/components/originattributes/test/browser/file_thirdPartyChild.request.html",
   "!/browser/components/originattributes/test/browser/file_thirdPartyChild.script.js",
   "!/browser/components/originattributes/test/browser/file_thirdPartyChild.sharedworker.js",
-  "!/browser/components/originattributes/test/browser/file_thirdPartyChild.video.webm",
+  "!/browser/components/originattributes/test/browser/file_thirdPartyChild.video.ogv",
   "!/browser/components/originattributes/test/browser/file_thirdPartyChild.worker.fetch.html",
   "!/browser/components/originattributes/test/browser/file_thirdPartyChild.worker.js",
   "!/browser/components/originattributes/test/browser/file_thirdPartyChild.worker.request.html",
@@ -216,7 +216,7 @@ support-files = [
   "file_saveAsImage.sjs",
   "file_saveAsVideo.sjs",
   "file_saveAsPageInfo.html",
-  "file_video.webm",
+  "file_video.ogv",
 ]
 
 ["browser_staticPartition_tls_session.js"]
diff --git a/toolkit/components/antitracking/test/browser/browser_staticPartition_cache.js b/toolkit/components/antitracking/test/browser/browser_staticPartition_cache.js
index 9383e5a6f9fb..9afe3180fba8 100644
--- a/toolkit/components/antitracking/test/browser/browser_staticPartition_cache.js
+++ b/toolkit/components/antitracking/test/browser/browser_staticPartition_cache.js
@@ -105,7 +105,7 @@ add_task(async function () {
         // The CSS cache needs to be cleared in-process.
         content.windowUtils.clearSharedStyleSheetCache();
 
-        let videoURL = arg.urlPrefix + "file_thirdPartyChild.video.webm";
+        let videoURL = arg.urlPrefix + "file_thirdPartyChild.video.ogv";
         let audioURL = arg.urlPrefix + "file_thirdPartyChild.audio.ogg";
         let URLSuffix = "?r=" + arg.randomSuffix;
 
@@ -176,7 +176,7 @@ add_task(async function () {
       "xhr.html",
       "worker.xhr.html",
       "audio.ogg",
-      "video.webm",
+      "video.ogv",
       "fetch.html",
       "worker.fetch.html",
       "request.html",
diff --git a/toolkit/components/antitracking/test/browser/file_saveAsPageInfo.html b/toolkit/components/antitracking/test/browser/file_saveAsPageInfo.html
index e74e18695e4d..8f22e911e723 100644
--- a/toolkit/components/antitracking/test/browser/file_saveAsPageInfo.html
+++ b/toolkit/components/antitracking/test/browser/file_saveAsPageInfo.html
@@ -1,6 +1,6 @@
 <html>
 <body>
   <img src="https://example.net/browser/toolkit/components/antitracking/test/browser/raptor.jpg" id="image1">
-  <video src="https://example.net/browser/toolkit/components/antitracking/test/browser/file_video.webm" id="video1"> </video>
+  <video src="https://example.net/browser/toolkit/components/antitracking/test/browser/file_video.ogv" id="video1"> </video>
 </body>
 </html>
diff --git a/toolkit/components/antitracking/test/browser/file_video.ogv b/toolkit/components/antitracking/test/browser/file_video.ogv
new file mode 100644
index 000000000000..68dee3cf2b1d
Binary files /dev/null and b/toolkit/components/antitracking/test/browser/file_video.ogv differ
diff --git a/toolkit/components/antitracking/test/browser/file_video.webm b/toolkit/components/antitracking/test/browser/file_video.webm
deleted file mode 100644
index 2cee5a9e51e8..000000000000
Binary files a/toolkit/components/antitracking/test/browser/file_video.webm and /dev/null differ
diff --git a/toolkit/components/windowcreator/test/320x240.ogv b/toolkit/components/windowcreator/test/320x240.ogv
new file mode 100644
index 000000000000..093158432ac6
Binary files /dev/null and b/toolkit/components/windowcreator/test/320x240.ogv differ
diff --git a/toolkit/components/windowcreator/test/320x240.webm b/toolkit/components/windowcreator/test/320x240.webm
deleted file mode 100644
index 16ecdbf688bd..000000000000
Binary files a/toolkit/components/windowcreator/test/320x240.webm and /dev/null differ
diff --git a/toolkit/components/windowcreator/test/bug449141_page.html b/toolkit/components/windowcreator/test/bug449141_page.html
index 4c8e46dd10b4..3b8e3f550ac4 100644
--- a/toolkit/components/windowcreator/test/bug449141_page.html
+++ b/toolkit/components/windowcreator/test/bug449141_page.html
@@ -6,6 +6,6 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     </head>
     <body>
-      <video src='320x240.webm'></video>
+      <video src='320x240.ogv'></video>
     </body>
 </html>
diff --git a/toolkit/components/windowcreator/test/chrome.toml b/toolkit/components/windowcreator/test/chrome.toml
index 8afd9acbe55a..0fdc8250e0ff 100644
--- a/toolkit/components/windowcreator/test/chrome.toml
+++ b/toolkit/components/windowcreator/test/chrome.toml
@@ -1,6 +1,6 @@
 [DEFAULT]
 support-files = [
-  "320x240.webm",
+  "320x240.ogv",
   "bug449141_page.html",
   "bug1170334_iframe.xml",
   "bug1170334_style.css",
diff --git a/toolkit/components/windowcreator/test/test_bug449141.html b/toolkit/components/windowcreator/test/test_bug449141.html
index 24963295a044..84ee5f67f6f5 100644
--- a/toolkit/components/windowcreator/test/test_bug449141.html
+++ b/toolkit/components/windowcreator/test/test_bug449141.html
@@ -43,7 +43,7 @@ var progressListener = {
       var videoFile = getTempDir();
       videoFile.append(this.dirName);
       dirExists = videoFile.exists();
-      videoFile.append("320x240.webm");
+      videoFile.append("320x240.ogv");
       videoExists = videoFile.exists();
       this.folder.remove(true);
       this.file.remove(false);
diff --git a/toolkit/content/tests/widgets/chrome.toml b/toolkit/content/tests/widgets/chrome.toml
index fa10249e89da..18fe0d153a78 100644
--- a/toolkit/content/tests/widgets/chrome.toml
+++ b/toolkit/content/tests/widgets/chrome.toml
@@ -5,7 +5,7 @@ support-files = [
   "popup_shared.js",
   "window_label_checkbox.xhtml",
   "window_menubar.xhtml",
-  "seek_with_sound.webm",
+  "seek_with_sound.ogg",
 ]
 prefs = ["app.support.baseURL='https://support.mozilla.org/'"]
 
@@ -63,7 +63,7 @@ skip-if = [
 ["test_videocontrols_focus.html"]
 support-files = [
   "head.js",
-  "video.webm",
+  "video.ogg",
 ]
 skip-if = [
   "os == 'android'",
diff --git a/toolkit/content/tests/widgets/file_videocontrols_jsdisabled.html b/toolkit/content/tests/widgets/file_videocontrols_jsdisabled.html
index 95dba91eea73..56917b69ac5d 100644
--- a/toolkit/content/tests/widgets/file_videocontrols_jsdisabled.html
+++ b/toolkit/content/tests/widgets/file_videocontrols_jsdisabled.html
@@ -1,2 +1,2 @@
-<video src="seek_with_sound.webm" controls autoplay=true></video>
+<video src="seek_with_sound.ogg" controls autoplay=true></video>
 <script>window.testExpando = true;</script>
diff --git a/toolkit/content/tests/widgets/mochitest.toml b/toolkit/content/tests/widgets/mochitest.toml
index 7602fd75b436..7e20352256e2 100644
--- a/toolkit/content/tests/widgets/mochitest.toml
+++ b/toolkit/content/tests/widgets/mochitest.toml
@@ -5,8 +5,8 @@ support-files = [
   "file_videocontrols_jsdisabled.html",
   "image.png",
   "image-zh.png",
-  "seek_with_sound.webm",
-  "video.webm",
+  "seek_with_sound.ogg",
+  "video.ogg",
   "head.js",
   "tree_shared.js",
   "test-webvtt-1.vtt",
diff --git a/toolkit/content/tests/widgets/seek_with_sound.ogg b/toolkit/content/tests/widgets/seek_with_sound.ogg
new file mode 100644
index 000000000000..c86d9946bddc
Binary files /dev/null and b/toolkit/content/tests/widgets/seek_with_sound.ogg differ
diff --git a/toolkit/content/tests/widgets/seek_with_sound.webm b/toolkit/content/tests/widgets/seek_with_sound.webm
deleted file mode 100644
index dd60cc5a0a75..000000000000
Binary files a/toolkit/content/tests/widgets/seek_with_sound.webm and /dev/null differ
diff --git a/toolkit/content/tests/widgets/test_videocontrols.html b/toolkit/content/tests/widgets/test_videocontrols.html
index f2fc53a1cc2f..35678fa05ef5 100644
--- a/toolkit/content/tests/widgets/test_videocontrols.html
+++ b/toolkit/content/tests/widgets/test_videocontrols.html
@@ -184,7 +184,7 @@ add_task(async function setup() {
       ]});
   await new Promise(resolve => {
     video.addEventListener("canplaythrough", resolve, {once: true});
-    video.src = "seek_with_sound.webm";
+    video.src = "seek_with_sound.ogg";
   });
 
   video.addEventListener("play", captureEventThenCheck);
diff --git a/toolkit/content/tests/widgets/test_videocontrols_closed_caption_menu.html b/toolkit/content/tests/widgets/test_videocontrols_closed_caption_menu.html
index 5a2602d204dc..39d6ff494f0a 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_closed_caption_menu.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_closed_caption_menu.html
@@ -49,7 +49,7 @@
       ["media.videocontrols.keyboard-tab-to-all-controls", true],
     ]}, done);
   }, done => {
-    video.src = "seek_with_sound.webm";
+    video.src = "seek_with_sound.ogg";
     video.addEventListener("loadedmetadata", done);
   }, cleanup);
 
diff --git a/toolkit/content/tests/widgets/test_videocontrols_error.html b/toolkit/content/tests/widgets/test_videocontrols_error.html
index 922726d5be79..af90a4672a72 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_error.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_error.html
@@ -27,7 +27,7 @@
 
   add_task(async function check_normal_status() {
     await new Promise(resolve => {
-      video.src = "seek_with_sound.webm";
+      video.src = "seek_with_sound.ogg";
       video.addEventListener("loadedmetadata", () => SimpleTest.executeSoon(resolve));
     });
 
@@ -44,7 +44,7 @@
     const errorType = "errorNoSource";
 
     await new Promise(resolve => {
-      video.src = "invalid_source.webm";
+      video.src = "invalid_source.ogg";
       video.addEventListener("error", () => SimpleTest.executeSoon(resolve));
     });
 
diff --git a/toolkit/content/tests/widgets/test_videocontrols_focus.html b/toolkit/content/tests/widgets/test_videocontrols_focus.html
index e19262bf6eae..0982947ffe0a 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_focus.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_focus.html
@@ -36,7 +36,7 @@ add_task(async function setup() {
   video.controls = true;
   video.preload = "auto";
   video.loop = true;
-  video.src = "video.webm";
+  video.src = "video.ogg";
   const caption = video.addTextTrack("captions", "English", "en");
   caption.mode = "showing";
   const content = document.getElementById("content");
diff --git a/toolkit/content/tests/widgets/test_videocontrols_iframe_fullscreen.html b/toolkit/content/tests/widgets/test_videocontrols_iframe_fullscreen.html
index d30d10b8bc94..0a74b2560961 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_iframe_fullscreen.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_iframe_fullscreen.html
@@ -30,7 +30,7 @@
       ifr.addEventListener("load", resolve);
     }).then(() => new Promise(resolve => {
       video = ifr.contentDocument.getElementById("video");
-      video.src = "seek_with_sound.webm";
+      video.src = "seek_with_sound.ogg";
       video.addEventListener("loadedmetadata", resolve);
     })).then(() => new Promise(resolve => {
       const available = video.ownerDocument.fullscreenEnabled;
diff --git a/toolkit/content/tests/widgets/test_videocontrols_keyhandler.html b/toolkit/content/tests/widgets/test_videocontrols_keyhandler.html
index 9737a9fff2f0..5b771fc745fb 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_keyhandler.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_keyhandler.html
@@ -31,7 +31,7 @@
       ["media.videocontrols.keyboard-tab-to-all-controls", true],
     ]}, done);
   }, done => {
-    video.src = "seek_with_sound.webm";
+    video.src = "seek_with_sound.ogg";
     video.addEventListener("loadedmetadata", done);
   });
 
diff --git a/toolkit/content/tests/widgets/test_videocontrols_onclickplay.html b/toolkit/content/tests/widgets/test_videocontrols_onclickplay.html
index 3b1bd4653c67..6af2df6d9183 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_onclickplay.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_onclickplay.html
@@ -22,7 +22,7 @@ var video = document.getElementById("video");
 
 function startMediaLoad() {
   // Kick off test once video has loaded, in its canplaythrough event handler.
-  video.src = "seek_with_sound.webm";
+  video.src = "seek_with_sound.ogg";
   video.addEventListener("canplaythrough", runTest);
 }
 
diff --git a/toolkit/content/tests/widgets/test_videocontrols_scrubber_position.html b/toolkit/content/tests/widgets/test_videocontrols_scrubber_position.html
index 51117e795519..b1d2ab9e74a0 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_scrubber_position.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_scrubber_position.html
@@ -26,7 +26,7 @@ const video = document.getElementById("video");
 add_task(async function setup() {
   await new Promise(resolve => {
     video.addEventListener("canplaythrough", resolve, {once: true});
-    video.src = "seek_with_sound.webm";
+    video.src = "seek_with_sound.ogg";
   });
 
   // Check initial state upon load
diff --git a/toolkit/content/tests/widgets/test_videocontrols_scrubber_position_nopreload.html b/toolkit/content/tests/widgets/test_videocontrols_scrubber_position_nopreload.html
index 968ba5db96cb..9fbb6fbcb511 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_scrubber_position_nopreload.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_scrubber_position_nopreload.html
@@ -13,7 +13,7 @@
 <p id="display"></p>
 
 <div id="content">
-  <video width="320" height="240" id="video" mozNoDynamicControls controls="true" preload="none" src="seek_with_sound.webm"></video>
+  <video width="320" height="240" id="video" mozNoDynamicControls controls="true" preload="none" src="seek_with_sound.ogg"></video>
 </div>
 
 <div id="host"></div>
diff --git a/toolkit/content/tests/widgets/test_videocontrols_size.html b/toolkit/content/tests/widgets/test_videocontrols_size.html
index d940b1d2952c..559cc66e86ff 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_size.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_size.html
@@ -148,7 +148,7 @@
 
   testCases.push(() => Promise.all(videoElems.map(video => new Promise(resolve => {
     video.addEventListener("loadedmetadata", resolve);
-    video.src = "seek_with_sound.webm";
+    video.src = "seek_with_sound.ogg";
   }))));
 
   videoElems.forEach(video => {
diff --git a/toolkit/content/tests/widgets/test_videocontrols_standalone.html b/toolkit/content/tests/widgets/test_videocontrols_standalone.html
index 1eaa026cdc49..14208923dd57 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_standalone.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_standalone.html
@@ -22,7 +22,7 @@ function getMediaElement(aWindow) {
   return aWindow.document.getElementsByTagName("video")[0];
 }
 
-var popup = window.open("seek_with_sound.webm");
+var popup = window.open("seek_with_sound.ogg");
 popup.addEventListener("load", function() {
   var video = getMediaElement(popup);
 
diff --git a/toolkit/content/tests/widgets/test_videocontrols_video_noaudio.html b/toolkit/content/tests/widgets/test_videocontrols_video_noaudio.html
index 99d5bdad01b0..bfc80184666a 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_video_noaudio.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_video_noaudio.html
@@ -23,7 +23,7 @@
   add_task(async function setup() {
     await SpecialPowers.pushPrefEnv({"set": [["media.cache_size", 40000]]});
     await new Promise(resolve => {
-      video.src = "video.webm";
+      video.src = "video.ogg";
       video.addEventListener("loadedmetadata", () => SimpleTest.executeSoon(resolve));
     });
   });
diff --git a/toolkit/content/tests/widgets/test_videocontrols_vtt.html b/toolkit/content/tests/widgets/test_videocontrols_vtt.html
index 33b8bcf24e62..2f8d70f35a07 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_vtt.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_vtt.html
@@ -26,7 +26,7 @@
   add_task(async function wait_for_media_ready() {
     await SpecialPowers.pushPrefEnv({"set": [["media.cache_size", 40000]]});
     await new Promise(resolve => {
-      video.src = "seek_with_sound.webm";
+      video.src = "seek_with_sound.ogg";
       video.addEventListener("loadedmetadata", resolve);
     });
   });
diff --git a/toolkit/content/tests/widgets/video.ogg b/toolkit/content/tests/widgets/video.ogg
new file mode 100644
index 000000000000..ac7ece3519ac
Binary files /dev/null and b/toolkit/content/tests/widgets/video.ogg differ
diff --git a/toolkit/content/tests/widgets/video.webm b/toolkit/content/tests/widgets/video.webm
deleted file mode 100644
index 87a8d837a8c0..000000000000
Binary files a/toolkit/content/tests/widgets/video.webm and /dev/null differ