Added FilterGraphEffect.

Make the texId in GLTextureTarget not final
Bug: 4966161

Change-Id: I0935194c957ef2c490d3661f4247ad1ea23a3512

diff --git a/mca/effect/java/android/media/effect/FilterGraphEffect.java b/mca/effect/java/android/media/effect/FilterGraphEffect.java
new file mode 100644 (file)
index 0000000..a4d698d
--- /dev/null
+++ b/mca/effect/java/android/media/effect/FilterGraphEffect.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2011 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 android.media.effect;
+
+import android.filterfw.core.Filter;
+import android.filterfw.core.FilterGraph;
+import android.filterfw.core.GraphRunner;
+import android.filterfw.core.SimpleScheduler;
+import android.filterfw.core.SyncRunner;
+import android.media.effect.Effect;
+import android.media.effect.FilterEffect;
+import android.media.effect.EffectContext;
+import android.filterfw.io.GraphIOException;
+import android.filterfw.io.GraphReader;
+import android.filterfw.io.TextGraphReader;
+
+import android.util.Log;
+
+/**
+ * Effect subclass for effects based on a single Filter. Subclasses need only invoke the
+ * constructor with the correct arguments to obtain an Effect implementation.
+ *
+ * @hide
+ */
+public class FilterGraphEffect extends FilterEffect {
+
+    private static final String TAG = "FilterGraphEffect";
+
+    protected String mInputName;
+    protected String mOutputName;
+    protected GraphRunner mRunner;
+    protected FilterGraph mGraph;
+    protected Class mSchedulerClass;
+
+    /**
+     * Constructs a new FilterGraphEffect.
+     *
+     * @param name The name of this effect (used to create it in the EffectFactory).
+     * @param graphString The graph string to create the graph.
+     * @param inputName The name of the input GLTextureSource filter.
+     * @param outputName The name of the output GLTextureSource filter.
+     */
+    public FilterGraphEffect(EffectContext context,
+                              String name,
+                              String graphString,
+                              String inputName,
+                              String outputName,
+                              Class scheduler) {
+        super(context, name);
+
+        mInputName = inputName;
+        mOutputName = outputName;
+        mSchedulerClass = scheduler;
+        createGraph(graphString);
+
+    }
+
+    private void createGraph(String graphString) {
+        GraphReader reader = new TextGraphReader();
+        try {
+            mGraph = reader.readGraphString(graphString);
+        } catch (GraphIOException e) {
+            throw new RuntimeException("Could not setup effect", e);
+        }
+
+        if (mGraph == null) {
+            throw new RuntimeException("Could not setup effect");
+        }
+        mRunner = new SyncRunner(getFilterContext(), mGraph, mSchedulerClass);
+    }
+
+    @Override
+    public void apply(int inputTexId, int width, int height, int outputTexId) {
+        mEffectContext.assertValidGLState();
+        mEffectContext.saveGLState();
+        Filter src = mGraph.getFilter(mInputName);
+        if (src != null) {
+            src.setInputValue("texId", inputTexId);
+            src.setInputValue("width", width);
+            src.setInputValue("height", height);
+        } else {
+            throw new RuntimeException("Internal error applying effect");
+        }
+        Filter dest  = mGraph.getFilter(mOutputName);
+        if (dest != null) {
+            dest.setInputValue("texId", outputTexId);
+        } else {
+            throw new RuntimeException("Internal error applying effect");
+        }
+        try {
+            mRunner.run();
+        } catch (RuntimeException e) {
+            throw new RuntimeException("Internal error applying effect: ", e);
+        }
+        mEffectContext.restoreGLState();
+    }
+
+    @Override
+    public void setParameter(String parameterKey, Object value) {
+    }
+
+    @Override
+    public void release() {
+         mGraph.tearDown(getFilterContext());
+         mGraph = null;
+    }
+}

diff --git a/mca/filterfw/java/android/filterfw/basefilters/GLTextureTarget.java b/mca/filterfw/java/android/filterfw/basefilters/GLTextureTarget.java
index 164af0b..b2285cd 100644 (file)
--- a/mca/filterfw/java/android/filterfw/basefilters/GLTextureTarget.java
+++ b/mca/filterfw/java/android/filterfw/basefilters/GLTextureTarget.java
@@ -21,7 +21,7 @@ import android.filterfw.core.Filter;
 import android.filterfw.core.FilterContext;
 import android.filterfw.core.Frame;
 import android.filterfw.core.FrameFormat;
-import android.filterfw.core.GenerateFinalPort;
+import android.filterfw.core.GenerateFieldPort;
 import android.filterfw.core.GLFrame;
 import android.filterfw.core.MutableFrameFormat;
 import android.filterfw.format.ImageFormat;
@@ -33,14 +33,9 @@ import java.util.Set;
  */
 public class GLTextureTarget extends Filter {
 
-    @GenerateFinalPort(name = "texId")
+    @GenerateFieldPort(name = "texId")
     private int mTexId;
 
-    @GenerateFinalPort(name = "createTex", hasDefault = true)
-    private boolean mCreateTex = false;
-
-    private Frame mFrame;
-
     public GLTextureTarget(String name) {
         super(name);
     }
@@ -55,28 +50,15 @@ public class GLTextureTarget extends Filter {
         // Get input frame
         Frame input = pullInput("frame");
 
-        // Generate frame if not generated already
-        // TODO: Check if size has changed
-        if (mFrame == null) {
-            FrameFormat format = ImageFormat.create(input.getFormat().getWidth(),
-                                                    input.getFormat().getHeight(),
-                                                    ImageFormat.COLORSPACE_RGBA,
-                                                    FrameFormat.TARGET_GPU);
+        FrameFormat format = ImageFormat.create(input.getFormat().getWidth(),
+                                                input.getFormat().getHeight(),
+                                                ImageFormat.COLORSPACE_RGBA,
+                                                FrameFormat.TARGET_GPU);
 
-            int binding = mCreateTex
-                ? GLFrame.NEW_TEXTURE_BINDING
-                : GLFrame.EXISTING_TEXTURE_BINDING;
-            mFrame = context.getFrameManager().newBoundFrame(format, binding, mTexId);
-        }
+        Frame frame = context.getFrameManager().newBoundFrame(format, GLFrame.EXISTING_TEXTURE_BINDING, mTexId);
 
         // Copy to our texture frame
-        mFrame.setDataFromFrame(input);
-    }
-
-    @Override
-    public void tearDown(FilterContext context) {
-        if (mFrame != null) {
-            mFrame.release();
-        }
+        frame.setDataFromFrame(input);
+        frame.release();
     }
 }