Bug 1397141 - part8 : update test for video under 48x48. draft
authorAlastor Wu <alwu@mozilla.com>
Wed, 13 Sep 2017 15:38:24 +0800
changeset 663634 c751f32dde8bf66115e8174f7787dccea3beb419
parent 663633 0ba7bd687189b4375ac58d6f1e7fee966ac92b62
child 731250 a2ecb5b9fd025e9e4dba7e9dd865ec9c31e7af78
push id79488
push useralwu@mozilla.com
push dateWed, 13 Sep 2017 07:38:55 +0000
bugs1397141
milestone57.0a1
Bug 1397141 - part8 : update test for video under 48x48. In patch3, we remove the minimum resolution check, now the video under 48x48 can be playback successfully. Therefore, removing them from error test and we should ensure they can be playback. MozReview-Commit-ID: BvLtr4DN1hU
dom/media/test/manifest.js
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -102,16 +102,22 @@ 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 },
 ];
@@ -551,24 +557,16 @@ 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.