From 19ddbfde29fd28bf5def860770c0629988fb79ab Mon Sep 17 00:00:00 2001 From: Giacomo Randazzo Date: Sat, 15 Jun 2019 21:33:30 +0200 Subject: [PATCH] Use mWithOverlay in SnapshotVideoRecorder --- .../main/java/com/otaliastudios/cameraview/Camera1.java | 2 +- .../otaliastudios/cameraview/SnapshotPictureRecorder.java | 2 +- .../otaliastudios/cameraview/SnapshotVideoRecorder.java | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java index 26041bb4..2adcbbdc 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java @@ -782,7 +782,7 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera mFacing = realFacing; GlCameraPreview cameraPreview = (GlCameraPreview) mPreview; // TODO when we'll have the API for setting where to draw each view, we'll fix the withOverlay parameter.. - mVideoRecorder = new SnapshotVideoRecorder(videoResult, Camera1.this, cameraPreview, true, videoSurfaceDrawerList); + mVideoRecorder = new SnapshotVideoRecorder(videoResult, Camera1.this, cameraPreview, videoSurfaceDrawerList); mVideoRecorder.start(); } }); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotPictureRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotPictureRecorder.java index f7a817c1..560b84be 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotPictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotPictureRecorder.java @@ -47,7 +47,7 @@ class SnapshotPictureRecorder extends PictureRecorder { mOutputRatio = outputRatio; mFormat = mController.mPreviewFormat; mSensorPreviewSize = mController.mPreviewStreamSize; - // TODO when we'll have the API for setting where to draw each view, we'll fix this. + // TODO should it always be true? mWithOverlay = true; mSurfaceDrawerList = surfaceDrawerList; } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotVideoRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotVideoRecorder.java index 6e45703f..669d004a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotVideoRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotVideoRecorder.java @@ -42,11 +42,12 @@ class SnapshotVideoRecorder extends VideoRecorder implements GlCameraPreview.Ren private boolean mWithOverlay; - SnapshotVideoRecorder(@NonNull VideoResult stub, @Nullable VideoResultListener listener, @NonNull GlCameraPreview preview, boolean withOverlay, @NonNull List surfaceDrawerList) { + SnapshotVideoRecorder(@NonNull VideoResult stub, @Nullable VideoResultListener listener, @NonNull GlCameraPreview preview, @NonNull List surfaceDrawerList) { super(stub, listener); mPreview = preview; mPreview.addRendererFrameCallback(this); - mWithOverlay = withOverlay; + // TODO should it always be true? + mWithOverlay = true; mSurfaceDrawerList = surfaceDrawerList; } @@ -129,7 +130,7 @@ class SnapshotVideoRecorder extends VideoRecorder implements GlCameraPreview.Ren surfaceTexture.getTransformMatrix(textureFrame.transform); // get overlay - if (mOverlaySurfaceTexture != null) { + if (mWithOverlay) { for (SurfaceDrawer surfaceDrawer : mSurfaceDrawerList) { surfaceDrawer.drawOnSurfaceForVideoSnapshot(mOverlaySurface); }