Backed out changeset f6f5863e50a8 (bug 1397141)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 13 Sep 2017 09:25:22 +0200
changeset 663806 d1579ffe85624b4f6b0cfa3673427a538a794b7e
parent 663805 f6f5863e50a8b8725bb6af0eb2cca44c561c7a6e
child 663807 f6eabbf84e5ecf6f800cf4e69d5951e2b25d3106
push id79536
push userbmo:rchien@mozilla.com
push dateWed, 13 Sep 2017 12:07:56 +0000
bugs1397141
milestone57.0a1
backs outf6f5863e50a8b8725bb6af0eb2cca44c561c7a6e
Backed out changeset f6f5863e50a8 (bug 1397141)
dom/media/test/manifest.js
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -102,22 +102,16 @@ var gPlayedTests = [
   { name:"owl-short.mp3", type:"audio/mpeg", duration:0.52 },
   { name:"very-short.mp3", type:"audio/mpeg", duration:0.07 },
   // Disable vbr.mp3 to see if it reduces the error of AUDCLNT_E_CPUUSAGE_EXCEEDED.
   // See bug 1110922 comment 26.
   //{ name:"vbr.mp3", type:"audio/mpeg", duration:10.0 },
   { name:"bug495794.ogg", type:"audio/ogg", duration:0.3 },
 ];
 
-if (manifestNavigator().userAgent.includes("Windows") &&
-    manifestVideo().canPlayType('video/mp4; codecs="avc1.42E01E"')) {
-  gPlayedTests = gPlayedTests.concat({name: "red-46x48.mp4", type:"video/mp4", duration:1.00},
-                                     {name: "red-48x46.mp4", type:"video/mp4", duration:1.00});
-}
-
 // Used by test_mozLoadFrom.  Need one test file per decoder backend, plus
 // anything for testing clone-specific bugs.
 var cloneKey = Math.floor(Math.random()*100000000);
 var gCloneTests = [
   // short-video is more like 1s, so if you load this twice you'll get an unexpected duration
   { name:"dynamic_resource.sjs?key=" + cloneKey + "&res1=320x240.ogv&res2=short-video.ogv",
     type:"video/ogg", duration:0.266 },
 ];
@@ -557,16 +551,24 @@ var gErrorTests = [
   { name:"448636.ogv", type:"video/ogg" },
   { name:"bug504843.ogv", type:"video/ogg" },
   { name:"bug501279.ogg", type:"audio/ogg" },
   { name:"bug603918.webm", type:"video/webm" },
   { name:"bug604067.webm", type:"video/webm" },
   { name:"bogus.duh", type:"bogus/duh" }
 ];
 
+// Windows' H.264 decoder cannot handle H.264 streams with resolution
+// less than 48x48 pixels. We refuse to play and error on such streams.
+if (manifestNavigator().userAgent.includes("Windows") &&
+    manifestVideo().canPlayType('video/mp4; codecs="avc1.42E01E"')) {
+  gErrorTests = gErrorTests.concat({name: "red-46x48.mp4", type:"video/mp4"},
+                                   {name: "red-48x46.mp4", type:"video/mp4"});
+}
+
 // These files would get error after receiving "loadedmetadata", we would like
 // to check duration in "onerror" and make sure the duration is still available.
 var gDurationTests = [
   { name:"bug603918.webm", duration:6.076 },
   { name:"bug604067.webm", duration:6.076 }
 ]
 
 // These are files that have nontrivial duration and are useful for seeking within.