commit f6422563280a45dbee99f03a4f23da4cdd4ba910
author Wei-Ta Chen <weita@google.com> Wed Oct 14 21:10:05 2009 +0800
committer Wei-Ta Chen <weita@google.com> Mon Nov 16 22:54:04 2009 +0800
tree 4247a98befd8156e4e5032730c3e22e4bb11b513
parent aebcdb4a467406f04e20d9478e678b5357b0a8e2

Do not merge.

Cherry pick from Eclair-mr2: 05427c

Fix http://b/2154737 by setting the size of memory buffer used for jpeg decode in Skia.

src/images/SkImageDecoder_libjpeg.cpp

diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index cc0f8a9..2bb922a 100644
--- a/src/images/SkImageDecoder_libjpeg.cpp
+++ b/src/images/SkImageDecoder_libjpeg.cpp
@@ -29,6 +29,13 @@
     #include "jerror.h"
 }
 
+#ifdef ANDROID
+#include <cutils/properties.h>
+
+// Key to lookup the size of memory buffer set in system property
+static const char KEY_MEM_CAP[] = "ro.media.dec.jpeg.memcap";
+#endif
+
 // this enables timing code to report milliseconds for an encode
 //#define TIME_ENCODE
 //#define TIME_DECODE
@@ -191,6 +198,22 @@
 
 static void skmem_term_source(j_decompress_ptr /*cinfo*/) {}
 
+#ifdef ANDROID
+/* Check if the memory cap property is set.
+   If so, use the memory size for jpeg decode.
+*/
+static void overwrite_mem_buffer_size(j_decompress_ptr cinfo) {
+    int len = 0;
+    char value[PROPERTY_VALUE_MAX];
+    int memCap;
+
+    len = property_get(KEY_MEM_CAP, value, "");
+    if (len > 0 && sscanf(value, "%d", &memCap) == 1) {
+        cinfo->mem->max_memory_to_use = memCap;
+    }
+}
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 
 sk_source_mgr::sk_source_mgr(SkStream* stream, SkImageDecoder* decoder) : fStream(stream) {
@@ -286,6 +309,10 @@
     jpeg_create_decompress(&cinfo);
     autoClean.set(&cinfo);
 
+#ifdef ANDROID
+    overwrite_mem_buffer_size(&cinfo);
+#endif
+
     //jpeg_stdio_src(&cinfo, file);
     cinfo.src = &sk_stream;