From da4de5aa86b49be455efe396455b77be44dec684 Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Mon, 28 Jan 2013 16:36:46 -0800 Subject: Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle Change-Id: I9416fca47a334d532a347cd5577795738c870933 --- .../filtershow/cache/FilteringPipeline.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/com/android/gallery3d/filtershow/cache') diff --git a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java index d415250a4..69f91aca0 100644 --- a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java +++ b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java @@ -22,11 +22,16 @@ import android.os.Process; import android.support.v8.renderscript.*; import android.util.Log; +import com.android.gallery3d.filtershow.filters.FilterRepresentation; +import com.android.gallery3d.filtershow.filters.ImageFilter; import com.android.gallery3d.filtershow.filters.ImageFilterRS; +import com.android.gallery3d.filtershow.filters.ImageFilterVignette; import com.android.gallery3d.filtershow.imageshow.GeometryMetadata; import com.android.gallery3d.filtershow.imageshow.MasterImage; import com.android.gallery3d.filtershow.presets.ImagePreset; +import java.util.HashMap; + public class FilteringPipeline implements Handler.Callback { private final static FilteringPipeline gPipeline = new FilteringPipeline(); @@ -235,17 +240,12 @@ public class FilteringPipeline implements Handler.Callback { } private void compute(TripleBufferBitmap buffer, ImagePreset preset, int type) { - String thread = Thread.currentThread().getName(); - if (type == COMPUTE_PRESET && preset.same(mPreviousPreset)) { - mPreviousPreset.usePreset(preset); - preset = mPreviousPreset; - } else if (type == COMPUTE_GEOMETRY_PRESET && preset.same(mPreviousGeometryPreset)) { - mPreviousGeometryPreset.usePreset(preset); - preset = mPreviousGeometryPreset; - } else if (type == COMPUTE_FILTERS_PRESET && preset.same(mPreviousFiltersPreset)) { - mPreviousFiltersPreset.usePreset(preset); - preset = mPreviousFiltersPreset; + if (DEBUG) { + Log.v(LOGTAG, "compute preset " + preset); + preset.showFilters(); } + + String thread = Thread.currentThread().getName(); long time = System.currentTimeMillis(); if (updateOriginalAllocation(preset)) { buffer.updateBitmaps(mResizedOriginalBitmap); -- cgit v1.2.3