Merge "Avoid reading HW bitmap pixels twice" into oc-dev

am: afe23b9b53

Change-Id: If844553df8ef3516880c51dad93edce49146fb70
This commit is contained in:
Jorim Jaggi
2017-05-04 00:23:24 +00:00
committed by android-build-merger

View File

@@ -24,6 +24,7 @@ import android.annotation.TestApi;
import android.app.ActivityManager.TaskSnapshot; import android.app.ActivityManager.TaskSnapshot;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat; import android.graphics.Bitmap.CompressFormat;
import android.graphics.Bitmap.Config;
import android.os.Process; import android.os.Process;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.ArraySet; import android.util.ArraySet;
@@ -266,12 +267,13 @@ class TaskSnapshotPersister {
final File file = getBitmapFile(mTaskId, mUserId); final File file = getBitmapFile(mTaskId, mUserId);
final File reducedFile = getReducedResolutionBitmapFile(mTaskId, mUserId); final File reducedFile = getReducedResolutionBitmapFile(mTaskId, mUserId);
final Bitmap bitmap = Bitmap.createHardwareBitmap(mSnapshot.getSnapshot()); final Bitmap bitmap = Bitmap.createHardwareBitmap(mSnapshot.getSnapshot());
final Bitmap reduced = Bitmap.createScaledBitmap(bitmap, final Bitmap swBitmap = bitmap.copy(Config.ARGB_8888, false /* isMutable */);
final Bitmap reduced = Bitmap.createScaledBitmap(swBitmap,
(int) (bitmap.getWidth() * REDUCED_SCALE), (int) (bitmap.getWidth() * REDUCED_SCALE),
(int) (bitmap.getHeight() * REDUCED_SCALE), true /* filter */); (int) (bitmap.getHeight() * REDUCED_SCALE), true /* filter */);
try { try {
FileOutputStream fos = new FileOutputStream(file); FileOutputStream fos = new FileOutputStream(file);
bitmap.compress(JPEG, QUALITY, fos); swBitmap.compress(JPEG, QUALITY, fos);
fos.close(); fos.close();
FileOutputStream reducedFos = new FileOutputStream(reducedFile); FileOutputStream reducedFos = new FileOutputStream(reducedFile);
reduced.compress(JPEG, QUALITY, reducedFos); reduced.compress(JPEG, QUALITY, reducedFos);