diff --git a/app/src/main/java/net/ossrs/yasea/SrsCameraView.java b/app/src/main/java/net/ossrs/yasea/SrsCameraView.java index f7c08c4..046c9b5 100644 --- a/app/src/main/java/net/ossrs/yasea/SrsCameraView.java +++ b/app/src/main/java/net/ossrs/yasea/SrsCameraView.java @@ -111,13 +111,10 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render magicFilter.setTextureTransformMatrix(mtx); magicFilter.onDrawFrameOES(mTextureId); - - if (magicFilter.getFilterType() != MagicFilterType.NONE) { - magicFilter.onDrawToTextureOES(mTextureId); - mGLIntBufferCache.add(magicFilter.getGlFboBuffer()); - synchronized (writeLock) { - writeLock.notifyAll(); - } + magicFilter.onDrawToTextureOES(mTextureId); + mGLIntBufferCache.add(magicFilter.getGlFboBuffer()); + synchronized (writeLock) { + writeLock.notifyAll(); } } @@ -154,7 +151,6 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render magicFilter.onInputSizeChanged(mPreviewWidth, mPreviewHeight); magicFilter.onDisplaySizeChanged(mSurfaceWidth, mSurfaceHeight); } - switchCameraFilter(); } }); requestRender(); @@ -251,8 +247,6 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render mCamera.setDisplayOrientation(mPreviewRotation); - switchCameraFilter(); - try { mCamera.setPreviewTexture(surfaceTexture); } catch (IOException e) { @@ -301,15 +295,6 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render return closestRange; } - private void switchCameraFilter() { - if (magicFilter != null && magicFilter.getFilterType() == MagicFilterType.NONE) { - mCamera.addCallbackBuffer(mYuvPreviewBuffer); - mCamera.setPreviewCallbackWithBuffer(this); - } else { - mCamera.setPreviewCallback(null); - } - } - public interface PreviewCallback { void onGetYuvFrame(byte[] data);