Move workaround.start()

pull/528/head
Mattia Iavarone 6 years ago
parent 7da1d4e759
commit 293a07140d
  1. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotGlPictureRecorder.java
  2. 3
      cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java

@ -175,7 +175,6 @@ public class SnapshotGlPictureRecorder extends PictureRecorder {
final EglCore core = new EglCore(eglContext, EglCore.FLAG_RECORDABLE); final EglCore core = new EglCore(eglContext, EglCore.FLAG_RECORDABLE);
final EglBaseSurface eglSurface = new EglWindowSurface(core, fakeOutputSurface); final EglBaseSurface eglSurface = new EglWindowSurface(core, fakeOutputSurface);
eglSurface.makeCurrent(); eglSurface.makeCurrent();
issue514Workaround.start();
// 2. Apply scale and crop // 2. Apply scale and crop
boolean flip = mEngine.getAngles().flip(Reference.VIEW, Reference.SENSOR); boolean flip = mEngine.getAngles().flip(Reference.VIEW, Reference.SENSOR);
@ -206,6 +205,7 @@ public class SnapshotGlPictureRecorder extends PictureRecorder {
} catch (Surface.OutOfResourcesException e) { } catch (Surface.OutOfResourcesException e) {
LOG.w("Got Surface.OutOfResourcesException while drawing picture overlays", e); LOG.w("Got Surface.OutOfResourcesException while drawing picture overlays", e);
} }
issue514Workaround.start();
mOverlaySurfaceTexture.updateTexImage(); mOverlaySurfaceTexture.updateTexImage();
mOverlaySurfaceTexture.getTransformMatrix(mOverlayTransform); mOverlaySurfaceTexture.getTransformMatrix(mOverlayTransform);

@ -104,7 +104,6 @@ public class SnapshotVideoRecorder extends VideoRecorder implements RendererFram
temp.release(true); temp.release(true);
} }
mIssue514Workaround = new Issue514Workaround(textureId, mHasOverlay); mIssue514Workaround = new Issue514Workaround(textureId, mHasOverlay);
mIssue514Workaround.start();
} }
@RendererThread @RendererThread
@ -171,7 +170,6 @@ public class SnapshotVideoRecorder extends VideoRecorder implements RendererFram
if (mCurrentState == STATE_RECORDING) { if (mCurrentState == STATE_RECORDING) {
LOG.v("dispatching frame."); LOG.v("dispatching frame.");
mIssue514Workaround.start();
TextureMediaEncoder textureEncoder = (TextureMediaEncoder) mEncoderEngine.getVideoEncoder(); TextureMediaEncoder textureEncoder = (TextureMediaEncoder) mEncoderEngine.getVideoEncoder();
TextureMediaEncoder.Frame frame = textureEncoder.acquireFrame(); TextureMediaEncoder.Frame frame = textureEncoder.acquireFrame();
frame.timestamp = surfaceTexture.getTimestamp(); frame.timestamp = surfaceTexture.getTimestamp();
@ -188,6 +186,7 @@ public class SnapshotVideoRecorder extends VideoRecorder implements RendererFram
} catch (Surface.OutOfResourcesException e) { } catch (Surface.OutOfResourcesException e) {
LOG.w("Got Surface.OutOfResourcesException while drawing video overlays", e); LOG.w("Got Surface.OutOfResourcesException while drawing video overlays", e);
} }
mIssue514Workaround.start();
mOverlaySurfaceTexture.updateTexImage(); mOverlaySurfaceTexture.updateTexImage();
mOverlaySurfaceTexture.getTransformMatrix(frame.overlayTransform); mOverlaySurfaceTexture.getTransformMatrix(frame.overlayTransform);
} }

Loading…
Cancel
Save