Bug 810137 - Device Storage filter out video formats that we do not support. r=padenot
authorDoug Turner <dougt@dougt.org>
Sun, 11 Nov 2012 22:46:32 -0800
changeset 112985 907883fa76f192b4e77d21c847823b00cbc278f0
parent 112984 447ab08591afe523ebc9634de3dd8237044bf114
child 112986 dbf9eb83be72e1daaa553fffa10e41d671c01eb2
push id23847
push userphilringnalda@gmail.com
push dateTue, 13 Nov 2012 05:07:25 +0000
treeherdermozilla-central@1b0226622e94 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspadenot
bugs810137
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 810137 - Device Storage filter out video formats that we do not support. r=padenot
dom/devicestorage/test/test_app_permissions.html
toolkit/content/devicestorage.properties
--- a/dom/devicestorage/test/test_app_permissions.html
+++ b/dom/devicestorage/test/test_app_permissions.html
@@ -236,18 +236,18 @@ var gData = [
     type: 'pictures',
     mimeType: 'image/png',
     fileExtension: '.png',
     shouldPass: false,
     test: TestAdd
   },
   {
     type: 'videos',
-    mimeType: 'video/ogm',
-    fileExtension: '.ogm',
+    mimeType: 'video/ogv',
+    fileExtension: '.ogv',
     shouldPass: false,
     test: TestAdd
   },
   {
     type: 'music',
     mimeType: 'audio/ogg',
     fileExtension: '.ogg',
     shouldPass: false,
@@ -269,18 +269,18 @@ var gData = [
     shouldPass: true,
 
     permissions: ["device-storage:pictures"],
 
     test: TestAdd
   },
   {
     type: 'videos',
-    mimeType: 'video/ogm',
-    fileExtension: '.ogm',
+    mimeType: 'video/ogv',
+    fileExtension: '.ogv',
     shouldPass: true,
 
     permissions: ["device-storage:videos"],
 
     test: TestAdd
   },
   {
     type: 'music',
@@ -312,18 +312,18 @@ var gData = [
 
     app: "https://example.com/manifest_cert.webapp",
     permissions: ["device-storage:pictures"],
 
     test: TestAdd
   },
   {
     type: 'videos',
-    mimeType: 'video/ogm',
-    fileExtension: '.ogm',
+    mimeType: 'video/ogv',
+    fileExtension: '.ogv',
     shouldPass: true,
 
     app: "https://example.com/manifest_cert.webapp",
     permissions: ["device-storage:videos"],
 
     test: TestAdd
   },
   {
--- a/toolkit/content/devicestorage.properties
+++ b/toolkit/content/devicestorage.properties
@@ -1,4 +1,4 @@
 # Extensions we recognize for DeviceStorage storage areas
 pictures=*.jpe; *.jpg; *.jpeg; *.gif; *.png; *.bmp;
 music=*.mp3; *.ogg; *.m4a; *.m4b; *.m4p; *.m4v; *.m4r; *.3gp; *.mp4; *.aac; *.m3u; *.pls;
-videos=*.avi; *.divx; *.flv; *.m4v; *.mkv; *.mov; *.mp4; *.mpeg; *.mpg; *.ogm; *.ogv; *.ogx; *.rm; *.rmvb; *.smil; *.webm; *.wmv; *.xvid; *.3gp; *.ogg;
+videos=*.mp4; *.mpeg; *.mpg; *.ogv; *.ogx; *.webm; *.3gp; *.ogg;