X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcom%2Fandroid%2Fgallery3d%2Ffiltershow%2Fpipeline%2FCachingPipeline.java;h=2923e3bbb73015175db9f69682cdf5f78492291e;hb=406b6867ca1173e269e2c1adb557b97c0c30b3b6;hp=0794277b00e43a4a110f55c691b340b993b06750;hpb=473b5f07ec24426d07fe0c7d0db58d6401d25477;p=android-x86%2Fpackages-apps-Gallery2.git diff --git a/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java b/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java index 0794277b0..2923e3bbb 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java +++ b/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java @@ -19,10 +19,16 @@ package com.android.gallery3d.filtershow.pipeline; import android.content.Context; import android.content.res.Resources; import android.graphics.Bitmap; -import android.support.v8.renderscript.Allocation; -import android.support.v8.renderscript.RenderScript; +import android.graphics.Canvas; +import android.graphics.Matrix; +import android.graphics.Paint; +import android.graphics.Rect; +import android.graphics.RectF; +import android.renderscript.Allocation; +import android.renderscript.RenderScript; import android.util.Log; +import com.android.gallery3d.filtershow.cache.BitmapCache; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FiltersManager; @@ -177,6 +183,9 @@ public class CachingPipeline implements PipelineInterface { } private synchronized boolean updateOriginalAllocation(ImagePreset preset) { + if (preset == null) { + return false; + } Bitmap originalBitmap = mOriginalBitmap; if (originalBitmap == null) { @@ -214,25 +223,72 @@ public class CachingPipeline implements PipelineInterface { if (bitmap == null) { return; } - bitmap = mEnvironment.getBitmapCopy(bitmap); + bitmap = mEnvironment.getBitmapCopy(bitmap, BitmapCache.HIGHRES); bitmap = preset.applyGeometry(bitmap, mEnvironment); mEnvironment.setQuality(FilterEnvironment.QUALITY_PREVIEW); Bitmap bmp = preset.apply(bitmap, mEnvironment); if (!mEnvironment.needsStop()) { request.setBitmap(bmp); + } else { + mEnvironment.cache(bmp); + } + mFiltersManager.freeFilterResources(preset); + } + } + + public void renderGeometry(RenderingRequest request) { + synchronized (CachingPipeline.class) { + if (getRenderScriptContext() == null) { + return; + } + ImagePreset preset = request.getImagePreset(); + setupEnvironment(preset, false); + Bitmap bitmap = MasterImage.getImage().getOriginalBitmapHighres(); + if (bitmap == null) { + return; + } + bitmap = mEnvironment.getBitmapCopy(bitmap, BitmapCache.GEOMETRY); + bitmap = preset.applyGeometry(bitmap, mEnvironment); + if (!mEnvironment.needsStop()) { + request.setBitmap(bitmap); + } else { + mEnvironment.cache(bitmap); + } + mFiltersManager.freeFilterResources(preset); + } + } + + public void renderFilters(RenderingRequest request) { + synchronized (CachingPipeline.class) { + if (getRenderScriptContext() == null) { + return; + } + ImagePreset preset = request.getImagePreset(); + setupEnvironment(preset, false); + Bitmap bitmap = MasterImage.getImage().getOriginalBitmapHighres(); + if (bitmap == null) { + return; + } + bitmap = mEnvironment.getBitmapCopy(bitmap, BitmapCache.FILTERS); + bitmap = preset.apply(bitmap, mEnvironment); + if (!mEnvironment.needsStop()) { + request.setBitmap(bitmap); + } else { + mEnvironment.cache(bitmap); } mFiltersManager.freeFilterResources(preset); } } public synchronized void render(RenderingRequest request) { + // TODO: cleanup/remove GEOMETRY / FILTERS paths synchronized (CachingPipeline.class) { if (getRenderScriptContext() == null) { return; } - if (((request.getType() != RenderingRequest.PARTIAL_RENDERING - && request.getType() != RenderingRequest.HIGHRES_RENDERING) + if ((request.getType() != RenderingRequest.PARTIAL_RENDERING + && request.getType() != RenderingRequest.ICON_RENDERING && request.getBitmap() == null) || request.getImagePreset() == null) { return; @@ -244,14 +300,13 @@ public class CachingPipeline implements PipelineInterface { Bitmap bitmap = request.getBitmap(); ImagePreset preset = request.getImagePreset(); - setupEnvironment(preset, - request.getType() != RenderingRequest.HIGHRES_RENDERING); + setupEnvironment(preset, true); mFiltersManager.freeFilterResources(preset); if (request.getType() == RenderingRequest.PARTIAL_RENDERING) { MasterImage master = MasterImage.getImage(); bitmap = ImageLoader.getScaleOneImageForPreset(master.getActivity(), - mEnvironment, + mEnvironment.getBimapCache(), master.getUri(), request.getBounds(), request.getDestination()); if (bitmap == null) { @@ -260,20 +315,13 @@ public class CachingPipeline implements PipelineInterface { } } - if (request.getType() == RenderingRequest.HIGHRES_RENDERING) { - bitmap = MasterImage.getImage().getOriginalBitmapHighres(); - if (bitmap != null) { - bitmap = preset.applyGeometry(bitmap, mEnvironment); - } - } - if (request.getType() == RenderingRequest.FULL_RENDERING || request.getType() == RenderingRequest.GEOMETRY_RENDERING || request.getType() == RenderingRequest.FILTERS_RENDERING) { updateOriginalAllocation(preset); } - if (DEBUG) { + if (DEBUG && bitmap != null) { Log.v(LOGTAG, "after update, req bitmap (" + bitmap.getWidth() + "x" + bitmap.getHeight() + " ? resizeOriginal (" + mResizedOriginalBitmap.getWidth() + "x" + mResizedOriginalBitmap.getHeight()); @@ -290,7 +338,6 @@ public class CachingPipeline implements PipelineInterface { || request.getType() == RenderingRequest.FILTERS_RENDERING || request.getType() == RenderingRequest.ICON_RENDERING || request.getType() == RenderingRequest.PARTIAL_RENDERING - || request.getType() == RenderingRequest.HIGHRES_RENDERING || request.getType() == RenderingRequest.STYLE_ICON_RENDERING) { if (request.getType() == RenderingRequest.ICON_RENDERING) { @@ -299,6 +346,29 @@ public class CachingPipeline implements PipelineInterface { mEnvironment.setQuality(FilterEnvironment.QUALITY_PREVIEW); } + if (request.getType() == RenderingRequest.ICON_RENDERING) { + Rect iconBounds = request.getIconBounds(); + Bitmap source = MasterImage.getImage().getThumbnailBitmap(); + if (iconBounds.width() > source.getWidth() * 2) { + source = MasterImage.getImage().getLargeThumbnailBitmap(); + } + if (iconBounds != null) { + bitmap = mEnvironment.getBitmap(iconBounds.width(), + iconBounds.height(), BitmapCache.ICON); + Canvas canvas = new Canvas(bitmap); + Matrix m = new Matrix(); + float minSize = Math.min(source.getWidth(), source.getHeight()); + float maxSize = Math.max(iconBounds.width(), iconBounds.height()); + float scale = maxSize / minSize; + m.setScale(scale, scale); + float dx = (iconBounds.width() - (source.getWidth() * scale))/2.0f; + float dy = (iconBounds.height() - (source.getHeight() * scale))/2.0f; + m.postTranslate(dx, dy); + canvas.drawBitmap(source, m, new Paint(Paint.FILTER_BITMAP_FLAG)); + } else { + bitmap = mEnvironment.getBitmapCopy(source, BitmapCache.ICON); + } + } Bitmap bmp = preset.apply(bitmap, mEnvironment); if (!mEnvironment.needsStop()) { request.setBitmap(bmp); @@ -349,60 +419,9 @@ public class CachingPipeline implements PipelineInterface { } setupEnvironment(preset, false); Vector filters = preset.getFilters(); - mEnvironment.cache(buffer.getProducer()); // the producer bitmap isn't needed anymore Bitmap result = mCachedProcessing.process(mOriginalBitmap, filters, mEnvironment); buffer.setProducer(result); - } - - public synchronized void computeOld(SharedBuffer buffer, ImagePreset preset, int type) { - synchronized (CachingPipeline.class) { - if (getRenderScriptContext() == null) { - return; - } - if (DEBUG) { - Log.v(LOGTAG, "compute preset " + preset); - preset.showFilters(); - } - - String thread = Thread.currentThread().getName(); - long time = System.currentTimeMillis(); - setupEnvironment(preset, false); - mFiltersManager.freeFilterResources(preset); - - Bitmap resizedOriginalBitmap = mResizedOriginalBitmap; - if (updateOriginalAllocation(preset) || buffer.getProducer() == null) { - resizedOriginalBitmap = mResizedOriginalBitmap; - buffer.setProducer(resizedOriginalBitmap); - mEnvironment.cache(buffer.getProducer()); - } - - Bitmap bitmap = buffer.getProducer().getBitmap(); - long time2 = System.currentTimeMillis(); - - if (bitmap == null || (bitmap.getWidth() != resizedOriginalBitmap.getWidth()) - || (bitmap.getHeight() != resizedOriginalBitmap.getHeight())) { - mEnvironment.cache(buffer.getProducer()); - buffer.setProducer(resizedOriginalBitmap); - bitmap = buffer.getProducer().getBitmap(); - } - mOriginalAllocation.copyTo(bitmap); - - Bitmap tmpbitmap = preset.apply(bitmap, mEnvironment); - if (tmpbitmap != bitmap) { - mEnvironment.cache(buffer.getProducer()); - buffer.setProducer(tmpbitmap); - } - - mFiltersManager.freeFilterResources(preset); - - time = System.currentTimeMillis() - time; - time2 = System.currentTimeMillis() - time2; - if (DEBUG) { - Log.v(LOGTAG, "Applying type " + type + " filters to bitmap " - + bitmap + " (" + bitmap.getWidth() + " x " + bitmap.getHeight() - + ") took " + time + " ms, " + time2 + " ms for the filter, on thread " + thread); - } - } + mEnvironment.cache(result); } public boolean needsRepaint() {