Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce

* changes:
  Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
  Allow prefetch for cache, reducing priority for prefetched images.

2 files changed, 149 insertions, 3 deletions

diff --git a/src/com/android/photos/data/BitmapDecoder.java b/src/com/android/photos/data/BitmapDecoder.java
new file mode 100644
index 000000000..a0ab4105a
--- /dev/null
+++ b/src/com/android/photos/data/BitmapDecoder.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.photos.data;
+
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.BitmapFactory;
+import android.util.Log;
+import android.util.Pools.Pool;
+import android.util.Pools.SynchronizedPool;
+
+import com.android.gallery3d.common.Utils;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * BitmapDecoder keeps a pool of temporary storage to reuse for decoding
+ * bitmaps. It also simplifies the multi-stage decoding required to efficiently
+ * use GalleryBitmapPool. The static methods decode and decodeFile can be used
+ * to decode a bitmap from GalleryBitmapPool. The bitmap may be returned
+ * directly to GalleryBitmapPool or use the put method here when the bitmap is
+ * ready to be recycled.
+ */
+public class BitmapDecoder {
+    private static final String TAG = BitmapDecoder.class.getSimpleName();
+    private static final int POOL_SIZE = 4;
+    private static final int TEMP_STORAGE_SIZE_BYTES = 16 * 1024;
+    private static final int HEADER_MAX_SIZE = 16 * 1024;
+
+    private static final Pool<BitmapFactory.Options> sOptions =
+            new SynchronizedPool<BitmapFactory.Options>(POOL_SIZE);
+
+    public static Bitmap decode(InputStream in) {
+        BitmapFactory.Options opts = getOptions();
+        try {
+            if (!in.markSupported()) {
+                in = new BufferedInputStream(in);
+            }
+            opts.inJustDecodeBounds = true;
+            in.mark(HEADER_MAX_SIZE);
+            BitmapFactory.decodeStream(in, null, opts);
+            in.reset();
+            opts.inJustDecodeBounds = false;
+            GalleryBitmapPool pool = GalleryBitmapPool.getInstance();
+            Bitmap reuseBitmap = pool.get(opts.outWidth, opts.outHeight);
+            opts.inBitmap = reuseBitmap;
+            Bitmap decodedBitmap = BitmapFactory.decodeStream(in, null, opts);
+            if (reuseBitmap != null && decodedBitmap != reuseBitmap) {
+                pool.put(reuseBitmap);
+            }
+            return decodedBitmap;
+        } catch (IOException e) {
+            Log.e(TAG, "Could not decode stream to bitmap", e);
+            return null;
+        } finally {
+            Utils.closeSilently(in);
+            release(opts);
+        }
+    }
+
+    public static Bitmap decode(File in) {
+        return decodeFile(in.toString());
+    }
+
+    public static Bitmap decodeFile(String in) {
+        BitmapFactory.Options opts = getOptions();
+        try {
+            opts.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(in, opts);
+            opts.inJustDecodeBounds = false;
+            GalleryBitmapPool pool = GalleryBitmapPool.getInstance();
+            Bitmap reuseBitmap = pool.get(opts.outWidth, opts.outHeight);
+            opts.inBitmap = reuseBitmap;
+            Bitmap decodedBitmap = BitmapFactory.decodeFile(in, opts);
+            if (reuseBitmap != null && decodedBitmap != reuseBitmap) {
+                pool.put(reuseBitmap);
+            }
+            return decodedBitmap;
+        } finally {
+            release(opts);
+        }
+    }
+
+    public static void put(Bitmap bitmap) {
+        GalleryBitmapPool.getInstance().put(bitmap);
+    }
+
+    private static BitmapFactory.Options getOptions() {
+        BitmapFactory.Options opts = sOptions.acquire();
+        if (opts == null) {
+            opts = new BitmapFactory.Options();
+            opts.inMutable = true;
+            opts.inPreferredConfig = Config.ARGB_8888;
+            opts.inSampleSize = 1;
+            opts.inTempStorage = new byte[TEMP_STORAGE_SIZE_BYTES];
+        }
+
+        return opts;
+    }
+
+    private static void release(BitmapFactory.Options opts) {
+        opts.inBitmap = null;
+        opts.inJustDecodeBounds = false;
+        sOptions.release(opts);
+    }
+}
diff --git a/src/com/android/photos/data/MediaCache.java b/src/com/android/photos/data/MediaCache.java
index 9cf69d643..0952a4017 100644
--- a/src/com/android/photos/data/MediaCache.java
+++ b/src/com/android/photos/data/MediaCache.java
@@ -107,6 +107,8 @@ public class MediaCache {
         void notifyReady();
 
         void setFile(File file) throws FileNotFoundException;
+
+        boolean isPrefetch();
     }
 
     private static class NotifyOriginalReady implements NotifyReady {
@@ -119,13 +121,20 @@ public class MediaCache {
 
         @Override
         public void notifyReady() {
-            mCallback.originalReady(mFile);
+            if (mCallback != null) {
+                mCallback.originalReady(mFile);
+            }
         }
 
         @Override
         public void setFile(File file) {
             mFile = file;
         }
+
+        @Override
+        public boolean isPrefetch() {
+            return mCallback == null;
+        }
     }
 
     private static class NotifyImageReady implements NotifyReady {
@@ -138,7 +147,9 @@ public class MediaCache {
 
         @Override
         public void notifyReady() {
-            mCallback.imageReady(mInputStream);
+            if (mCallback != null) {
+                mCallback.imageReady(mInputStream);
+            }
         }
 
         @Override
@@ -149,6 +160,11 @@ public class MediaCache {
         public void setBytes(byte[] bytes) {
             mInputStream = new ByteArrayInputStream(bytes);
         }
+
+        @Override
+        public boolean isPrefetch() {
+            return mCallback == null;
+        }
     }
 
     /** A media item to be retrieved and its notifications. */
@@ -496,7 +512,15 @@ public class MediaCache {
             }
             synchronized (tasks) {
                 ProcessingJob job = new ProcessingJob(uri, size, complete, lowResolution);
-                tasks.add(job);
+                if (complete.isPrefetch()) {
+                    tasks.add(job);
+                } else {
+                    int index = tasks.size() - 1;
+                    while (index >= 0 && tasks.get(index).complete.isPrefetch()) {
+                        index--;
+                    }
+                    tasks.add(index + 1, job);
+                }
                 tasks.notifyAll();
             }
         }