From 34f1a49ed2783959404097c90f042718d45ec149 Mon Sep 17 00:00:00 2001 From: Suneet Agrawal Date: Mon, 5 Aug 2019 14:05:25 +0530 Subject: [PATCH] changed allignmen and filters --- .../com/otaliastudios/cameraview/filters/Filter.java | 10 +++++----- .../picture/SnapshotGlPictureRecorder.java | 4 ++-- .../cameraview/preview/GlCameraPreview.java | 2 +- demo/src/main/res/layout/activity_camera.xml | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) 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 17bda399..e2211c92 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/Filter.java @@ -25,7 +25,7 @@ public abstract class Filter { * This wil be used by GL to apply any effect. */ - protected String mVertexShader = + String mVertexShader = "uniform mat4 uMVPMatrix;\n" + "uniform mat4 uTexMatrix;\n" + "attribute vec4 aPosition;\n" + @@ -41,7 +41,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. */ - protected String mFragmentShader = + String mFragmentShader = "#extension GL_OES_EGL_image_external : require\n" + "precision mediump float;\n" + "varying vec2 vTextureCoord;\n" @@ -54,10 +54,10 @@ public abstract class Filter { * Width and height of previewing GlSurfaceview. * This will be used by a few effects. */ - protected int mPreviewingViewWidth = 0; - protected int mPreviewingViewHeight = 0; + int mPreviewingViewWidth = 0; + int mPreviewingViewHeight = 0; - public void setPreviewingViewWidthAndHeight(int width, int height){ + public void setPreviewingViewSize(int width, int height){ mPreviewingViewWidth = width; mPreviewingViewHeight = height; } 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 b6f7487d..2bd95048 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotGlPictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotGlPictureRecorder.java @@ -149,8 +149,8 @@ public class SnapshotGlPictureRecorder extends PictureRecorder { */ @RendererThread @TargetApi(Build.VERSION_CODES.KITKAT) - private void onRendererFrame(final @NonNull SurfaceTexture surfaceTexture, final float scaleX, final float scaleY, @NonNull BaseShaderEffect effect) { - mViewport.changeShaderEffect(effect); + private void onRendererFrame(final @NonNull SurfaceTexture surfaceTexture, final float scaleX, final float scaleY, @NonNull Filter filter) { + mViewport.changeShaderEffect(filter); // Get egl context from the RendererThread, which is the one in which we have created // the textureId and the overlayTextureId, managed by the GlSurfaceView. // Next operations can then be performed on different threads using this handle. 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 178bdba0..00439bf2 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java @@ -318,7 +318,7 @@ public class GlCameraPreview extends CameraPreview + android:layout_marginBottom="96dp" + android:layout_gravity="bottom|start"> + app:srcCompat="@drawable/ic_filters" /> + app:srcCompat="@drawable/ic_switch" />