changed effect name to filters

pull/527/head
Suneet Agrawal 6 years ago
parent b15216b5b8
commit ef962ff269
  1. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java
  2. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteFilter.java
  3. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java
  4. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java
  5. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessFilter.java
  6. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/CustomFilter.java
  7. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java
  8. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java
  9. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java
  10. 134
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filters.java
  11. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java
  12. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java
  13. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/GreyScaleFilter.java
  14. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java
  15. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsFilter.java
  16. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/LamoishFilter.java
  17. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilter.java
  18. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeFilter.java
  19. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java
  20. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaFilter.java
  21. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java
  22. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java
  23. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java
  24. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java
  25. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java
  26. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java
  27. 90
      demo/src/main/java/com/otaliastudios/cameraview/demo/CameraActivity.java

@ -5,14 +5,14 @@ import androidx.annotation.NonNull;
/**
* Attempts to auto-fix the preview based on histogram equalization.
*/
public class AutoFixEffect extends Filter {
public class AutoFixFilter extends Filter {
private float scale = 1.0f;
/**
* Initialize Effect
*/
public AutoFixEffect() {
public AutoFixFilter() {
}
public float getScale() {

@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
/**
* Converts the preview into black and white colors
*/
public class BlackAndWhiteEffect extends Filter {
public class BlackAndWhiteFilter extends Filter {
/**
* Initialize effect
*/
public BlackAndWhiteEffect() {
public BlackAndWhiteFilter() {
}
@NonNull

@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
/**
* Adjusts the brightness of the preview.
*/
public class BrightnessEffect extends Filter {
public class BrightnessFilter extends Filter {
private float brightnessValue = 2.0f;
/**
* Initialize Effect
*/
public BrightnessEffect() {
public BrightnessFilter() {
}
/**

@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
/**
* Adjusts the contrast of the preview.
*/
public class ContrastEffect extends Filter {
public class ContrastFilter extends Filter {
private float contrast = 2.0f;
/**
* Initialize Effect
*/
public ContrastEffect() {
public ContrastFilter() {
}
/**

@ -6,12 +6,12 @@ import androidx.annotation.NonNull;
* Applies a cross process effect on preview, in which the red and green channels
* are enhanced while the blue channel is restricted.
*/
public class CrossProcessEffect extends Filter {
public class CrossProcessFilter extends Filter {
/**
* Initialize Effect
*/
public CrossProcessEffect() {
public CrossProcessFilter() {
}
@NonNull

@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
/**
* This class is to implement any custom effect.
*/
public class CustomEffect extends Filter {
public class CustomFilter extends Filter {
/**
* Parameterized constructor with vertex and fragment shader as parameter
@ -14,7 +14,7 @@ public class CustomEffect extends Filter {
* @param vertexShader
* @param fragmentShader
*/
public CustomEffect(String vertexShader, String fragmentShader) {
public CustomFilter(String vertexShader, String fragmentShader) {
this.mVertexShader = vertexShader;
this.mFragmentShader = fragmentShader;
}

@ -8,10 +8,10 @@ import java.util.Random;
/**
* Applies black and white documentary style effect on preview.
*/
public class DocumentaryEffect extends Filter {
public class DocumentaryFilter extends Filter {
private Random mRandom;
public DocumentaryEffect() {
public DocumentaryFilter() {
mRandom = new Random(new Date().getTime());
}

@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
/**
* Representation of preview using only two color tones.
*/
public class DuotoneEffect extends Filter {
public class DuotoneFilter extends Filter {
// Default values
private int mFirstColor = Color.MAGENTA;
private int mSecondColor = Color.YELLOW;
@ -15,7 +15,7 @@ public class DuotoneEffect extends Filter {
/**
* Initialize effect
*/
public DuotoneEffect() {
public DuotoneFilter() {
}
/**

@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
/**
* Applies back-light filling to the preview.
*/
public class FillLightEffect extends Filter {
public class FillLightFilter extends Filter {
private float strength = 0.5f;
/**
* Initialize Effect
*/
public FillLightEffect() {
public FillLightFilter() {
}
/**

@ -1,122 +1,122 @@
package com.otaliastudios.cameraview.filters;
public enum Filters {
NO_EFFECT,
AUTO_FIX_EFFECT,
BLACK_AND_WHITE_EFFECT,
BRIGHTNESS_EFFECT,
CONTRAST_EFFECT,
CROSS_PROCESS_EFFECT,
DOCUMENTARY_EFFECT,
DUO_TONE_COLOR_EFFECT,
FILL_LIGHT_EFFECT,
GAMMA_EFFECT,
GRAIN_EFFECT,
GREY_SCALE_EFFECT,
HUE_EFFECT,
INVERT_COLOR_EFFECT,
LAMOISH_EFFECT,
POSTERIZE_EFFECT,
SATURATION_EFFECT,
SEPIA_EFFECT,
SHARPNESS_EFFECT,
TEMPERATURE_EFFECT,
TINT_EFFECT,
VIGNETTE_EFFECT;
NO_FILTER,
AUTO_FIX_FILTER,
BLACK_AND_WHITE_FILTER,
BRIGHTNESS_FILTER,
CONTRAST_FILTER,
CROSS_PROCESS_FILTER,
DOCUMENTARY_FILTER,
DUO_TONE_COLOR_FILTER,
FILL_LIGHT_FILTER,
GAMMA_FILTER,
GRAIN_FILTER,
GREY_SCALE_FILTER,
HUE_FILTER,
INVERT_COLOR_FILTER,
LAMOISH_FILTER,
POSTERIZE_FILTER,
SATURATION_FILTER,
SEPIA_FILTER,
SHARPNESS_FILTER,
TEMPERATURE_FILTER,
TINT_FILTER,
VIGNETTE_FILTER;
public Filter newInstance() {
Filter shaderEffect;
switch (this) {
case AUTO_FIX_EFFECT:
shaderEffect = new AutoFixEffect();
case AUTO_FIX_FILTER:
shaderEffect = new AutoFixFilter();
break;
case BLACK_AND_WHITE_EFFECT:
shaderEffect = new BlackAndWhiteEffect();
case BLACK_AND_WHITE_FILTER:
shaderEffect = new BlackAndWhiteFilter();
break;
case BRIGHTNESS_EFFECT:
shaderEffect = new BrightnessEffect();
case BRIGHTNESS_FILTER:
shaderEffect = new BrightnessFilter();
break;
case CONTRAST_EFFECT:
shaderEffect = new ContrastEffect();
case CONTRAST_FILTER:
shaderEffect = new ContrastFilter();
break;
case CROSS_PROCESS_EFFECT:
shaderEffect = new CrossProcessEffect();
case CROSS_PROCESS_FILTER:
shaderEffect = new CrossProcessFilter();
break;
case DOCUMENTARY_EFFECT:
shaderEffect = new DocumentaryEffect();
case DOCUMENTARY_FILTER:
shaderEffect = new DocumentaryFilter();
break;
case DUO_TONE_COLOR_EFFECT:
shaderEffect = new DuotoneEffect();
case DUO_TONE_COLOR_FILTER:
shaderEffect = new DuotoneFilter();
break;
case FILL_LIGHT_EFFECT:
shaderEffect = new FillLightEffect();
case FILL_LIGHT_FILTER:
shaderEffect = new FillLightFilter();
break;
case GAMMA_EFFECT:
shaderEffect = new GammaEffect();
case GAMMA_FILTER:
shaderEffect = new GammaFilter();
break;
case GRAIN_EFFECT:
shaderEffect = new GrainEffect();
case GRAIN_FILTER:
shaderEffect = new GrainFilter();
break;
case GREY_SCALE_EFFECT:
shaderEffect = new GreyScaleEffect();
case GREY_SCALE_FILTER:
shaderEffect = new GreyScaleFilter();
break;
case HUE_EFFECT:
shaderEffect = new HueEffect();
case HUE_FILTER:
shaderEffect = new HueFilter();
break;
case INVERT_COLOR_EFFECT:
shaderEffect = new InvertColorsEffect();
case INVERT_COLOR_FILTER:
shaderEffect = new InvertColorsFilter();
break;
case LAMOISH_EFFECT:
shaderEffect = new LamoishEffect();
case LAMOISH_FILTER:
shaderEffect = new LamoishFilter();
break;
case POSTERIZE_EFFECT:
shaderEffect = new PosterizeEffect();
case POSTERIZE_FILTER:
shaderEffect = new PosterizeFilter();
break;
case SATURATION_EFFECT:
shaderEffect = new SaturationEffect();
case SATURATION_FILTER:
shaderEffect = new SaturationFilter();
break;
case SEPIA_EFFECT:
shaderEffect = new SepiaEffect();
case SEPIA_FILTER:
shaderEffect = new SepiaFilter();
break;
case SHARPNESS_EFFECT:
shaderEffect = new SharpnessEffect();
case SHARPNESS_FILTER:
shaderEffect = new SharpnessFilter();
break;
case TEMPERATURE_EFFECT:
shaderEffect = new TemperatureEffect();
case TEMPERATURE_FILTER:
shaderEffect = new TemperatureFilter();
break;
case TINT_EFFECT:
shaderEffect = new TintEffect();
case TINT_FILTER:
shaderEffect = new TintFilter();
break;
case VIGNETTE_EFFECT:
shaderEffect = new VignetteEffect();
case VIGNETTE_FILTER:
shaderEffect = new VignetteFilter();
break;
case NO_EFFECT:
case NO_FILTER:
default:
shaderEffect = new NoFilterEffect();
shaderEffect = new NoFilter();
}
return shaderEffect;

@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
/**
* Apply Gamma Effect on preview being played
*/
public class GammaEffect extends Filter {
public class GammaFilter extends Filter {
private float gammaValue = 2.0f;
/**
* Initialize Effect
*/
public GammaEffect() {
public GammaFilter() {
}
/**

@ -8,14 +8,14 @@ import java.util.Random;
/**
* Applies film grain effect to preview.
*/
public class GrainEffect extends Filter {
public class GrainFilter extends Filter {
private float strength = 0.5f;
private Random mRandom;
/**
* Initialize Effect
*/
public GrainEffect() {
public GrainFilter() {
mRandom = new Random(new Date().getTime());
}

@ -5,11 +5,11 @@ import androidx.annotation.NonNull;
/**
* Converts preview to GreyScale.
*/
public class GreyScaleEffect extends Filter {
public class GreyScaleFilter extends Filter {
/**
* Initialize Effect
*/
public GreyScaleEffect() {
public GreyScaleFilter() {
}
@NonNull

@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
/**
* Apply Hue effect on the preview
*/
public class HueEffect extends Filter {
public class HueFilter extends Filter {
float hueValue = 0.0f;
/**
* Initialize Effect
*/
public HueEffect() {
public HueFilter() {
}
/**

@ -5,11 +5,11 @@ import androidx.annotation.NonNull;
/**
* Inverts the preview colors. This can also be known as negative Effect.
*/
public class InvertColorsEffect extends Filter {
public class InvertColorsFilter extends Filter {
/**
* Initialize Effect
*/
public InvertColorsEffect() {
public InvertColorsFilter() {
}
@NonNull

@ -8,13 +8,13 @@ import java.util.Random;
/**
* Applies lomo-camera style effect to preview.
*/
public class LamoishEffect extends Filter {
public class LamoishFilter extends Filter {
private Random mRandom;
/**
* Initialize Effect
*/
public LamoishEffect() {
public LamoishFilter() {
mRandom = new Random(new Date().getTime());
}

@ -2,7 +2,7 @@ package com.otaliastudios.cameraview.filters;
import androidx.annotation.NonNull;
public class NoFilterEffect extends Filter {
public class NoFilter extends Filter {
@NonNull
@Override

@ -5,11 +5,11 @@ import androidx.annotation.NonNull;
/**
* Applies Posterization effect to Preview.
*/
public class PosterizeEffect extends Filter {
public class PosterizeFilter extends Filter {
/**
* Initialize Effect
*/
public PosterizeEffect() {
public PosterizeFilter() {
}
@NonNull

@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
/**
* Adjusts color saturation of preview.
*/
public class SaturationEffect extends Filter {
public class SaturationFilter extends Filter {
private float scale = 1.0f;
/**
* Initialize Effect
*/
public SaturationEffect() {
public SaturationFilter() {
}
/**

@ -5,11 +5,11 @@ import androidx.annotation.NonNull;
/**
* Converts preview to Sepia tone.
*/
public class SepiaEffect extends Filter {
public class SepiaFilter extends Filter {
/**
* Initialize Effect
*/
public SepiaEffect() {
public SepiaFilter() {
}
@NonNull

@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
/**
* Sharpens the preview.
*/
public class SharpnessEffect extends Filter {
public class SharpnessFilter extends Filter {
private float scale = 0.5f;
/**
* Initialize Effect
*/
public SharpnessEffect() {
public SharpnessFilter() {
}
/**

@ -5,13 +5,13 @@ import androidx.annotation.NonNull;
/**
* Adjusts color temperature of the preview.
*/
public class TemperatureEffect extends Filter {
public class TemperatureFilter extends Filter {
private float scale = 0f;
/**
* Initialize Effect
*/
public TemperatureEffect() {
public TemperatureFilter() {
}
/**

@ -8,13 +8,13 @@ import androidx.annotation.NonNull;
/**
* Tints the preview with specified color..
*/
public class TintEffect extends Filter {
public class TintFilter extends Filter {
private int mTint = 0xFFFF0000;
/**
* Initialize Effect
*/
public TintEffect() {
public TintFilter() {
}
public void setTintColor(int color) {

@ -6,14 +6,14 @@ import androidx.annotation.NonNull;
/**
* Applies lomo-camera style effect to your preview.
*/
public class VignetteEffect extends Filter {
public class VignetteFilter extends Filter {
private float mScale = 0.85f;
private float mShade = 0.5f;
/**
* Initialize Effect
*/
public VignetteEffect() {
public VignetteFilter() {
}
/**

@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
import com.otaliastudios.cameraview.CameraLogger;
import com.otaliastudios.cameraview.filters.Filter;
import com.otaliastudios.cameraview.filters.NoFilterEffect;
import com.otaliastudios.cameraview.filters.NoFilter;
import java.nio.FloatBuffer;
@ -67,7 +67,7 @@ public class EglViewport extends EglElement {
mTextureUnit = GLES20.GL_TEXTURE0;
//init the default shader effect
mShaderEffect = new NoFilterEffect();
mShaderEffect = new NoFilter();
initProgram();
}

@ -16,7 +16,7 @@ import com.otaliastudios.cameraview.R;
import com.otaliastudios.cameraview.internal.egl.EglViewport;
import com.otaliastudios.cameraview.internal.utils.Op;
import com.otaliastudios.cameraview.filters.Filter;
import com.otaliastudios.cameraview.filters.NoFilterEffect;
import com.otaliastudios.cameraview.filters.NoFilter;
import com.otaliastudios.cameraview.size.AspectRatio;
import java.util.Collections;
@ -167,7 +167,7 @@ public class GlCameraPreview extends CameraPreview<GLSurfaceView, SurfaceTexture
});
//init the default shader effect
mCurrentShaderEffect = new NoFilterEffect();
mCurrentShaderEffect = new NoFilter();
}
@RendererThread

@ -49,7 +49,7 @@ public class CameraActivity extends AppCompatActivity implements View.OnClickLis
private ViewGroup controlPanel;
private long mCaptureTime;
private Filters mCurrentEffect = NO_EFFECT;
private Filters mCurrentEffect = NO_FILTER;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -328,73 +328,73 @@ public class CameraActivity extends AppCompatActivity implements View.OnClickLis
}
switch (mCurrentEffect){
case NO_EFFECT:
mCurrentEffect = AUTO_FIX_EFFECT;
case NO_FILTER:
mCurrentEffect = AUTO_FIX_FILTER;
break;
case AUTO_FIX_EFFECT:
mCurrentEffect = BLACK_AND_WHITE_EFFECT;
case AUTO_FIX_FILTER:
mCurrentEffect = BLACK_AND_WHITE_FILTER;
break;
case BLACK_AND_WHITE_EFFECT:
mCurrentEffect = BRIGHTNESS_EFFECT;
case BLACK_AND_WHITE_FILTER:
mCurrentEffect = BRIGHTNESS_FILTER;
break;
case BRIGHTNESS_EFFECT:
mCurrentEffect = CONTRAST_EFFECT;
case BRIGHTNESS_FILTER:
mCurrentEffect = CONTRAST_FILTER;
break;
case CONTRAST_EFFECT:
mCurrentEffect = CROSS_PROCESS_EFFECT;
case CONTRAST_FILTER:
mCurrentEffect = CROSS_PROCESS_FILTER;
break;
case CROSS_PROCESS_EFFECT:
mCurrentEffect = DOCUMENTARY_EFFECT;
case CROSS_PROCESS_FILTER:
mCurrentEffect = DOCUMENTARY_FILTER;
break;
case DOCUMENTARY_EFFECT:
mCurrentEffect = DUO_TONE_COLOR_EFFECT;
case DOCUMENTARY_FILTER:
mCurrentEffect = DUO_TONE_COLOR_FILTER;
break;
case DUO_TONE_COLOR_EFFECT:
mCurrentEffect = FILL_LIGHT_EFFECT;
case DUO_TONE_COLOR_FILTER:
mCurrentEffect = FILL_LIGHT_FILTER;
break;
case FILL_LIGHT_EFFECT:
mCurrentEffect = GAMMA_EFFECT;
case FILL_LIGHT_FILTER:
mCurrentEffect = GAMMA_FILTER;
break;
case GAMMA_EFFECT:
mCurrentEffect = GRAIN_EFFECT;
case GAMMA_FILTER:
mCurrentEffect = GRAIN_FILTER;
break;
case GRAIN_EFFECT:
mCurrentEffect = GREY_SCALE_EFFECT;
case GRAIN_FILTER:
mCurrentEffect = GREY_SCALE_FILTER;
break;
case GREY_SCALE_EFFECT:
mCurrentEffect = HUE_EFFECT;
case GREY_SCALE_FILTER:
mCurrentEffect = HUE_FILTER;
break;
case HUE_EFFECT:
mCurrentEffect = INVERT_COLOR_EFFECT;
case HUE_FILTER:
mCurrentEffect = INVERT_COLOR_FILTER;
break;
case INVERT_COLOR_EFFECT:
mCurrentEffect = LAMOISH_EFFECT;
case INVERT_COLOR_FILTER:
mCurrentEffect = LAMOISH_FILTER;
break;
case LAMOISH_EFFECT:
mCurrentEffect = POSTERIZE_EFFECT;
case LAMOISH_FILTER:
mCurrentEffect = POSTERIZE_FILTER;
break;
case POSTERIZE_EFFECT:
mCurrentEffect = SATURATION_EFFECT;
case POSTERIZE_FILTER:
mCurrentEffect = SATURATION_FILTER;
break;
case SATURATION_EFFECT:
mCurrentEffect = SEPIA_EFFECT;
case SATURATION_FILTER:
mCurrentEffect = SEPIA_FILTER;
break;
case SEPIA_EFFECT:
mCurrentEffect = SHARPNESS_EFFECT;
case SEPIA_FILTER:
mCurrentEffect = SHARPNESS_FILTER;
break;
case SHARPNESS_EFFECT:
mCurrentEffect = TEMPERATURE_EFFECT;
case SHARPNESS_FILTER:
mCurrentEffect = TEMPERATURE_FILTER;
break;
case TEMPERATURE_EFFECT:
mCurrentEffect = TINT_EFFECT;
case TEMPERATURE_FILTER:
mCurrentEffect = TINT_FILTER;
break;
case TINT_EFFECT:
mCurrentEffect = VIGNETTE_EFFECT;
case TINT_FILTER:
mCurrentEffect = VIGNETTE_FILTER;
break;
case VIGNETTE_EFFECT:
case VIGNETTE_FILTER:
default:
mCurrentEffect = NO_EFFECT;
mCurrentEffect = NO_FILTER;
break;
}

Loading…
Cancel
Save