Split two packages

pull/535/head
Mattia Iavarone 6 years ago
parent 0dbbdd0090
commit e92422c7b4
  1. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java
  2. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java
  3. 3
      cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java
  4. 26
      cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filters.java
  5. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java
  6. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/BlackAndWhiteFilter.java
  7. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java
  8. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java
  9. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/CrossProcessFilter.java
  10. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java
  11. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java
  12. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java
  13. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java
  14. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java
  15. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrayscaleFilter.java
  16. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java
  17. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/InvertColorsFilter.java
  18. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/LomoishFilter.java
  19. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/NoFilter.java
  20. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/PosterizeFilter.java
  21. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java
  22. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/SepiaFilter.java
  23. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java
  24. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java
  25. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java
  26. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java
  27. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java
  28. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotGlPictureRecorder.java
  29. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/preview/FilterCameraPreview.java
  30. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java
  31. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/preview/RendererFrameCallback.java
  32. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java
  33. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java
  34. 4
      demo/src/main/java/com/otaliastudios/cameraview/demo/CameraActivity.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;

@ -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);

@ -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;

@ -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.
*

@ -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.
*/

@ -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.
*/

@ -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.
*/

@ -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.
*/

@ -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.

@ -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;

@ -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.
*/

@ -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.
*/

@ -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
*/

@ -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;

@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters;
import androidx.annotation.NonNull;
import com.otaliastudios.cameraview.filter.BaseFilter;
/**
* Converts preview to GreyScale.
*/

@ -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
*/

@ -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.
*/

@ -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;

@ -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

@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters;
import androidx.annotation.NonNull;
import com.otaliastudios.cameraview.filter.BaseFilter;
/**
* Applies Posterization effect to Preview.
*/

@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters;
import androidx.annotation.NonNull;
import com.otaliastudios.cameraview.filter.BaseFilter;
/**
* Adjusts color saturation of preview.
*/

@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters;
import androidx.annotation.NonNull;
import com.otaliastudios.cameraview.filter.BaseFilter;
/**
* Converts preview to Sepia tone.
*/

@ -2,6 +2,8 @@ package com.otaliastudios.cameraview.filters;
import androidx.annotation.NonNull;
import com.otaliastudios.cameraview.filter.BaseFilter;
/**
* Sharpens the preview.
*/

@ -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.
*/

@ -4,6 +4,8 @@ import android.graphics.Color;
import androidx.annotation.NonNull;
import com.otaliastudios.cameraview.filter.BaseFilter;
/**
* Tints the preview with specified color..

@ -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.

@ -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;

@ -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;

@ -7,7 +7,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
import com.otaliastudios.cameraview.filters.Filter;
import com.otaliastudios.cameraview.filter.Filter;
/**

@ -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;

@ -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.

@ -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;

@ -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;

@ -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 {

Loading…
Cancel
Save