From e92422c7b492fd0671e83518ef445ebd4d8c9162 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Mon, 5 Aug 2019 20:36:52 +0200 Subject: [PATCH] Split two packages --- .../otaliastudios/cameraview/CameraView.java | 4 +-- .../{filters => filter}/BaseFilter.java | 4 +-- .../{filters => filter}/Filter.java | 3 ++- .../{filters => filter}/Filters.java | 26 ++++++++++++++++++- .../cameraview/filters/AutoFixFilter.java | 2 ++ .../filters/BlackAndWhiteFilter.java | 2 ++ .../cameraview/filters/BrightnessFilter.java | 2 ++ .../cameraview/filters/ContrastFilter.java | 2 ++ .../filters/CrossProcessFilter.java | 2 ++ .../cameraview/filters/DocumentaryFilter.java | 2 ++ .../cameraview/filters/DuotoneFilter.java | 2 ++ .../cameraview/filters/FillLightFilter.java | 2 ++ .../cameraview/filters/GammaFilter.java | 2 ++ .../cameraview/filters/GrainFilter.java | 2 ++ .../cameraview/filters/GrayscaleFilter.java | 2 ++ .../cameraview/filters/HueFilter.java | 2 ++ .../filters/InvertColorsFilter.java | 2 ++ .../cameraview/filters/LomoishFilter.java | 2 ++ .../cameraview/filters/NoFilter.java | 2 ++ .../cameraview/filters/PosterizeFilter.java | 2 ++ .../cameraview/filters/SaturationFilter.java | 2 ++ .../cameraview/filters/SepiaFilter.java | 2 ++ .../cameraview/filters/SharpnessFilter.java | 2 ++ .../cameraview/filters/TemperatureFilter.java | 2 ++ .../cameraview/filters/TintFilter.java | 2 ++ .../cameraview/filters/VignetteFilter.java | 2 ++ .../cameraview/internal/egl/EglViewport.java | 2 +- .../picture/SnapshotGlPictureRecorder.java | 2 +- .../preview/FilterCameraPreview.java | 2 +- .../cameraview/preview/GlCameraPreview.java | 2 +- .../preview/RendererFrameCallback.java | 2 +- .../video/SnapshotVideoRecorder.java | 2 +- .../video/encoding/TextureMediaEncoder.java | 2 +- .../cameraview/demo/CameraActivity.java | 4 +-- 34 files changed, 83 insertions(+), 16 deletions(-) rename cameraview/src/main/java/com/otaliastudios/cameraview/{filters => filter}/BaseFilter.java (96%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{filters => filter}/Filter.java (92%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{filters => filter}/Filters.java (53%) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index 8a3e546b..9f7ffcc6 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -47,8 +47,8 @@ import com.otaliastudios.cameraview.engine.Camera1Engine; import com.otaliastudios.cameraview.engine.Camera2Engine; import com.otaliastudios.cameraview.engine.CameraEngine; import com.otaliastudios.cameraview.engine.offset.Reference; -import com.otaliastudios.cameraview.filters.Filter; -import com.otaliastudios.cameraview.filters.Filters; +import com.otaliastudios.cameraview.filter.Filter; +import com.otaliastudios.cameraview.filter.Filters; import com.otaliastudios.cameraview.frame.Frame; import com.otaliastudios.cameraview.frame.FrameProcessor; import com.otaliastudios.cameraview.gesture.Gesture; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BaseFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java similarity index 96% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/BaseFilter.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java index db930822..d05b313d 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BaseFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java @@ -1,10 +1,11 @@ -package com.otaliastudios.cameraview.filters; +package com.otaliastudios.cameraview.filter; import android.opengl.GLES20; import androidx.annotation.NonNull; import com.otaliastudios.cameraview.CameraLogger; +import com.otaliastudios.cameraview.filters.NoFilter; import com.otaliastudios.cameraview.internal.GlUtils; import com.otaliastudios.cameraview.size.Size; @@ -116,7 +117,6 @@ public abstract class BaseFilter implements Filter { fragmentTextureCoordinateName); } - @SuppressWarnings("WeakerAccess") @NonNull protected String createDefaultFragmentShader() { return createDefaultFragmentShader(fragmentTextureCoordinateName); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java similarity index 92% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java index 9fc22caf..c5d2e28f 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java @@ -1,6 +1,7 @@ -package com.otaliastudios.cameraview.filters; +package com.otaliastudios.cameraview.filter; import com.otaliastudios.cameraview.CameraView; +import com.otaliastudios.cameraview.filters.NoFilter; import androidx.annotation.NonNull; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filters.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filters.java similarity index 53% rename from cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filters.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filters.java index 870baded..57e94db9 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filters.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filters.java @@ -1,7 +1,31 @@ -package com.otaliastudios.cameraview.filters; +package com.otaliastudios.cameraview.filter; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.Filter; +import com.otaliastudios.cameraview.filters.AutoFixFilter; +import com.otaliastudios.cameraview.filters.BlackAndWhiteFilter; +import com.otaliastudios.cameraview.filters.BrightnessFilter; +import com.otaliastudios.cameraview.filters.ContrastFilter; +import com.otaliastudios.cameraview.filters.CrossProcessFilter; +import com.otaliastudios.cameraview.filters.DocumentaryFilter; +import com.otaliastudios.cameraview.filters.DuotoneFilter; +import com.otaliastudios.cameraview.filters.FillLightFilter; +import com.otaliastudios.cameraview.filters.GammaFilter; +import com.otaliastudios.cameraview.filters.GrainFilter; +import com.otaliastudios.cameraview.filters.GrayscaleFilter; +import com.otaliastudios.cameraview.filters.HueFilter; +import com.otaliastudios.cameraview.filters.InvertColorsFilter; +import com.otaliastudios.cameraview.filters.LomoishFilter; +import com.otaliastudios.cameraview.filters.NoFilter; +import com.otaliastudios.cameraview.filters.PosterizeFilter; +import com.otaliastudios.cameraview.filters.SaturationFilter; +import com.otaliastudios.cameraview.filters.SepiaFilter; +import com.otaliastudios.cameraview.filters.SharpnessFilter; +import com.otaliastudios.cameraview.filters.TemperatureFilter; +import com.otaliastudios.cameraview.filters.TintFilter; +import com.otaliastudios.cameraview.filters.VignetteFilter; + /** * Contains commonly used {@link Filter}s. * diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java index bc3d2aea..7e3b296c 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Attempts to auto-fix the preview based on histogram equalization. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteFilter.java index 4e85e1cc..648613e3 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Converts the frames into black and white colors. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java index dfb95e88..6a027aad 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Adjusts the brightness of the preview. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java index c1c17e9c..ab6b3922 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Adjusts the contrast of the preview. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessFilter.java index 9ac3d852..8800a343 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Applies a cross process effect on preview, in which the red and green channels * are enhanced while the blue channel is restricted. diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java index fda3751a..663d6fd9 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + import java.util.Date; import java.util.Random; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java index 83583879..ec3c6d9b 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java @@ -4,6 +4,8 @@ import android.graphics.Color; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Representation of preview using only two color tones. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java index 75a633a0..6d44577c 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Applies back-light filling to the preview. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java index 8c589e0b..e1670c6a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Apply Gamma Effect on preview being played */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java index 9cbbeb99..ed3a8b57 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + import java.util.Date; import java.util.Random; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrayscaleFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrayscaleFilter.java index 8ebd2a83..db395d56 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrayscaleFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrayscaleFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Converts preview to GreyScale. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java index d3194d8c..b3b18ffb 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Apply Hue effect on the preview */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsFilter.java index a20686ff..13cba585 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Inverts the preview colors. This can also be known as negative Effect. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LomoishFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LomoishFilter.java index 40685677..fd78005c 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LomoishFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LomoishFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + import java.util.Date; import java.util.Random; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilter.java index cf94e23f..5cc14a46 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + public class NoFilter extends BaseFilter { @NonNull diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeFilter.java index 5a0efe16..48478166 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Applies Posterization effect to Preview. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java index f10b94ee..45988742 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Adjusts color saturation of preview. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaFilter.java index bba0ca5a..890e4349 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Converts preview to Sepia tone. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java index b2b1d32f..afd2466a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Sharpens the preview. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java index 2e931f8e..4f4e7153 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Adjusts color temperature of the preview. */ diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java index 8e07797e..41231a67 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java @@ -4,6 +4,8 @@ import android.graphics.Color; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Tints the preview with specified color.. diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java index 0d306f2f..7e368915 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java @@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters; import androidx.annotation.NonNull; +import com.otaliastudios.cameraview.filter.BaseFilter; + /** * Applies lomo-camera style effect to your preview. 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 e5adcc98..648d99fd 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 @@ -7,7 +7,7 @@ import android.opengl.GLES20; import androidx.annotation.NonNull; import com.otaliastudios.cameraview.CameraLogger; -import com.otaliastudios.cameraview.filters.Filter; +import com.otaliastudios.cameraview.filter.Filter; import com.otaliastudios.cameraview.filters.NoFilter; import com.otaliastudios.cameraview.internal.GlUtils; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotGlPictureRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotGlPictureRecorder.java index 2ac45463..a9939f0f 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotGlPictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotGlPictureRecorder.java @@ -26,7 +26,7 @@ import com.otaliastudios.cameraview.overlay.OverlayDrawer; import com.otaliastudios.cameraview.preview.GlCameraPreview; import com.otaliastudios.cameraview.preview.RendererFrameCallback; import com.otaliastudios.cameraview.preview.RendererThread; -import com.otaliastudios.cameraview.filters.Filter; +import com.otaliastudios.cameraview.filter.Filter; import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/FilterCameraPreview.java b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/FilterCameraPreview.java index 834b0d0b..b28d1baa 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/FilterCameraPreview.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/FilterCameraPreview.java @@ -7,7 +7,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; -import com.otaliastudios.cameraview.filters.Filter; +import com.otaliastudios.cameraview.filter.Filter; /** 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 4b3b5ce0..d4479ee3 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java @@ -15,7 +15,7 @@ import android.view.ViewGroup; 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.filter.Filter; import com.otaliastudios.cameraview.filters.NoFilter; import com.otaliastudios.cameraview.size.AspectRatio; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/RendererFrameCallback.java b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/RendererFrameCallback.java index 3bf4e0af..946ee1f9 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/RendererFrameCallback.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/RendererFrameCallback.java @@ -4,7 +4,7 @@ import android.graphics.SurfaceTexture; import androidx.annotation.NonNull; -import com.otaliastudios.cameraview.filters.Filter; +import com.otaliastudios.cameraview.filter.Filter; /** * Callback for renderer frames. diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java index 3ff517ba..12c3515e 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java @@ -13,7 +13,7 @@ import com.otaliastudios.cameraview.overlay.OverlayDrawer; import com.otaliastudios.cameraview.preview.GlCameraPreview; import com.otaliastudios.cameraview.preview.RendererFrameCallback; import com.otaliastudios.cameraview.preview.RendererThread; -import com.otaliastudios.cameraview.filters.Filter; +import com.otaliastudios.cameraview.filter.Filter; import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.video.encoding.AudioConfig; import com.otaliastudios.cameraview.video.encoding.AudioMediaEncoder; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java index aeb21c30..79b23aee 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java @@ -9,7 +9,7 @@ import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import com.otaliastudios.cameraview.CameraLogger; -import com.otaliastudios.cameraview.filters.Filter; +import com.otaliastudios.cameraview.filter.Filter; import com.otaliastudios.cameraview.internal.egl.EglCore; import com.otaliastudios.cameraview.internal.egl.EglViewport; import com.otaliastudios.cameraview.internal.egl.EglWindowSurface; diff --git a/demo/src/main/java/com/otaliastudios/cameraview/demo/CameraActivity.java b/demo/src/main/java/com/otaliastudios/cameraview/demo/CameraActivity.java index a4e1ef8f..097e9312 100644 --- a/demo/src/main/java/com/otaliastudios/cameraview/demo/CameraActivity.java +++ b/demo/src/main/java/com/otaliastudios/cameraview/demo/CameraActivity.java @@ -27,7 +27,7 @@ import com.otaliastudios.cameraview.PictureResult; import com.otaliastudios.cameraview.controls.Mode; import com.otaliastudios.cameraview.VideoResult; import com.otaliastudios.cameraview.controls.Preview; -import com.otaliastudios.cameraview.filters.Filters; +import com.otaliastudios.cameraview.filter.Filters; import com.otaliastudios.cameraview.frame.Frame; import com.otaliastudios.cameraview.frame.FrameProcessor; @@ -36,8 +36,6 @@ import java.io.File; import java.util.Arrays; import java.util.List; -import static com.otaliastudios.cameraview.filters.Filters.*; - public class CameraActivity extends AppCompatActivity implements View.OnClickListener, OptionView.Callback {