Move classes to pipeline package

Change-Id: I9d664537d845d9daeb352c8006d0296a3f546dca

5 files changed, 2 insertions, 205 deletions

diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
index d36bafd43..c78bc1ef4 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.gallery3d.filtershow.presets;
+package com.android.gallery3d.filtershow.pipeline;
 
 import android.graphics.Bitmap;
 import android.graphics.Rect;
@@ -24,7 +24,6 @@ import android.util.JsonWriter;
 import android.util.Log;
 
 import com.android.gallery3d.R;
-import com.android.gallery3d.filtershow.cache.CachingPipeline;
 import com.android.gallery3d.filtershow.cache.ImageLoader;
 import com.android.gallery3d.filtershow.filters.BaseFiltersManager;
 import com.android.gallery3d.filtershow.filters.FilterFxRepresentation;
@@ -41,7 +40,6 @@ import com.android.gallery3d.util.UsageStatistics;
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.util.ArrayList;
 import java.util.Vector;
 
 public class ImagePreset {
diff --git a/src/com/android/gallery3d/filtershow/pipeline/SharedPreset.java b/src/com/android/gallery3d/filtershow/pipeline/SharedPreset.java
index e87469458..3f850fed2 100644
--- a/src/com/android/gallery3d/filtershow/pipeline/SharedPreset.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/SharedPreset.java
@@ -16,8 +16,6 @@
 
 package com.android.gallery3d.filtershow.pipeline;
 
-import com.android.gallery3d.filtershow.presets.ImagePreset;
-
 public class SharedPreset {
 
     private volatile ImagePreset mProducerPreset = null;
diff --git a/src/com/android/gallery3d/filtershow/presets/FilterEnvironment.java b/src/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
deleted file mode 100644
index 6a130a3e3..000000000
--- a/src/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * 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.gallery3d.filtershow.presets;
-
-import android.graphics.Bitmap;
-import android.support.v8.renderscript.Allocation;
-
-import com.android.gallery3d.filtershow.filters.FilterRepresentation;
-import com.android.gallery3d.filtershow.filters.FiltersManagerInterface;
-import com.android.gallery3d.filtershow.filters.ImageFilter;
-import com.android.gallery3d.filtershow.pipeline.Buffer;
-
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-
-public class FilterEnvironment {
-    private static final String LOGTAG = "FilterEnvironment";
-    private ImagePreset mImagePreset;
-    private float mScaleFactor;
-    private int mQuality;
-    private FiltersManagerInterface mFiltersManager;
-    private PipelineInterface mPipeline;
-    private volatile boolean mStop = false;
-
-    public static final int QUALITY_ICON = 0;
-    public static final int QUALITY_PREVIEW = 1;
-    public static final int QUALITY_FINAL = 2;
-
-    public synchronized boolean needsStop() {
-        return mStop;
-    }
-
-    public synchronized void setStop(boolean stop) {
-        this.mStop = stop;
-    }
-
-    private HashMap<Long, WeakReference<Bitmap>>
-            bitmapCach = new HashMap<Long, WeakReference<Bitmap>>();
-
-    private HashMap<Integer, Integer>
-                    generalParameters = new HashMap<Integer, Integer>();
-
-    public void cache(Buffer buffer) {
-        if (buffer == null) {
-            return;
-        }
-        Bitmap bitmap = buffer.getBitmap();
-        if (bitmap == null) {
-            return;
-        }
-        Long key = calcKey(bitmap.getWidth(), bitmap.getHeight());
-        bitmapCach.put(key, new WeakReference<Bitmap>(bitmap));
-    }
-
-    public Bitmap getBitmap(int w, int h) {
-        Long key = calcKey(w, h);
-        WeakReference<Bitmap> ref = bitmapCach.remove(key);
-        Bitmap bitmap = null;
-        if (ref != null) {
-            bitmap = ref.get();
-        }
-        if (bitmap == null) {
-            bitmap = Bitmap.createBitmap(
-                    w, h, Bitmap.Config.ARGB_8888);
-        }
-        return bitmap;
-    }
-
-    private Long calcKey(long w, long h) {
-        return (w << 32) | (h << 32);
-    }
-
-    public void setImagePreset(ImagePreset imagePreset) {
-        mImagePreset = imagePreset;
-    }
-
-    public ImagePreset getImagePreset() {
-        return mImagePreset;
-    }
-
-    public void setScaleFactor(float scaleFactor) {
-        mScaleFactor = scaleFactor;
-    }
-
-    public float getScaleFactor() {
-        return mScaleFactor;
-    }
-
-    public void setQuality(int quality) {
-        mQuality = quality;
-    }
-
-    public int getQuality() {
-        return mQuality;
-    }
-
-    public void setFiltersManager(FiltersManagerInterface filtersManager) {
-        mFiltersManager = filtersManager;
-    }
-
-    public FiltersManagerInterface getFiltersManager() {
-        return mFiltersManager;
-    }
-
-    public void applyRepresentation(FilterRepresentation representation,
-                                    Allocation in, Allocation out) {
-        ImageFilter filter = mFiltersManager.getFilterForRepresentation(representation);
-        filter.useRepresentation(representation);
-        filter.setEnvironment(this);
-        if (filter.supportsAllocationInput()) {
-            filter.apply(in, out);
-        }
-        filter.setGeneralParameters();
-        filter.setEnvironment(null);
-    }
-
-    public Bitmap applyRepresentation(FilterRepresentation representation, Bitmap bitmap) {
-        ImageFilter filter = mFiltersManager.getFilterForRepresentation(representation);
-        filter.useRepresentation(representation);
-        filter.setEnvironment(this);
-        Bitmap ret = filter.apply(bitmap, mScaleFactor, mQuality);
-        filter.setGeneralParameters();
-        filter.setEnvironment(null);
-        return ret;
-    }
-
-    public PipelineInterface getPipeline() {
-        return mPipeline;
-    }
-
-    public void setPipeline(PipelineInterface cachingPipeline) {
-        mPipeline = cachingPipeline;
-    }
-
-    public synchronized void clearGeneralParameters() {
-        generalParameters = null;
-    }
-
-    public synchronized Integer getGeneralParameter(int id) {
-        if (generalParameters == null || !generalParameters.containsKey(id)) {
-            return null;
-        }
-        return generalParameters.get(id);
-    }
-
-    public synchronized void setGeneralParameter(int id, int value) {
-        if (generalParameters == null) {
-            generalParameters = new HashMap<Integer, Integer>();
-        }
-
-        generalParameters.put(id, value);
-    }
-
-}
diff --git a/src/com/android/gallery3d/filtershow/presets/PipelineInterface.java b/src/com/android/gallery3d/filtershow/presets/PipelineInterface.java
deleted file mode 100644
index 05f0a1aa8..000000000
--- a/src/com/android/gallery3d/filtershow/presets/PipelineInterface.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.gallery3d.filtershow.presets;
-
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.RenderScript;
-
-public interface PipelineInterface {
-    public String getName();
-    public Resources getResources();
-    public Allocation getInPixelsAllocation();
-    public Allocation getOutPixelsAllocation();
-    public boolean prepareRenderscriptAllocations(Bitmap bitmap);
-    public RenderScript getRSContext();
-}
diff --git a/src/com/android/gallery3d/filtershow/tools/XmpPresets.java b/src/com/android/gallery3d/filtershow/tools/XmpPresets.java
index be75f0253..3995eeb85 100644
--- a/src/com/android/gallery3d/filtershow/tools/XmpPresets.java
+++ b/src/com/android/gallery3d/filtershow/tools/XmpPresets.java
@@ -26,7 +26,7 @@ import com.adobe.xmp.XMPMetaFactory;
 import com.android.gallery3d.R;
 import com.android.gallery3d.common.Utils;
 import com.android.gallery3d.filtershow.imageshow.MasterImage;
-import com.android.gallery3d.filtershow.presets.ImagePreset;
+import com.android.gallery3d.filtershow.pipeline.ImagePreset;
 import com.android.gallery3d.util.XmpUtilHelper;
 
 import java.io.File;