code refacor

pull/527/head
Suneet Agrawal 6 years ago
parent 5f1dcbaccb
commit b15216b5b8
  1. 11
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java
  2. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java

@ -2133,17 +2133,12 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
//region Effects //region Effects
public void setFilter(@NonNull Filters filter) { public void setFilter(@NonNull Filters filter) {
if (mCameraPreview instanceof GlCameraPreview) { setFilter(filter.newInstance());
Filter shaderEffect = filter.newInstance();
((GlCameraPreview) mCameraPreview).setShaderEffect(shaderEffect);
} else {
LOG.w("setFilter", "setFilter is supported only for GLSurfaceView");
}
} }
public void setFilter(@NonNull Filter shaderEffect) { public void setFilter(@NonNull Filter filter) {
if (mCameraPreview instanceof GlCameraPreview) { if (mCameraPreview instanceof GlCameraPreview) {
((GlCameraPreview) mCameraPreview).setShaderEffect(shaderEffect); ((GlCameraPreview) mCameraPreview).setShaderEffect(filter);
} else { } else {
LOG.w("setFilter", "setFilter is supported only for GLSurfaceView"); LOG.w("setFilter", "setFilter is supported only for GLSurfaceView");
} }

@ -317,8 +317,8 @@ public class GlCameraPreview extends CameraPreview<GLSurfaceView, SurfaceTexture
} }
public void setShaderEffect(@NonNull Filter shaderEffect){ public void setShaderEffect(@NonNull Filter shaderEffect){
mCurrentShaderEffect = shaderEffect;
shaderEffect.setPreviewingViewSize(getView().getWidth(), getView().getHeight()); shaderEffect.setPreviewingViewSize(getView().getWidth(), getView().getHeight());
mCurrentShaderEffect = shaderEffect;
mOutputViewport.changeShaderEffect(shaderEffect); mOutputViewport.changeShaderEffect(shaderEffect);
} }

Loading…
Cancel
Save