diff options
Diffstat (limited to 'media/mca')
80 files changed, 6 insertions, 329 deletions
diff --git a/media/mca/effect/java/android/media/effect/EffectContext.java b/media/mca/effect/java/android/media/effect/EffectContext.java index ef03229d658d..a11b9c4873f5 100644 --- a/media/mca/effect/java/android/media/effect/EffectContext.java +++ b/media/mca/effect/java/android/media/effect/EffectContext.java @@ -19,10 +19,7 @@ package android.media.effect; import android.filterfw.core.CachedFrameManager; import android.filterfw.core.FilterContext; -import android.filterfw.core.FilterFactory; import android.filterfw.core.GLEnvironment; -import android.filterfw.core.GLFrame; -import android.filterfw.core.FrameManager; import android.opengl.GLES20; /** diff --git a/media/mca/effect/java/android/media/effect/EffectFactory.java b/media/mca/effect/java/android/media/effect/EffectFactory.java index 4330279da899..f6fcba71e339 100644 --- a/media/mca/effect/java/android/media/effect/EffectFactory.java +++ b/media/mca/effect/java/android/media/effect/EffectFactory.java @@ -18,7 +18,6 @@ package android.media.effect; import java.lang.reflect.Constructor; -import java.util.HashMap; /** * <p>The EffectFactory class defines the list of available Effects, and provides functionality to diff --git a/media/mca/effect/java/android/media/effect/FilterEffect.java b/media/mca/effect/java/android/media/effect/FilterEffect.java index d7c319ea6adc..34b35496ec65 100644 --- a/media/mca/effect/java/android/media/effect/FilterEffect.java +++ b/media/mca/effect/java/android/media/effect/FilterEffect.java @@ -17,10 +17,7 @@ package android.media.effect; -import android.filterfw.core.CachedFrameManager; import android.filterfw.core.FilterContext; -import android.filterfw.core.FilterFactory; -import android.filterfw.core.GLEnvironment; import android.filterfw.core.GLFrame; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; diff --git a/media/mca/effect/java/android/media/effect/FilterGraphEffect.java b/media/mca/effect/java/android/media/effect/FilterGraphEffect.java index b18bea8efce0..80c695bde82c 100644 --- a/media/mca/effect/java/android/media/effect/FilterGraphEffect.java +++ b/media/mca/effect/java/android/media/effect/FilterGraphEffect.java @@ -19,17 +19,13 @@ 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. diff --git a/media/mca/effect/java/android/media/effect/SingleFilterEffect.java b/media/mca/effect/java/android/media/effect/SingleFilterEffect.java index 6f85861034ef..47900dfcfd5a 100644 --- a/media/mca/effect/java/android/media/effect/SingleFilterEffect.java +++ b/media/mca/effect/java/android/media/effect/SingleFilterEffect.java @@ -21,11 +21,8 @@ import android.filterfw.core.Filter; import android.filterfw.core.FilterFactory; import android.filterfw.core.FilterFunction; import android.filterfw.core.Frame; -import android.media.effect.Effect; import android.media.effect.EffectContext; -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. diff --git a/media/mca/effect/java/android/media/effect/SizeChangeEffect.java b/media/mca/effect/java/android/media/effect/SizeChangeEffect.java index 4d27baeac4ab..1bf7d4005531 100644 --- a/media/mca/effect/java/android/media/effect/SizeChangeEffect.java +++ b/media/mca/effect/java/android/media/effect/SizeChangeEffect.java @@ -16,15 +16,9 @@ package android.media.effect; -import android.filterfw.core.Filter; -import android.filterfw.core.FilterFactory; -import android.filterfw.core.FilterFunction; import android.filterfw.core.Frame; -import android.media.effect.Effect; import android.media.effect.EffectContext; -import android.util.Log; - /** * Effect subclass for effects based on a single Filter with output size differnet * from input. Subclasses need only invoke the constructor with the correct arguments diff --git a/media/mca/effect/java/android/media/effect/effects/CropEffect.java b/media/mca/effect/java/android/media/effect/effects/CropEffect.java index 3e8d78a385b9..7e1c495a584f 100644 --- a/media/mca/effect/java/android/media/effect/effects/CropEffect.java +++ b/media/mca/effect/java/android/media/effect/effects/CropEffect.java @@ -19,7 +19,6 @@ package android.media.effect.effects; import android.media.effect.EffectContext; import android.media.effect.SizeChangeEffect; -import android.media.effect.SingleFilterEffect; import android.filterpacks.imageproc.CropRectFilter; /** diff --git a/media/mca/filterfw/java/android/filterfw/FilterFunctionEnvironment.java b/media/mca/filterfw/java/android/filterfw/FilterFunctionEnvironment.java index 3f36d9822285..feaf6e822d98 100644 --- a/media/mca/filterfw/java/android/filterfw/FilterFunctionEnvironment.java +++ b/media/mca/filterfw/java/android/filterfw/FilterFunctionEnvironment.java @@ -20,7 +20,6 @@ package android.filterfw; import android.filterfw.core.Filter; import android.filterfw.core.FilterFactory; import android.filterfw.core.FilterFunction; -import android.filterfw.core.Frame; import android.filterfw.core.FrameManager; /** diff --git a/media/mca/filterfw/java/android/filterfw/core/AsyncRunner.java b/media/mca/filterfw/java/android/filterfw/core/AsyncRunner.java index 70cbad4c9f2c..819774adf388 100644 --- a/media/mca/filterfw/java/android/filterfw/core/AsyncRunner.java +++ b/media/mca/filterfw/java/android/filterfw/core/AsyncRunner.java @@ -18,17 +18,9 @@ package android.filterfw.core; import android.os.AsyncTask; -import android.os.Handler; import android.util.Log; -import java.lang.InterruptedException; -import java.lang.Runnable; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.TimeUnit; - /** * @hide */ diff --git a/media/mca/filterfw/java/android/filterfw/core/Filter.java b/media/mca/filterfw/java/android/filterfw/core/Filter.java index 73b009d580cd..062b6bacc617 100644 --- a/media/mca/filterfw/java/android/filterfw/core/Filter.java +++ b/media/mca/filterfw/java/android/filterfw/core/Filter.java @@ -33,7 +33,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map.Entry; -import java.util.LinkedList; import java.util.Set; /** diff --git a/media/mca/filterfw/java/android/filterfw/core/Frame.java b/media/mca/filterfw/java/android/filterfw/core/Frame.java index ef8c542f6751..7dd078327a09 100644 --- a/media/mca/filterfw/java/android/filterfw/core/Frame.java +++ b/media/mca/filterfw/java/android/filterfw/core/Frame.java @@ -20,7 +20,6 @@ package android.filterfw.core; import android.filterfw.core.FrameFormat; import android.filterfw.core.FrameManager; import android.graphics.Bitmap; -import android.util.Log; import java.nio.ByteBuffer; diff --git a/media/mca/filterfw/java/android/filterfw/core/NativeFrame.java b/media/mca/filterfw/java/android/filterfw/core/NativeFrame.java index bfd09bae2fd6..7d1553f54a5e 100644 --- a/media/mca/filterfw/java/android/filterfw/core/NativeFrame.java +++ b/media/mca/filterfw/java/android/filterfw/core/NativeFrame.java @@ -24,8 +24,6 @@ import android.filterfw.core.GLFrame; import android.filterfw.core.NativeBuffer; import android.graphics.Bitmap; -import android.util.Log; - import java.nio.ByteBuffer; /** diff --git a/media/mca/filterfw/java/android/filterfw/core/OneShotScheduler.java b/media/mca/filterfw/java/android/filterfw/core/OneShotScheduler.java index dbc8d162e34c..83c475f9ce32 100644 --- a/media/mca/filterfw/java/android/filterfw/core/OneShotScheduler.java +++ b/media/mca/filterfw/java/android/filterfw/core/OneShotScheduler.java @@ -18,7 +18,6 @@ package android.filterfw.core; import android.filterfw.core.Filter; -import android.filterfw.core.Scheduler; import android.filterfw.core.RoundRobinScheduler; import android.util.Log; diff --git a/media/mca/filterfw/java/android/filterfw/core/SerializedFrame.java b/media/mca/filterfw/java/android/filterfw/core/SerializedFrame.java index f493fd2536ee..35ba04fdb893 100644 --- a/media/mca/filterfw/java/android/filterfw/core/SerializedFrame.java +++ b/media/mca/filterfw/java/android/filterfw/core/SerializedFrame.java @@ -20,7 +20,6 @@ package android.filterfw.core; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.FrameManager; -import android.filterfw.core.NativeBuffer; import android.filterfw.format.ObjectFormat; import android.graphics.Bitmap; @@ -28,10 +27,7 @@ import java.io.InputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.OptionalDataException; import java.io.OutputStream; -import java.io.StreamCorruptedException; -import java.lang.reflect.Constructor; import java.nio.ByteBuffer; /** diff --git a/media/mca/filterfw/java/android/filterfw/core/SimpleFrame.java b/media/mca/filterfw/java/android/filterfw/core/SimpleFrame.java index 534a30d99615..7ddd1d455773 100644 --- a/media/mca/filterfw/java/android/filterfw/core/SimpleFrame.java +++ b/media/mca/filterfw/java/android/filterfw/core/SimpleFrame.java @@ -20,11 +20,9 @@ package android.filterfw.core; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.FrameManager; -import android.filterfw.core.NativeBuffer; import android.filterfw.format.ObjectFormat; import android.graphics.Bitmap; -import java.lang.reflect.Constructor; import java.nio.ByteBuffer; /** diff --git a/media/mca/filterfw/native/core/gl_env.cpp b/media/mca/filterfw/native/core/gl_env.cpp index 84dad8ca70ee..c9d33da58a09 100644 --- a/media/mca/filterfw/native/core/gl_env.cpp +++ b/media/mca/filterfw/native/core/gl_env.cpp @@ -162,9 +162,12 @@ bool GLEnv::InitWithNewContext() { } // Create dummy surface using a GLConsumer - sp<BufferQueue> bq = new BufferQueue(); - surfaceTexture_ = new GLConsumer(bq, 0); - window_ = new Surface(static_cast<sp<IGraphicBufferProducer> >(bq)); + sp<IGraphicBufferProducer> producer; + sp<IGraphicBufferConsumer> consumer; + BufferQueue::createBufferQueue(&producer, &consumer); + surfaceTexture_ = new GLConsumer(consumer, 0, GLConsumer::TEXTURE_EXTERNAL, + true, false); + window_ = new Surface(producer); surfaces_[0] = SurfaceWindowPair(eglCreateWindowSurface(display(), config, window_.get(), NULL), NULL); if (CheckEGLError("eglCreateWindowSurface")) return false; diff --git a/media/mca/filterpacks/java/android/filterpacks/base/CallbackFilter.java b/media/mca/filterpacks/java/android/filterpacks/base/CallbackFilter.java index 41853433fac7..4a47fa4f3fc4 100644 --- a/media/mca/filterpacks/java/android/filterpacks/base/CallbackFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/base/CallbackFilter.java @@ -20,13 +20,8 @@ package android.filterpacks.base; import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; -import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GenerateFinalPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; -import android.filterfw.core.Program; import android.os.Handler; import android.os.Looper; diff --git a/media/mca/filterpacks/java/android/filterpacks/base/FrameBranch.java b/media/mca/filterpacks/java/android/filterpacks/base/FrameBranch.java index 6b8cbc7e232b..f909c3fc8fb8 100644 --- a/media/mca/filterpacks/java/android/filterpacks/base/FrameBranch.java +++ b/media/mca/filterpacks/java/android/filterpacks/base/FrameBranch.java @@ -22,7 +22,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFinalPort; -import android.filterfw.core.KeyValueMap; /** * @hide diff --git a/media/mca/filterpacks/java/android/filterpacks/base/FrameFetch.java b/media/mca/filterpacks/java/android/filterpacks/base/FrameFetch.java index 518b837755bf..87d8f0bd0be8 100644 --- a/media/mca/filterpacks/java/android/filterpacks/base/FrameFetch.java +++ b/media/mca/filterpacks/java/android/filterpacks/base/FrameFetch.java @@ -24,8 +24,6 @@ import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GenerateFinalPort; -import android.util.Log; - /** * @hide */ diff --git a/media/mca/filterpacks/java/android/filterpacks/base/FrameStore.java b/media/mca/filterpacks/java/android/filterpacks/base/FrameStore.java index 3aadaac9b8d5..05ac50d6164d 100644 --- a/media/mca/filterpacks/java/android/filterpacks/base/FrameStore.java +++ b/media/mca/filterpacks/java/android/filterpacks/base/FrameStore.java @@ -20,7 +20,6 @@ package android.filterpacks.base; import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; -import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; /** diff --git a/media/mca/filterpacks/java/android/filterpacks/base/GLTextureSource.java b/media/mca/filterpacks/java/android/filterpacks/base/GLTextureSource.java index 17768204ad05..af61d9a600bf 100644 --- a/media/mca/filterpacks/java/android/filterpacks/base/GLTextureSource.java +++ b/media/mca/filterpacks/java/android/filterpacks/base/GLTextureSource.java @@ -23,11 +23,8 @@ import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GLFrame; -import android.filterfw.core.MutableFrameFormat; import android.filterfw.format.ImageFormat; -import java.util.Set; - /** * @hide */ diff --git a/media/mca/filterpacks/java/android/filterpacks/base/GLTextureTarget.java b/media/mca/filterpacks/java/android/filterpacks/base/GLTextureTarget.java index b2285cd5312d..91bb41730cb5 100644 --- a/media/mca/filterpacks/java/android/filterpacks/base/GLTextureTarget.java +++ b/media/mca/filterpacks/java/android/filterpacks/base/GLTextureTarget.java @@ -23,11 +23,8 @@ import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GLFrame; -import android.filterfw.core.MutableFrameFormat; import android.filterfw.format.ImageFormat; -import java.util.Set; - /** * @hide */ diff --git a/media/mca/filterpacks/java/android/filterpacks/base/InputStreamSource.java b/media/mca/filterpacks/java/android/filterpacks/base/InputStreamSource.java index 6c22ee75da9c..0ef90556570a 100644 --- a/media/mca/filterpacks/java/android/filterpacks/base/InputStreamSource.java +++ b/media/mca/filterpacks/java/android/filterpacks/base/InputStreamSource.java @@ -23,7 +23,6 @@ import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GenerateFinalPort; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; import android.filterfw.format.PrimitiveFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/base/NullFilter.java b/media/mca/filterpacks/java/android/filterpacks/base/NullFilter.java index f3e08e4f3aa8..73434d470339 100644 --- a/media/mca/filterpacks/java/android/filterpacks/base/NullFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/base/NullFilter.java @@ -19,8 +19,6 @@ package android.filterpacks.base; import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; -import android.filterfw.core.Frame; -import android.filterfw.core.FrameFormat; /** * @hide diff --git a/media/mca/filterpacks/java/android/filterpacks/base/ObjectSource.java b/media/mca/filterpacks/java/android/filterpacks/base/ObjectSource.java index d511e4420293..78e2b501597e 100644 --- a/media/mca/filterpacks/java/android/filterpacks/base/ObjectSource.java +++ b/media/mca/filterpacks/java/android/filterpacks/base/ObjectSource.java @@ -17,15 +17,12 @@ package android.filterpacks.base; -import java.util.Set; - import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GenerateFinalPort; -import android.filterfw.core.MutableFrameFormat; import android.filterfw.format.ObjectFormat; /** diff --git a/media/mca/filterpacks/java/android/filterpacks/base/OutputStreamTarget.java b/media/mca/filterpacks/java/android/filterpacks/base/OutputStreamTarget.java index 3d3d0f1810bd..fd65a9d14c48 100644 --- a/media/mca/filterpacks/java/android/filterpacks/base/OutputStreamTarget.java +++ b/media/mca/filterpacks/java/android/filterpacks/base/OutputStreamTarget.java @@ -20,7 +20,6 @@ package android.filterpacks.base; import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; -import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; import java.io.OutputStream; diff --git a/media/mca/filterpacks/java/android/filterpacks/base/RetargetFilter.java b/media/mca/filterpacks/java/android/filterpacks/base/RetargetFilter.java index 254167a18d51..0e988820fa06 100644 --- a/media/mca/filterpacks/java/android/filterpacks/base/RetargetFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/base/RetargetFilter.java @@ -21,9 +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.GenerateFieldPort; import android.filterfw.core.GenerateFinalPort; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; /** diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/AlphaBlendFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/AlphaBlendFilter.java index 473369cd2d14..c3cc282fe6f1 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/AlphaBlendFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/AlphaBlendFilter.java @@ -17,18 +17,9 @@ package android.filterpacks.imageproc; -import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; -import android.filterfw.core.Frame; -import android.filterfw.core.FrameFormat; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; -import android.filterfw.format.ImageFormat; - -import java.util.Set; /** * @hide diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/AutoFixFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/AutoFixFilter.java index c71c1c945fbd..ac83db2463f4 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/AutoFixFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/AutoFixFilter.java @@ -21,13 +21,10 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.NativeProgram; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.util.Log; - public class AutoFixFilter extends Filter { @GenerateFieldPort(name = "tile_size", hasDefault = true) diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/BitmapOverlayFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/BitmapOverlayFilter.java index e4bb6cf52dc8..92b177c7d374 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/BitmapOverlayFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/BitmapOverlayFilter.java @@ -21,17 +21,11 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.filterpacks.imageproc.ImageCombineFilter; import android.graphics.Bitmap; -import android.util.Log; - /** * @hide */ diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/BitmapSource.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/BitmapSource.java index 978fc9470710..89e872348923 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/BitmapSource.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/BitmapSource.java @@ -17,17 +17,11 @@ package android.filterpacks.imageproc; -import android.content.Context; import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; -import android.filterfw.core.FrameManager; -import android.filterfw.core.GenerateFinalPort; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeFrame; import android.filterfw.format.ImageFormat; import android.graphics.Bitmap; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/BlackWhiteFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/BlackWhiteFilter.java index 20b02d2fc891..38221b44a9d8 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/BlackWhiteFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/BlackWhiteFilter.java @@ -21,9 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/BlendFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/BlendFilter.java index 29bc8a3f9538..aff5e9ef1ab8 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/BlendFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/BlendFilter.java @@ -16,18 +16,9 @@ package android.filterpacks.imageproc; -import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; -import android.filterfw.core.Frame; -import android.filterfw.core.FrameFormat; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; -import android.filterfw.format.ImageFormat; - -import java.util.Set; /** * The filter linearly blends "left" and "right" frames. The blending weight is diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/BrightnessFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/BrightnessFilter.java index 046e69d4d950..bc62e1902935 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/BrightnessFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/BrightnessFilter.java @@ -17,13 +17,8 @@ package android.filterpacks.imageproc; -import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; -import android.filterfw.core.Frame; -import android.filterfw.core.FrameFormat; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/ColorTemperatureFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/ColorTemperatureFilter.java index 74889807e4f3..1d408be48d62 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/ColorTemperatureFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/ColorTemperatureFilter.java @@ -21,13 +21,9 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.util.Log; public class ColorTemperatureFilter extends Filter { diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/ContrastFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/ContrastFilter.java index 70e987f9a5a6..7043c72be667 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/ContrastFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/ContrastFilter.java @@ -17,18 +17,11 @@ package android.filterpacks.imageproc; -import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; -import android.filterfw.core.Frame; -import android.filterfw.core.FrameFormat; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; -import java.util.Set; - /** * @hide */ diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/CropFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/CropFilter.java index 5222d9cc29f6..0ef323cea205 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/CropFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/CropFilter.java @@ -22,19 +22,13 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; -import android.filterfw.geometry.Point; import android.filterfw.geometry.Quad; import android.filterfw.format.ImageFormat; import android.filterfw.format.ObjectFormat; -import android.util.Log; - /** * @hide */ diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/CropRectFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/CropRectFilter.java index d423d060e1bb..010ee21d50d7 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/CropRectFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/CropRectFilter.java @@ -21,14 +21,9 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.util.Log; /** * @hide diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/CrossProcessFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/CrossProcessFilter.java index e0514f880966..d565e65302ff 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/CrossProcessFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/CrossProcessFilter.java @@ -21,15 +21,10 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.util.Log; - public class CrossProcessFilter extends Filter { @GenerateFieldPort(name = "tile_size", hasDefault = true) diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/DocumentaryFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/DocumentaryFilter.java index f93a82c27b92..72745c0c7190 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/DocumentaryFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/DocumentaryFilter.java @@ -21,9 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/DrawOverlayFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/DrawOverlayFilter.java index 3f1711e523db..d10a6efde05c 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/DrawOverlayFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/DrawOverlayFilter.java @@ -21,17 +21,11 @@ import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; -import android.filterfw.core.GLFrame; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; -import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.geometry.Quad; import android.filterfw.format.ImageFormat; import android.filterfw.format.ObjectFormat; -import android.opengl.GLES20; - /** * @hide */ diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/DrawRectFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/DrawRectFilter.java index 83c934893163..b288e6eab37a 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/DrawRectFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/DrawRectFilter.java @@ -23,9 +23,6 @@ import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GLFrame; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; -import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.geometry.Quad; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/DuotoneFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/DuotoneFilter.java index d8c88ee8dc8d..ef82ee90e34b 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/DuotoneFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/DuotoneFilter.java @@ -21,9 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/FillLightFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/FillLightFilter.java index fc917a1acefd..c7fb55d362ff 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/FillLightFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/FillLightFilter.java @@ -21,10 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.GenerateFinalPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/FisheyeFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/FisheyeFilter.java index 5d7929f4114f..2ff65889e1ac 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/FisheyeFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/FisheyeFilter.java @@ -22,17 +22,11 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.util.Log; - import java.lang.Math; -import java.util.Set; /** * @hide diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/FixedRotationFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/FixedRotationFilter.java index 3d319eac66b2..340f3087ca3c 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/FixedRotationFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/FixedRotationFilter.java @@ -22,7 +22,6 @@ import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; import android.filterfw.geometry.Point; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/FlipFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/FlipFilter.java index f8b857b22076..68c760fc10b7 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/FlipFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/FlipFilter.java @@ -21,10 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/GrainFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/GrainFilter.java index 577243ae622e..528eaa2d88bb 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/GrainFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/GrainFilter.java @@ -21,14 +21,9 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.filterfw.geometry.Quad; -import android.filterfw.geometry.Point; import java.util.Date; import java.util.Random; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageCombineFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageCombineFilter.java index 858489b62e31..c9a6956d7d61 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageCombineFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageCombineFilter.java @@ -21,16 +21,10 @@ import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; -import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; import java.lang.reflect.Field; -import java.util.HashSet; -import java.util.Set; /** * @hide diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageEncoder.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageEncoder.java index a5405cbbd301..e8bf48275666 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageEncoder.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageEncoder.java @@ -17,21 +17,16 @@ package android.filterpacks.imageproc; -import android.content.Context; import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; import android.filterfw.format.ImageFormat; import android.graphics.Bitmap; import android.graphics.Bitmap.CompressFormat; -import android.util.Log; - import java.io.OutputStream; -import java.io.IOException; /** * @hide diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageSlicer.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageSlicer.java index b996eb89ee42..8bf80b2f9bc6 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageSlicer.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageSlicer.java @@ -20,9 +20,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.FrameManager; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageStitcher.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageStitcher.java index 20aba917fb94..5e3d15bbdd73 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageStitcher.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/ImageStitcher.java @@ -20,16 +20,12 @@ import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; -import android.filterfw.core.FrameManager; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.util.Log; - public class ImageStitcher extends Filter { @GenerateFieldPort(name = "xSlices") diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/Invert.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/Invert.java index 400fd5daae06..881e30f018d7 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/Invert.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/Invert.java @@ -17,12 +17,8 @@ package android.filterpacks.imageproc; -import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; -import android.filterfw.core.Frame; -import android.filterfw.core.FrameFormat; import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/LomoishFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/LomoishFilter.java index 726ffff2f6d5..4e53f926aeea 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/LomoishFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/LomoishFilter.java @@ -21,9 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/NegativeFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/NegativeFilter.java index 440d6a649ec5..f66fc2323175 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/NegativeFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/NegativeFilter.java @@ -21,9 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/PosterizeFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/PosterizeFilter.java index bc2e553b41cc..864d7e2e3ac1 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/PosterizeFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/PosterizeFilter.java @@ -21,9 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java index 861880496465..48b2fdf4252f 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java @@ -21,9 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; @@ -31,8 +28,6 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; -import android.graphics.PointF; -import android.util.Log; /** * @hide diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/ResizeFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/ResizeFilter.java index 411e061d1e15..c79c11bccf3d 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/ResizeFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/ResizeFilter.java @@ -23,10 +23,7 @@ import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GLFrame; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/RotateFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/RotateFilter.java index 3da79394660d..43d8d6c70fd0 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/RotateFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/RotateFilter.java @@ -22,16 +22,11 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; import android.filterfw.geometry.Quad; import android.filterfw.geometry.Point; -import android.util.Log; /** * @hide diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/SaturateFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/SaturateFilter.java index b83af392e50d..757fac1e3bd1 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/SaturateFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/SaturateFilter.java @@ -21,9 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/SepiaFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/SepiaFilter.java index 7a83fdf717f2..a9f4e2cf104b 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/SepiaFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/SepiaFilter.java @@ -21,9 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/SharpenFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/SharpenFilter.java index 256b769e13df..a2909967d6f9 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/SharpenFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/SharpenFilter.java @@ -21,15 +21,10 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import java.util.Set; - public class SharpenFilter extends Filter { @GenerateFieldPort(name = "scale", hasDefault = true) diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/SimpleImageFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/SimpleImageFilter.java index f4fc271ee4e7..afe92de690aa 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/SimpleImageFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/SimpleImageFilter.java @@ -21,16 +21,10 @@ import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; -import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; import java.lang.reflect.Field; -import java.util.HashSet; -import java.util.Set; /** * @hide diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/StraightenFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/StraightenFilter.java index c9f097d3e044..9db296b4bd29 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/StraightenFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/StraightenFilter.java @@ -22,16 +22,11 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; import android.filterfw.geometry.Quad; import android.filterfw.geometry.Point; -import android.util.Log; /** * @hide diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/TintFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/TintFilter.java index 0da54a51fc4a..2b140ba1e690 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/TintFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/TintFilter.java @@ -21,9 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/ToGrayFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/ToGrayFilter.java index 00e7bf47f9ba..760ce3a65b4c 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/ToGrayFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/ToGrayFilter.java @@ -17,23 +17,14 @@ package android.filterpacks.imageproc; -import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; -import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.util.Log; - -import java.lang.reflect.Field; - /** * @hide */ diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/ToPackedGrayFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/ToPackedGrayFilter.java index bc4a65e54089..3c121d0e8963 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/ToPackedGrayFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/ToPackedGrayFilter.java @@ -27,8 +27,6 @@ import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.util.Log; - import java.lang.Math; /** * @hide diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/ToRGBAFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/ToRGBAFilter.java index ab4814fd6942..f0084fa14bb0 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/ToRGBAFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/ToRGBAFilter.java @@ -21,16 +21,11 @@ import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; -import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.util.Log; - /** * @hide */ diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/ToRGBFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/ToRGBFilter.java index 9258502e2e73..bbb0fc378fea 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/ToRGBFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/ToRGBFilter.java @@ -21,16 +21,11 @@ import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; -import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.util.Log; - /** * @hide */ diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/VignetteFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/VignetteFilter.java index 715fec6cf70f..249cc6fbe7e0 100644 --- a/media/mca/filterpacks/java/android/filterpacks/imageproc/VignetteFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/VignetteFilter.java @@ -21,9 +21,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; diff --git a/media/mca/filterpacks/java/android/filterpacks/text/StringSource.java b/media/mca/filterpacks/java/android/filterpacks/text/StringSource.java index cc33b89c2638..2fe519fc556f 100644 --- a/media/mca/filterpacks/java/android/filterpacks/text/StringSource.java +++ b/media/mca/filterpacks/java/android/filterpacks/text/StringSource.java @@ -22,8 +22,6 @@ import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.KeyValueMap; -import android.filterfw.core.MutableFrameFormat; import android.filterfw.format.ObjectFormat; /** diff --git a/media/mca/filterpacks/java/android/filterpacks/ui/SurfaceRenderFilter.java b/media/mca/filterpacks/java/android/filterpacks/ui/SurfaceRenderFilter.java index a5c1ccbfa4d0..ba88736d7ad9 100644 --- a/media/mca/filterpacks/java/android/filterpacks/ui/SurfaceRenderFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/ui/SurfaceRenderFilter.java @@ -26,19 +26,11 @@ import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GenerateFinalPort; import android.filterfw.core.GLEnvironment; import android.filterfw.core.GLFrame; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; -import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; -import android.view.Surface; import android.view.SurfaceHolder; -import android.view.SurfaceView; - -import android.graphics.Rect; import android.util.Log; diff --git a/media/mca/filterpacks/java/android/filterpacks/ui/SurfaceTargetFilter.java b/media/mca/filterpacks/java/android/filterpacks/ui/SurfaceTargetFilter.java index 308d1686d806..05cb81b7a2c4 100644 --- a/media/mca/filterpacks/java/android/filterpacks/ui/SurfaceTargetFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/ui/SurfaceTargetFilter.java @@ -25,19 +25,11 @@ import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GenerateFinalPort; import android.filterfw.core.GLEnvironment; import android.filterfw.core.GLFrame; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; -import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; import android.view.Surface; -import android.view.SurfaceHolder; -import android.view.SurfaceView; - -import android.graphics.Rect; import android.util.Log; diff --git a/media/mca/filterpacks/java/android/filterpacks/videoproc/BackDropperFilter.java b/media/mca/filterpacks/java/android/filterpacks/videoproc/BackDropperFilter.java index 78f7f3ee1d94..a31ac2cfec8b 100644 --- a/media/mca/filterpacks/java/android/filterpacks/videoproc/BackDropperFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/videoproc/BackDropperFilter.java @@ -24,7 +24,6 @@ import android.filterfw.core.Frame; import android.filterfw.core.GLFrame; import android.filterfw.core.FrameFormat; import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; import android.opengl.GLES20; @@ -32,7 +31,6 @@ import android.os.SystemClock; import android.os.SystemProperties; import android.util.Log; -import java.lang.ArrayIndexOutOfBoundsException; import java.lang.Math; import java.util.Arrays; import java.nio.ByteBuffer; diff --git a/media/mca/filterpacks/java/android/filterpacks/videosink/MediaEncoderFilter.java b/media/mca/filterpacks/java/android/filterpacks/videosink/MediaEncoderFilter.java index 8bb653be9ae3..d0340515a780 100644 --- a/media/mca/filterpacks/java/android/filterpacks/videosink/MediaEncoderFilter.java +++ b/media/mca/filterpacks/java/android/filterpacks/videosink/MediaEncoderFilter.java @@ -17,32 +17,23 @@ package android.filterpacks.videosink; -import android.content.Context; import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; -import android.filterfw.core.FrameManager; import android.filterfw.core.GenerateFieldPort; -import android.filterfw.core.GenerateFinalPort; import android.filterfw.core.GLFrame; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeFrame; -import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; import android.filterfw.geometry.Point; import android.filterfw.geometry.Quad; -import android.os.ConditionVariable; import android.media.MediaRecorder; import android.media.CamcorderProfile; import android.filterfw.core.GLEnvironment; import java.io.IOException; import java.io.FileDescriptor; -import java.util.List; -import java.util.Set; import android.util.Log; diff --git a/media/mca/filterpacks/java/android/filterpacks/videosink/MediaRecorderStopException.java b/media/mca/filterpacks/java/android/filterpacks/videosink/MediaRecorderStopException.java index dbf97687f8b7..ce7a8c18d3c0 100644 --- a/media/mca/filterpacks/java/android/filterpacks/videosink/MediaRecorderStopException.java +++ b/media/mca/filterpacks/java/android/filterpacks/videosink/MediaRecorderStopException.java @@ -18,7 +18,6 @@ package android.filterpacks.videosink; import java.lang.RuntimeException; -import android.util.Log; /** @hide **/ public class MediaRecorderStopException extends RuntimeException { diff --git a/media/mca/filterpacks/java/android/filterpacks/videosrc/CameraSource.java b/media/mca/filterpacks/java/android/filterpacks/videosrc/CameraSource.java index 2c474abd196f..d2606848bcae 100644 --- a/media/mca/filterpacks/java/android/filterpacks/videosrc/CameraSource.java +++ b/media/mca/filterpacks/java/android/filterpacks/videosrc/CameraSource.java @@ -17,29 +17,22 @@ package android.filterpacks.videosrc; -import android.content.Context; import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; -import android.filterfw.core.FrameManager; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GenerateFinalPort; import android.filterfw.core.GLFrame; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeFrame; -import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; import android.graphics.SurfaceTexture; import android.hardware.Camera; -import android.os.ConditionVariable; import android.opengl.Matrix; import java.io.IOException; import java.util.List; -import java.util.Set; import android.util.Log; diff --git a/media/mca/filterpacks/java/android/filterpacks/videosrc/MediaSource.java b/media/mca/filterpacks/java/android/filterpacks/videosrc/MediaSource.java index 0be6c625752c..53a39a751f07 100644 --- a/media/mca/filterpacks/java/android/filterpacks/videosrc/MediaSource.java +++ b/media/mca/filterpacks/java/android/filterpacks/videosrc/MediaSource.java @@ -23,28 +23,20 @@ import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; -import android.filterfw.core.FrameManager; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GenerateFinalPort; import android.filterfw.core.GLFrame; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeFrame; -import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; import android.graphics.SurfaceTexture; import android.media.MediaPlayer; import android.net.Uri; -import android.os.ConditionVariable; import android.opengl.Matrix; import android.view.Surface; import java.io.IOException; -import java.io.FileDescriptor; import java.lang.IllegalArgumentException; -import java.util.List; -import java.util.Set; import android.util.Log; diff --git a/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureSource.java b/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureSource.java index 37fa2428adad..6595baa594d2 100644 --- a/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureSource.java +++ b/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureSource.java @@ -16,31 +16,20 @@ package android.filterpacks.videosrc; -import android.content.Context; -import android.content.res.AssetFileDescriptor; import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; -import android.filterfw.core.FrameManager; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GenerateFinalPort; import android.filterfw.core.GLFrame; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; import android.graphics.SurfaceTexture; -import android.media.MediaPlayer; import android.os.ConditionVariable; import android.opengl.Matrix; -import java.io.IOException; -import java.io.FileDescriptor; -import java.lang.IllegalArgumentException; -import java.util.List; -import java.util.Set; - import android.util.Log; /** <p>A filter that converts textures from a SurfaceTexture object into frames for diff --git a/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java b/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java index b6d9f9413190..5d036271fc5f 100644 --- a/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java +++ b/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java @@ -19,29 +19,19 @@ package android.filterpacks.videosrc; import android.filterfw.core.Filter; import android.filterfw.core.FilterContext; -import android.filterfw.core.FilterSurfaceView; import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.core.GenerateFieldPort; import android.filterfw.core.GenerateFinalPort; import android.filterfw.core.GLEnvironment; import android.filterfw.core.GLFrame; -import android.filterfw.core.KeyValueMap; import android.filterfw.core.MutableFrameFormat; -import android.filterfw.core.NativeProgram; -import android.filterfw.core.NativeFrame; -import android.filterfw.core.Program; import android.filterfw.core.ShaderProgram; import android.filterfw.format.ImageFormat; import android.filterfw.geometry.Quad; import android.filterfw.geometry.Point; -import android.view.Surface; -import android.view.SurfaceHolder; -import android.view.SurfaceView; - -import android.graphics.Rect; import android.graphics.SurfaceTexture; import android.util.Log; |