Commit 6b3d348f authored by Wes Kocher's avatar Wes Kocher
Browse files

Backed out 2 changesets (bug 1294358) for xp mda failures a=backout CLOSED TREE 

Backed out changeset 886441076b5f (bug 1294358)
Backed out changeset 848141457f25 (bug 1294358)

--HG--
extra : amend_source : 393a51d18d37246cec3617fb3162478cd98b3bb2
parent 6f430a40

dom/media/test/gizmo-noaudio.mp4

deleted100644 → 0
−335 KiB

File deleted.

View file

dom/media/test/gizmo-noaudio.mp4^headers^

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
Cache-Control: no-store

dom/media/test/manifest.js

+0 −7
Original line number Diff line number Diff line
@@ -1410,13 +1410,6 @@ var gEMENonMSEFailTests = [ 
  },

];



// These are files that are used for video decode suspend in

// background tabs tests.

var gDecodeSuspendTests = [

  { name:"gizmo.mp4", type:"video/mp4", duration:5.56 },

  { name:"gizmo-noaudio.mp4", type:"video/mp4", duration:5.56 }

];



function checkMetadata(msg, e, test) {

  if (test.width) {

    is(e.videoWidth, test.width, msg + " video width");

dom/media/test/mochitest.ini

+3 −4
Original line number Diff line number Diff line
@@ -415,8 +415,6 @@ support-files = 
  fragment_play.js

  gizmo.mp4

  gizmo.mp4^headers^

  gizmo-noaudio.mp4

  gizmo-noaudio.mp4^headers^

  huge-id3.mp3

  huge-id3.mp3^headers^

  id3tags.mp3
@@ -887,10 +885,11 @@ tags = webvtt 
[test_fragment_play.html]



[test_background_video_suspend.html]

tags = suspend

[test_background_video_suspend_ends.html]

skip-if = (os == 'win' && os_version == '5.1')

tags = suspend

[test_background_video_no_suspend_short_vid.html]

skip-if = (os == 'win' && os_version == '5.1')

tags = suspend

[test_background_video_no_suspend_disabled.html]

skip-if = (os == 'win' && os_version == '5.1')

tags = suspend

dom/media/test/test_background_video_no_suspend_short_vid.html

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ startTest({ 
    // Gizmo.mp4 is about 5.6s

    [ 'media.suspend-bkgnd-video.delay-ms', 10000 ]

  ],

  tests: gDecodeSuspendTests,

  tests: [ { name: "gizmo.mp4" } ],

  runTest: (test, token) => {

    let v = appendVideoToDoc(test.name, token);

    manager.started(token);