Remove MagicFilterFactory

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>

library/src/main/java/com/seu/magicfilter/advanced/MagicAmaroFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicAmaroFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicBrannanFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicBrannanFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicBrooklynFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicBrooklynFilter extends GPUImageFilter {

library/src/main/java/com/seu/magicfilter/advanced/MagicCalmFilter.java

@@ -8,7 +8,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicCalmFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicEarlyBirdFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicEarlyBirdFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicFreudFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicFreudFilter extends GPUImageFilter {

library/src/main/java/com/seu/magicfilter/advanced/MagicHealthyFilter.java

@@ -8,7 +8,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicHealthyFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicHefeFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicHefeFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicHudsonFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicHudsonFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicInkwellFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicInkwellFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicKevinFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicKevinFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicLomoFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicLomoFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicN1977Filter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicN1977Filter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicNashvilleFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicNashvilleFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicPixarFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicPixarFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicRiseFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicRiseFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicSierraFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicSierraFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicSunriseFilter.java

@@ -8,7 +8,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicSunriseFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicSunsetFilter.java

@@ -8,7 +8,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicSunsetFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicSutroFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicSutroFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicSweetsFilter.java

@@ -8,7 +8,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicSweetsFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicTenderFilter.java

@@ -8,7 +8,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicTenderFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicToasterFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicToasterFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicValenciaFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicValenciaFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicWaldenFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicWaldenFilter extends GPUImageFilter {

library/src/main/java/com/seu/magicfilter/advanced/MagicWarmFilter.java

@@ -8,7 +8,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicWarmFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/advanced/MagicXproIIFilter.java

@@ -6,7 +6,6 @@ import com.seu.magicfilter.utils.MagicFilterType;
 import net.ossrs.yasea.R;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
 public class MagicXproIIFilter extends GPUImageFilter{

library/src/main/java/com/seu/magicfilter/utils/MagicFilterFactory.java

@@ -1,165 +0,0 @@
-package com.seu.magicfilter.utils;
-
-import android.content.Context;
-
-import com.seu.magicfilter.advanced.MagicAmaroFilter;
-import com.seu.magicfilter.advanced.MagicAntiqueFilter;
-import com.seu.magicfilter.advanced.MagicBeautyFilter;
-import com.seu.magicfilter.advanced.MagicBlackCatFilter;
-import com.seu.magicfilter.advanced.MagicBrannanFilter;
-import com.seu.magicfilter.advanced.MagicBrooklynFilter;
-import com.seu.magicfilter.advanced.MagicCalmFilter;
-import com.seu.magicfilter.advanced.MagicCoolFilter;
-import com.seu.magicfilter.advanced.MagicCrayonFilter;
-import com.seu.magicfilter.advanced.MagicEarlyBirdFilter;
-import com.seu.magicfilter.advanced.MagicEmeraldFilter;
-import com.seu.magicfilter.advanced.MagicEvergreenFilter;
-import com.seu.magicfilter.advanced.MagicFreudFilter;
-import com.seu.magicfilter.advanced.MagicHealthyFilter;
-import com.seu.magicfilter.advanced.MagicHefeFilter;
-import com.seu.magicfilter.advanced.MagicHudsonFilter;
-import com.seu.magicfilter.advanced.MagicImageAdjustFilter;
-import com.seu.magicfilter.advanced.MagicInkwellFilter;
-import com.seu.magicfilter.advanced.MagicKevinFilter;
-import com.seu.magicfilter.advanced.MagicLatteFilter;
-import com.seu.magicfilter.advanced.MagicLomoFilter;
-import com.seu.magicfilter.advanced.MagicN1977Filter;
-import com.seu.magicfilter.advanced.MagicNashvilleFilter;
-import com.seu.magicfilter.advanced.MagicNostalgiaFilter;
-import com.seu.magicfilter.advanced.MagicPixarFilter;
-import com.seu.magicfilter.advanced.MagicRiseFilter;
-import com.seu.magicfilter.advanced.MagicRomanceFilter;
-import com.seu.magicfilter.advanced.MagicSakuraFilter;
-import com.seu.magicfilter.advanced.MagicSierraFilter;
-import com.seu.magicfilter.advanced.MagicSketchFilter;
-import com.seu.magicfilter.advanced.MagicSkinWhitenFilter;
-import com.seu.magicfilter.advanced.MagicSunriseFilter;
-import com.seu.magicfilter.advanced.MagicSunsetFilter;
-import com.seu.magicfilter.advanced.MagicSutroFilter;
-import com.seu.magicfilter.advanced.MagicSweetsFilter;
-import com.seu.magicfilter.advanced.MagicTenderFilter;
-import com.seu.magicfilter.advanced.MagicToasterFilter;
-import com.seu.magicfilter.advanced.MagicValenciaFilter;
-import com.seu.magicfilter.advanced.MagicWaldenFilter;
-import com.seu.magicfilter.advanced.MagicWarmFilter;
-import com.seu.magicfilter.advanced.MagicWhiteCatFilter;
-import com.seu.magicfilter.advanced.MagicXproIIFilter;
-import com.seu.magicfilter.base.MagicLookupFilter;
-import com.seu.magicfilter.base.gpuimage.GPUImageBrightnessFilter;
-import com.seu.magicfilter.base.gpuimage.GPUImageContrastFilter;
-import com.seu.magicfilter.base.gpuimage.GPUImageExposureFilter;
-import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.base.gpuimage.GPUImageHueFilter;
-import com.seu.magicfilter.base.gpuimage.GPUImageSaturationFilter;
-import com.seu.magicfilter.base.gpuimage.GPUImageSharpenFilter;
-
-public class MagicFilterFactory{
-
-    public static GPUImageFilter initFilters(MagicFilterType type) {
-        switch (type) {
-            case NONE:
-                return new GPUImageFilter();
-            case WHITECAT:
-                return new MagicWhiteCatFilter();
-            case BLACKCAT:
-                return new MagicBlackCatFilter();
-            case SKINWHITEN:
-                return new MagicSkinWhitenFilter();
-            case BEAUTY:
-                return new MagicBeautyFilter();
-            case ROMANCE:
-                return new MagicRomanceFilter();
-            case SAKURA:
-                return new MagicSakuraFilter();
-            case AMARO:
-                return new MagicAmaroFilter();
-            case WALDEN:
-                return new MagicWaldenFilter();
-            case ANTIQUE:
-                return new MagicAntiqueFilter();
-            case CALM:
-                return new MagicCalmFilter();
-            case BRANNAN:
-                return new MagicBrannanFilter();
-            case BROOKLYN:
-                return new MagicBrooklynFilter();
-            case EARLYBIRD:
-                return new MagicEarlyBirdFilter();
-            case FREUD:
-                return new MagicFreudFilter();
-            case HEFE:
-                return new MagicHefeFilter();
-            case HUDSON:
-                return new MagicHudsonFilter();
-            case INKWELL:
-                return new MagicInkwellFilter();
-            case KEVIN:
-                return new MagicKevinFilter();
-            case LOCKUP:
-                return new MagicLookupFilter("");
-            case LOMO:
-                return new MagicLomoFilter();
-            case N1977:
-                return new MagicN1977Filter();
-            case NASHVILLE:
-                return new MagicNashvilleFilter();
-            case PIXAR:
-                return new MagicPixarFilter();
-            case RISE:
-                return new MagicRiseFilter();
-            case SIERRA:
-                return new MagicSierraFilter();
-            case SUTRO:
-                return new MagicSutroFilter();
-            case TOASTER2:
-                return new MagicToasterFilter();
-            case VALENCIA:
-                return new MagicValenciaFilter();
-            case XPROII:
-                return new MagicXproIIFilter();
-            case EVERGREEN:
-                return new MagicEvergreenFilter();
-            case HEALTHY:
-                return new MagicHealthyFilter();
-            case COOL:
-                return new MagicCoolFilter();
-            case EMERALD:
-                return new MagicEmeraldFilter();
-            case LATTE:
-                return new MagicLatteFilter();
-            case WARM:
-                return new MagicWarmFilter();
-            case TENDER:
-                return new MagicTenderFilter();
-            case SWEETS:
-                return new MagicSweetsFilter();
-            case NOSTALGIA:
-                return new MagicNostalgiaFilter();
-            case SUNRISE:
-                return new MagicSunriseFilter();
-            case SUNSET:
-                return new MagicSunsetFilter();
-            case CRAYON:
-                return new MagicCrayonFilter();
-            case SKETCH:
-                return new MagicSketchFilter();
-            //image adjust
-            case BRIGHTNESS:
-                return new GPUImageBrightnessFilter();
-            case CONTRAST:
-                return new GPUImageContrastFilter();
-            case EXPOSURE:
-                return new GPUImageExposureFilter();
-            case HUE:
-                return new GPUImageHueFilter();
-            case SATURATION:
-                return new GPUImageSaturationFilter();
-            case SHARPEN:
-                return new GPUImageSharpenFilter();
-            case IMAGE_ADJUST:
-                return new MagicImageAdjustFilter();
-            default:
-                return null;
-        }
-    }
-}

library/src/main/java/net/ossrs/yasea/SrsCameraView.java

@@ -8,11 +8,9 @@ import android.hardware.Camera;
 import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
 import android.opengl.Matrix;
-import android.os.Build;
 import android.util.AttributeSet;
 
 import com.seu.magicfilter.base.gpuimage.GPUImageFilter;
-import com.seu.magicfilter.utils.MagicFilterFactory;
 import com.seu.magicfilter.utils.MagicFilterType;
 import com.seu.magicfilter.utils.OpenGLUtils;
 
@@ -167,12 +165,10 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
                 if (magicFilter != null) {
                     magicFilter.destroy();
                 }
-                magicFilter = MagicFilterFactory.initFilters(type);
+                magicFilter = new GPUImageFilter(type);
-                if (magicFilter != null) {
+                magicFilter.init(getContext().getApplicationContext());
-                    magicFilter.init(getContext().getApplicationContext());
+                magicFilter.onInputSizeChanged(mPreviewWidth, mPreviewHeight);
-                    magicFilter.onInputSizeChanged(mPreviewWidth, mPreviewHeight);
+                magicFilter.onDisplaySizeChanged(mSurfaceWidth, mSurfaceHeight);
-                    magicFilter.onDisplaySizeChanged(mSurfaceWidth, mSurfaceHeight);
-                }
             }
         });
         requestRender();
@@ -193,10 +189,10 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
 
     public void setCameraId(int id) {
         mCamId = id;
-        setPreviewOrientation(mPreviewOrientation);
+        setPreviewRotation(mPreviewOrientation);
     }
 
-    public void setPreviewOrientation(int orientation) {
+    public void setPreviewRotation(int orientation) {
         mPreviewOrientation = orientation;
         Camera.CameraInfo info = new Camera.CameraInfo();
         Camera.getCameraInfo(mCamId, info);
@@ -204,14 +200,14 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
             if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
                 mPreviewRotation = info.orientation % 360;
                 mPreviewRotation = (360 - mPreviewRotation) % 360;  // compensate the mirror
-            } else {  // back-facing
+            } else {
                 mPreviewRotation = (info.orientation + 360) % 360;
             }
         } else if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
             if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
                 mPreviewRotation = (info.orientation + 90) % 360;
                 mPreviewRotation = (360 - mPreviewRotation) % 360;  // compensate the mirror
-            } else {  // back-facing
+            } else {
                 mPreviewRotation = (info.orientation + 270) % 360;
             }
         }