Merge pull request #19397 from justindarc/bug1006281-v1.4

Bug1006281 v1.4
mozilla-b2g · May 19, 2014 · 17b102e · 17b102e
2 parents 6edb703 + abaccdb
commit 17b102e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/apps/camera/js/controllers/camera.js b/apps/camera/js/controllers/camera.js
@@ -126,7 +126,12 @@ CameraController.prototype.onSettingsConfigured = function() {
   debug('camera configured with final settings');
 
   // TODO: Move to a new StorageController (or App?)
-  var maxFileSize = (pictureSize.width * pictureSize.height * 4) + 4096;
+  //
+  // It is very unlikely that a JPEG file will have a file size that is
+  // more than half a byte per pixel. There is some fixed EXIF overhead
+  // that is the same for small and large pictures, however, so we add
+  // an additional 25,000 bytes of padding.
+  var maxFileSize = (pictureSize.width * pictureSize.height / 2) + 25000;
   this.storage.setMaxFileSize(maxFileSize);
 };
 

diff --git a/apps/camera/test/unit/media_frame_test.js b/apps/camera/test/unit/media_frame_test.js
@@ -68,8 +68,8 @@ suite('Media Frame Unit Tests', function() {
       var preview = {
         'start': 1,
         'end': 2,
-        'width': 1000,
-        'height': 1000
+        'width': 1600,
+        'height': 1200
       };
       frame.displayImage(dummyBlob, 1600, 1200, preview, 0, false);
       assert.isTrue(frame.displayingPreview);