diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index 6c376be4..97795f98 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -2132,7 +2132,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver { //region Effects - public void setFilter(Filters filter) { + public void setFilter(@NonNull Filters filter) { if (mCameraPreview instanceof GlCameraPreview) { Filter shaderEffect = filter.newInstance(); ((GlCameraPreview) mCameraPreview).setShaderEffect(shaderEffect); @@ -2141,7 +2141,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver { } } - public void setFilter(Filter shaderEffect) { + public void setFilter(@NonNull Filter shaderEffect) { if (mCameraPreview instanceof GlCameraPreview) { ((GlCameraPreview) mCameraPreview).setShaderEffect(shaderEffect); } else { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixEffect.java index b1f75052..a5a6d022 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixEffect.java @@ -1,6 +1,6 @@ package com.otaliastudios.cameraview.filters; -import com.otaliastudios.cameraview.filters.Filter; +import androidx.annotation.NonNull; /** * Attempts to auto-fix the preview based on histogram equalization. @@ -32,6 +32,7 @@ public class AutoFixEffect extends Filter { this.scale = scale; } + @NonNull @Override public String getFragmentShader() { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteEffect.java index 19c449c3..5141a870 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteEffect.java @@ -1,6 +1,6 @@ package com.otaliastudios.cameraview.filters; -import com.otaliastudios.cameraview.filters.Filter; +import androidx.annotation.NonNull; /** * Converts the preview into black and white colors @@ -11,9 +11,10 @@ public class BlackAndWhiteEffect extends Filter { /** * Initialize effect */ - public BlackAndWhiteEffect(){ + public BlackAndWhiteEffect() { } + @NonNull @Override public String getFragmentShader() { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessEffect.java index 8cfb0709..3868340b 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessEffect.java @@ -1,6 +1,6 @@ package com.otaliastudios.cameraview.filters; -import com.otaliastudios.cameraview.filters.Filter; +import androidx.annotation.NonNull; /** * Adjusts the brightness of the preview. @@ -36,6 +36,7 @@ public class BrightnessEffect extends Filter { return brightnessValue - 1.0f; } + @NonNull @Override public String getFragmentShader() { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastEffect.java index 94dd8da9..98a53e87 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastEffect.java @@ -1,6 +1,7 @@ package com.otaliastudios.cameraview.filters; -import com.otaliastudios.cameraview.filters.Filter; +import androidx.annotation.NonNull; + /** * Adjusts the contrast of the preview. */ @@ -14,10 +15,11 @@ public class ContrastEffect extends Filter { } /** - *setContrast + * setContrast + * * @param contrast Range should be between 0.0- 1.0 with 0.0 being normal. */ - public void setContrast(float contrast){ + public void setContrast(float contrast) { if (contrast < 0.0f) contrast = 0.0f; else if (contrast > 1.0f) @@ -34,6 +36,7 @@ public class ContrastEffect extends Filter { return contrast - 1.0f; } + @NonNull @Override public String getFragmentShader() { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessEffect.java index 701469dc..c388d6f5 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessEffect.java @@ -1,6 +1,6 @@ package com.otaliastudios.cameraview.filters; -import com.otaliastudios.cameraview.filters.Filter; +import androidx.annotation.NonNull; /** * Applies a cross process effect on preview, in which the red and green channels @@ -14,6 +14,7 @@ public class CrossProcessEffect extends Filter { public CrossProcessEffect() { } + @NonNull @Override public String getFragmentShader() { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CustomEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CustomEffect.java index 4680f8d0..ad9e6de5 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CustomEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CustomEffect.java @@ -1,6 +1,6 @@ package com.otaliastudios.cameraview.filters; -import com.otaliastudios.cameraview.filters.Filter; +import androidx.annotation.NonNull; /** @@ -19,6 +19,7 @@ public class CustomEffect extends Filter { this.mFragmentShader = fragmentShader; } + @NonNull @Override public String getFragmentShader() { return mFragmentShader; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryEffect.java index cb5bcce8..c45a9de3 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryEffect.java @@ -1,6 +1,6 @@ package com.otaliastudios.cameraview.filters; -import com.otaliastudios.cameraview.filters.Filter; +import androidx.annotation.NonNull; import java.util.Date; import java.util.Random; @@ -15,6 +15,7 @@ public class DocumentaryEffect extends Filter { mRandom = new Random(new Date().getTime()); } + @NonNull @Override public String getFragmentShader() { float scale[] = new float[2]; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneEffect.java index 06158847..ea1fdcd4 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneEffect.java @@ -2,7 +2,7 @@ package com.otaliastudios.cameraview.filters; import android.graphics.Color; -import com.otaliastudios.cameraview.filters.Filter; +import androidx.annotation.NonNull; /** * Representation of preview using only two color tones. @@ -21,10 +21,10 @@ public class DuotoneEffect extends Filter { /** * setDuoToneColors * - * @param firstColor Integer, representing an ARGB color with 8 bits per channel. - * May be created using Color class. + * @param firstColor Integer, representing an ARGB color with 8 bits per channel. + * May be created using Color class. * @param secondColor Integer, representing an ARGB color with 8 bits per channel. - * May be created using Color class. + * May be created using Color class. */ public void setDuoToneColors(int firstColor, int secondColor) { this.mFirstColor = firstColor; @@ -39,6 +39,7 @@ public class DuotoneEffect extends Filter { return mSecondColor; } + @NonNull @Override public String getFragmentShader() { float first[] = {Color.red(mFirstColor) / 255f, diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightEffect.java index 2ffcb787..3b35b0d0 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightEffect.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightEffect.java @@ -1,6 +1,6 @@ package com.otaliastudios.cameraview.filters; -import com.otaliastudios.cameraview.filters.Filter; +import androidx.annotation.NonNull; /** * Applies back-light filling to the preview. @@ -19,7 +19,7 @@ public class FillLightEffect extends Filter { * * @param strength Float, between 0.0 and 1.0 where 0.0 means no change. */ - public void setStrength(float strength){ + public void setStrength(float strength) { if (strength < 0.0f) strength = 0f; else if (strength > 1.0f) @@ -32,6 +32,7 @@ public class FillLightEffect extends Filter { return strength; } + @NonNull @Override public String getFragmentShader() { float fade_gamma = 0.3f; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java index e2211c92..da11521e 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java @@ -1,5 +1,7 @@ package com.otaliastudios.cameraview.filters; +import androidx.annotation.NonNull; + /** * A Base abstract class that every effect must extend so that there is a common getShader method. *
@@ -24,7 +26,7 @@ public abstract class Filter {
* Vertex shader code written in Shader Language (C) and stored as String.
* This wil be used by GL to apply any effect.
*/
-
+ @NonNull
String mVertexShader =
"uniform mat4 uMVPMatrix;\n" +
"uniform mat4 uTexMatrix;\n" +
@@ -41,6 +43,7 @@ public abstract class Filter {
* Fragment shader code written in Shader Language (C) and stored as String.
* This wil be used by GL to apply any effect.
*/
+ @NonNull
String mFragmentShader =
"#extension GL_OES_EGL_image_external : require\n"
+ "precision mediump float;\n"
@@ -57,7 +60,7 @@ public abstract class Filter {
int mPreviewingViewWidth = 0;
int mPreviewingViewHeight = 0;
- public void setPreviewingViewSize(int width, int height){
+ public void setPreviewingViewSize(int width, int height) {
mPreviewingViewWidth = width;
mPreviewingViewHeight = height;
}
@@ -108,6 +111,7 @@ public abstract class Filter {
*
* @return complete shader code in C
*/
+ @NonNull
public String getVertexShader() {
return mVertexShader;
}
@@ -118,6 +122,7 @@ public abstract class Filter {
*
* @return complete shader code in C
*/
+ @NonNull
public abstract String getFragmentShader();
}
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filters.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filters.java
index 2faf1ed5..06281cdf 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filters.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filters.java
@@ -25,7 +25,7 @@ public enum Filters {
TINT_EFFECT,
VIGNETTE_EFFECT;
- public Filter newInstance(){
+ public Filter newInstance() {
Filter shaderEffect;
switch (this) {
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaEffect.java
index 9ac08cb2..06d94b6c 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaEffect.java
@@ -1,6 +1,6 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
/**
* Apply Gamma Effect on preview being played
@@ -19,7 +19,7 @@ public class GammaEffect extends Filter {
*
* @param gammaValue Range should be between 0.0 - 1.0 with 0.5 being normal.
*/
- public void setGammaValue(float gammaValue){
+ public void setGammaValue(float gammaValue) {
if (gammaValue < 0.0f)
gammaValue = 0.0f;
else if (gammaValue > 1.0f)
@@ -36,6 +36,7 @@ public class GammaEffect extends Filter {
return gammaValue / 2.0f;
}
+ @NonNull
@Override
public String getFragmentShader() {
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainEffect.java
index 68a6e73d..8e022848 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainEffect.java
@@ -1,6 +1,6 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
import java.util.Date;
import java.util.Random;
@@ -23,9 +23,9 @@ public class GrainEffect extends Filter {
* setDistortionStrength
*
* @param strength Float, between 0.0f and 1.0. Zero means no distortion, while 1
- * indicates the maximum amount of adjustment.
+ * indicates the maximum amount of adjustment.
*/
- public void setDistortionStrength(float strength){
+ public void setDistortionStrength(float strength) {
if (strength < 0.0f)
strength = 0.0f;
else if (strength > 1.0f)
@@ -37,6 +37,7 @@ public class GrainEffect extends Filter {
return strength;
}
+ @NonNull
@Override
public String getFragmentShader() {
float seed[] = {mRandom.nextFloat(), mRandom.nextFloat()};
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GreyScaleEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GreyScaleEffect.java
index 7198c5a7..71d6c5a8 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GreyScaleEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GreyScaleEffect.java
@@ -1,6 +1,6 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
/**
* Converts preview to GreyScale.
@@ -12,6 +12,7 @@ public class GreyScaleEffect extends Filter {
public GreyScaleEffect() {
}
+ @NonNull
@Override
public String getFragmentShader() {
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueEffect.java
index 6c4802fd..536a7fb3 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueEffect.java
@@ -1,6 +1,6 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
/**
* Apply Hue effect on the preview
@@ -16,13 +16,15 @@ public class HueEffect extends Filter {
/**
* Hue value chart - https://cloud.githubusercontent.com/assets/2201511/21810115/b99ac22a-d74a-11e6-9f6c-ef74d15c88c7.jpg" >
+ *
* @param hueDegrees Range of value should be between 0 to 360 degrees as described in the image above
*/
- public void setHueDegreeValue(float hueDegrees){
+ public void setHueDegreeValue(float hueDegrees) {
// manipulating input value so that we can map it on 360 degree circle
hueValue = ((hueDegrees - 45) / 45f + 0.5f) * -1;
}
+ @NonNull
@Override
public String getFragmentShader() {
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsEffect.java
index ae5d13b7..80e85cb9 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsEffect.java
@@ -1,6 +1,6 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
/**
* Inverts the preview colors. This can also be known as negative Effect.
@@ -12,6 +12,7 @@ public class InvertColorsEffect extends Filter {
public InvertColorsEffect() {
}
+ @NonNull
@Override
public String getFragmentShader() {
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LamoishEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LamoishEffect.java
index 0f579938..459e15e8 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LamoishEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LamoishEffect.java
@@ -1,6 +1,6 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
import java.util.Date;
import java.util.Random;
@@ -13,13 +13,12 @@ public class LamoishEffect extends Filter {
/**
* Initialize Effect
- *
- * @param glSurfaceView GLSurfaceView
*/
public LamoishEffect() {
mRandom = new Random(new Date().getTime());
}
+ @NonNull
@Override
public String getFragmentShader() {
float scale[] = new float[2];
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilterEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilterEffect.java
index b02cc01d..25ab266c 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilterEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilterEffect.java
@@ -1,9 +1,10 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
public class NoFilterEffect extends Filter {
+ @NonNull
@Override
public String getFragmentShader() {
return mFragmentShader;
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeEffect.java
index f4920f75..468e10e4 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeEffect.java
@@ -1,6 +1,6 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
/**
* Applies Posterization effect to Preview.
@@ -12,6 +12,7 @@ public class PosterizeEffect extends Filter {
public PosterizeEffect() {
}
+ @NonNull
@Override
public String getFragmentShader() {
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationEffect.java
index 65a03f40..2f10655e 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationEffect.java
@@ -1,6 +1,6 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
/**
* Adjusts color saturation of preview.
@@ -36,6 +36,7 @@ public class SaturationEffect extends Filter {
return (scale + 1.0f) / 2.0f;
}
+ @NonNull
@Override
public String getFragmentShader() {
float shift = 1.0f / 255.0f;
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaEffect.java
index 83f8c629..5a2cc82c 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaEffect.java
@@ -1,6 +1,6 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
/**
* Converts preview to Sepia tone.
@@ -12,6 +12,7 @@ public class SepiaEffect extends Filter {
public SepiaEffect() {
}
+ @NonNull
@Override
public String getFragmentShader() {
float weights[] = {805.0f / 2048.0f, 715.0f / 2048.0f,
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessEffect.java
index c5406d73..3387f04a 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessEffect.java
@@ -1,6 +1,6 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
/**
* Sharpens the preview.
@@ -11,12 +11,13 @@ public class SharpnessEffect extends Filter {
/**
* Initialize Effect
*/
- public SharpnessEffect() { }
+ public SharpnessEffect() {
+ }
/**
* @param value Float, between 0 and 1. 0 means no change.
*/
- public void setSharpnessValue(float value){
+ public void setSharpnessValue(float value) {
if (value < 0.0f)
value = 0.0f;
else if (value > 1.0f)
@@ -29,6 +30,7 @@ public class SharpnessEffect extends Filter {
return scale;
}
+ @NonNull
@Override
public String getFragmentShader() {
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureEffect.java
index b068fcee..2e987aeb 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureEffect.java
@@ -1,6 +1,6 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
/**
* Adjusts color temperature of the preview.
@@ -16,9 +16,9 @@ public class TemperatureEffect extends Filter {
/**
* @param scale Float, between 0 and 1, with 0 indicating cool, and 1
- * indicating warm. A value of of 0.5 indicates no change.
+ * indicating warm. A value of of 0.5 indicates no change.
*/
- public void setTemperatureScale(float scale){
+ public void setTemperatureScale(float scale) {
if (scale < 0.0f)
scale = 0.0f;
else if (scale > 1.0f)
@@ -30,6 +30,7 @@ public class TemperatureEffect extends Filter {
return scale;
}
+ @NonNull
@Override
public String getFragmentShader() {
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintEffect.java
index b53a6f48..b82610f9 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintEffect.java
@@ -2,7 +2,7 @@ package com.otaliastudios.cameraview.filters;
import android.graphics.Color;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
/**
@@ -17,7 +17,7 @@ public class TintEffect extends Filter {
public TintEffect() {
}
- public void setTintColor(int color){
+ public void setTintColor(int color) {
this.mTint = color;
}
@@ -25,6 +25,7 @@ public class TintEffect extends Filter {
return mTint;
}
+ @NonNull
@Override
public String getFragmentShader() {
float color_ratio[] = {0.21f, 0.71f, 0.07f};
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteEffect.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteEffect.java
index f6665558..742a97d2 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteEffect.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteEffect.java
@@ -1,6 +1,6 @@
package com.otaliastudios.cameraview.filters;
-import com.otaliastudios.cameraview.filters.Filter;
+import androidx.annotation.NonNull;
/**
@@ -18,9 +18,10 @@ public class VignetteEffect extends Filter {
/**
* setVignetteEffectScale
+ *
* @param scale Float, between 0.0 and 1. 0
*/
- public void setVignetteEffectScale(float scale){
+ public void setVignetteEffectScale(float scale) {
if (scale < 0.0f)
scale = 0.0f;
else if (scale > 1.0f)
@@ -30,9 +31,10 @@ public class VignetteEffect extends Filter {
/**
* setVignetteEffectShade
+ *
* @param shade Float, between 0.0 and 1. 0
*/
- public void setVignetteEffectShade(float shade){
+ public void setVignetteEffectShade(float shade) {
if (shade < 0.0f)
shade = 0.0f;
else if (shade > 1.0f)
@@ -40,6 +42,7 @@ public class VignetteEffect extends Filter {
this.mShade = shade;
}
+ @NonNull
@Override
public String getFragmentShader() {
float scale[] = new float[2];
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java
index 8630f4f0..20989ee4 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java
@@ -4,6 +4,8 @@ package com.otaliastudios.cameraview.internal.egl;
import android.opengl.GLES11Ext;
import android.opengl.GLES20;
+import androidx.annotation.NonNull;
+
import com.otaliastudios.cameraview.CameraLogger;
import com.otaliastudios.cameraview.filters.Filter;
import com.otaliastudios.cameraview.filters.NoFilterEffect;
@@ -110,7 +112,7 @@ public class EglViewport extends EglElement {
return texId;
}
- public void changeShaderEffect(Filter shaderEffect){
+ public void changeShaderEffect(@NonNull Filter shaderEffect){
this.mShaderEffect = shaderEffect;
mIsShaderChanged = true;
}
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java
index 00439bf2..b7cd7283 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java
@@ -316,7 +316,7 @@ public class GlCameraPreview extends CameraPreview