Use mWithOverlay in SnapshotVideoRecorder

pull/421/head
Giacomo Randazzo 6 years ago
parent b9476bd5b1
commit 19ddbfde29
  1. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java
  2. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotPictureRecorder.java
  3. 7
      cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotVideoRecorder.java

@ -782,7 +782,7 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera
mFacing = realFacing; mFacing = realFacing;
GlCameraPreview cameraPreview = (GlCameraPreview) mPreview; GlCameraPreview cameraPreview = (GlCameraPreview) mPreview;
// TODO when we'll have the API for setting where to draw each view, we'll fix the withOverlay parameter.. // 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(); mVideoRecorder.start();
} }
}); });

@ -47,7 +47,7 @@ class SnapshotPictureRecorder extends PictureRecorder {
mOutputRatio = outputRatio; mOutputRatio = outputRatio;
mFormat = mController.mPreviewFormat; mFormat = mController.mPreviewFormat;
mSensorPreviewSize = mController.mPreviewStreamSize; 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; mWithOverlay = true;
mSurfaceDrawerList = surfaceDrawerList; mSurfaceDrawerList = surfaceDrawerList;
} }

@ -42,11 +42,12 @@ class SnapshotVideoRecorder extends VideoRecorder implements GlCameraPreview.Ren
private boolean mWithOverlay; private boolean mWithOverlay;
SnapshotVideoRecorder(@NonNull VideoResult stub, @Nullable VideoResultListener listener, @NonNull GlCameraPreview preview, boolean withOverlay, @NonNull List<SurfaceDrawer> surfaceDrawerList) { SnapshotVideoRecorder(@NonNull VideoResult stub, @Nullable VideoResultListener listener, @NonNull GlCameraPreview preview, @NonNull List<SurfaceDrawer> surfaceDrawerList) {
super(stub, listener); super(stub, listener);
mPreview = preview; mPreview = preview;
mPreview.addRendererFrameCallback(this); mPreview.addRendererFrameCallback(this);
mWithOverlay = withOverlay; // TODO should it always be true?
mWithOverlay = true;
mSurfaceDrawerList = surfaceDrawerList; mSurfaceDrawerList = surfaceDrawerList;
} }
@ -129,7 +130,7 @@ class SnapshotVideoRecorder extends VideoRecorder implements GlCameraPreview.Ren
surfaceTexture.getTransformMatrix(textureFrame.transform); surfaceTexture.getTransformMatrix(textureFrame.transform);
// get overlay // get overlay
if (mOverlaySurfaceTexture != null) { if (mWithOverlay) {
for (SurfaceDrawer surfaceDrawer : mSurfaceDrawerList) { for (SurfaceDrawer surfaceDrawer : mSurfaceDrawerList) {
surfaceDrawer.drawOnSurfaceForVideoSnapshot(mOverlaySurface); surfaceDrawer.drawOnSurfaceForVideoSnapshot(mOverlaySurface);
} }

Loading…
Cancel
Save