Fix scaling + quality parameters
Change-Id: I92e7759282e0f3cc7be8ff95a19a4acb890d214d
diff --git a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
index a1dbe8e..eda10fc 100644
--- a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
+++ b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
@@ -37,6 +37,7 @@
private ImagePreset mPreviousGeometryPreset = null;
private ImagePreset mPreviousFiltersPreset = null;
private GeometryMetadata mPreviousGeometry = null;
+ private float mPreviewScaleFactor = 1.0f;
private Bitmap mOriginalBitmap = null;
private Bitmap mResizedOriginalBitmap = null;
@@ -218,6 +219,13 @@
Bitmap bitmap = buffer.getProducer();
long time2 = System.currentTimeMillis();
+ preset.setScaleFactor(mPreviewScaleFactor);
+ if (mPreviewScaleFactor < 1.0f) {
+ preset.setIsHighQuality(false);
+ } else {
+ preset.setIsHighQuality(true);
+ }
+
if (type != COMPUTE_FILTERS_PRESET) {
if (bitmap == null || (bitmap.getWidth() != mResizedOriginalBitmap.getWidth())
|| (bitmap.getHeight() != mResizedOriginalBitmap.getHeight())) {
@@ -295,4 +303,12 @@
}
return true;
}
+
+ public void setPreviewScaleFactor(float previewScaleFactor) {
+ mPreviewScaleFactor = previewScaleFactor;
+ }
+
+ public float getPreviewScaleFactor() {
+ return mPreviewScaleFactor;
+ }
}
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index 85d0977..ade775d 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -212,7 +212,10 @@
mOriginalBitmapLarge = rotateToPortrait(mOriginalBitmapLarge, mOrientation);
}
mZoomOrientation = mOrientation;
- FilteringPipeline.getPipeline().setOriginal(mOriginalBitmapLarge);
+ FilteringPipeline pipeline = FilteringPipeline.getPipeline();
+ pipeline.setOriginal(mOriginalBitmapLarge);
+ float previewScale = (float) mOriginalBitmapLarge.getWidth() / (float) getOriginalBounds().width();
+ pipeline.setPreviewScaleFactor(previewScale);
warnListeners();
}