Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-06 00:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to fx-team

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-11-20 16:47:21 +01:00
commit c3ef043951
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/media/test/manifest.js
View File

@ -68,7 +68,7 @@ var gLongerTests = [
// during resource download.
var gProgressTests = [
{ name:"r11025_u8_c1.wav", type:"audio/x-wav", duration:1.0, size:11069 },
{ name:"big.wav", type:"audio/x-wav", duration:9.278981, size:102444 },
{ name:"big.wav", type:"audio/x-wav", duration:9.278982, size:102444 },
{ name:"seek.ogv", type:"video/ogg", duration:3.966, size:285310 },
{ name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.266, size:28942 },
{ name:"seek.webm", type:"video/webm", duration:3.966, size:215529 },
@ -115,7 +115,7 @@ var gPausedAfterEndedTests = gSmallTests.concat([
// Test the mozHasAudio property, and APIs that detect different kinds of
// tracks
var gTrackTests = [
{ name:"big.wav", type:"audio/x-wav", duration:9.278981, size:102444, hasAudio:true, hasVideo:false },
{ name:"big.wav", type:"audio/x-wav", duration:9.278982, size:102444, 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.webm", type:"video/webm", duration:3.966, size:215529, hasAudio:false, hasVideo:true },
@ -267,7 +267,7 @@ var gPlayTests = [
// A file for each type we can support.
var gSnifferTests = [
{ name:"big.wav", type:"audio/x-wav", duration:9.278981, size:102444 },
{ 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 },
@ -560,7 +560,7 @@ var gDecodeErrorTests = [
// These are files that are used for media fragments tests
var gFragmentTests = [
{ name:"big.wav", type:"audio/x-wav", duration:9.278981, size:102444 }
{ name:"big.wav", type:"audio/x-wav", duration:9.278982, size:102444 }
];
// Used by test_chaining.html. The |links| attributes is the number of links in

2
dom/media/test/test_fragment_play.html
View File

@ -23,7 +23,7 @@ var gFragmentParams = [
{ fragment: "#t=3,3", start: null, end: null },
{ fragment: "#t=7,3", start: null, end: null },
{ fragment: "#t=7,15", start: 7, end: null },
{ fragment: "#t=15,20", start: 9.287981, end: null },
{ fragment: "#t=15,20", start: 9.287982, end: null },
{ fragment: "#t=5", start: 5, end: null },
{ fragment: "#t=5.5", start: 5.5, end: null },
{ fragment: "#t=5,", start: null, end: null },