Simplification

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
camera2
Leo Ma 9 years ago
parent 87296629b5
commit 0638231992

@ -111,15 +111,12 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
magicFilter.setTextureTransformMatrix(mtx); magicFilter.setTextureTransformMatrix(mtx);
magicFilter.onDrawFrameOES(mTextureId); magicFilter.onDrawFrameOES(mTextureId);
if (magicFilter.getFilterType() != MagicFilterType.NONE) {
magicFilter.onDrawToTextureOES(mTextureId); magicFilter.onDrawToTextureOES(mTextureId);
mGLIntBufferCache.add(magicFilter.getGlFboBuffer()); mGLIntBufferCache.add(magicFilter.getGlFboBuffer());
synchronized (writeLock) { synchronized (writeLock) {
writeLock.notifyAll(); writeLock.notifyAll();
} }
} }
}
@Override @Override
public void onPreviewFrame(byte[] data, Camera camera) { public void onPreviewFrame(byte[] data, Camera camera) {
@ -154,7 +151,6 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
magicFilter.onInputSizeChanged(mPreviewWidth, mPreviewHeight); magicFilter.onInputSizeChanged(mPreviewWidth, mPreviewHeight);
magicFilter.onDisplaySizeChanged(mSurfaceWidth, mSurfaceHeight); magicFilter.onDisplaySizeChanged(mSurfaceWidth, mSurfaceHeight);
} }
switchCameraFilter();
} }
}); });
requestRender(); requestRender();
@ -251,8 +247,6 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
mCamera.setDisplayOrientation(mPreviewRotation); mCamera.setDisplayOrientation(mPreviewRotation);
switchCameraFilter();
try { try {
mCamera.setPreviewTexture(surfaceTexture); mCamera.setPreviewTexture(surfaceTexture);
} catch (IOException e) { } catch (IOException e) {
@ -301,15 +295,6 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
return closestRange; 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 { public interface PreviewCallback {
void onGetYuvFrame(byte[] data); void onGetYuvFrame(byte[] data);

Loading…
Cancel
Save