Enable missing functionality in Snapshot2PictureRecorder

pull/580/head
Mattia Iavarone 6 years ago
parent f08221b46a
commit e96008f4b0
  1. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java
  2. 13
      cameraview/src/main/java/com/otaliastudios/cameraview/picture/Snapshot2PictureRecorder.java

@ -235,7 +235,7 @@ public class Camera2Engine extends CameraEngine implements ImageReader.OnImageAv
} }
private void applyRepeatingRequestBuilder(boolean checkStarted, int errorReason) { private void applyRepeatingRequestBuilder(boolean checkStarted, int errorReason) {
if (!checkStarted || getPreviewState() == STATE_STARTED) { if (getPreviewState() == STATE_STARTED || !checkStarted) {
try { try {
mSession.setRepeatingRequest(mRepeatingRequestBuilder.build(), mSession.setRepeatingRequest(mRepeatingRequestBuilder.build(),
mRepeatingRequestCallback, null); mRepeatingRequestCallback, null);

@ -83,8 +83,7 @@ public class Snapshot2PictureRecorder extends SnapshotGlPictureRecorder implemen
@Override @Override
public void take() { public void take() {
// TODO if (!mActionNeeded) {
if (true || !mActionNeeded) {
LOG.i("take:", "Engine does no metering or needs no flash, taking fast snapshot."); LOG.i("take:", "Engine does no metering or needs no flash, taking fast snapshot.");
super.take(); super.take();
} else { } else {
@ -121,17 +120,10 @@ public class Snapshot2PictureRecorder extends SnapshotGlPictureRecorder implemen
@Override @Override
public void onLocked(boolean success) { public void onLocked(boolean success) {
LOG.i("onLocked:", "Parameters locked, opening torch."); LOG.i("onLocked:", "Parameters locked, opening torch.");
if (false) {
mState = STATE_WAITING_TORCH; mState = STATE_WAITING_TORCH;
mBuilder.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_TORCH); mBuilder.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_TORCH);
mBuilder.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON); mBuilder.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON);
applyBuilder(); applyBuilder();
} else {
// TODO
LOG.e("Early taking image.");
mState = STATE_WAITING_IMAGE;
super.take();
}
} }
public void onCaptureCompleted(@NonNull TotalCaptureResult result) { public void onCaptureCompleted(@NonNull TotalCaptureResult result) {
@ -159,8 +151,7 @@ public class Snapshot2PictureRecorder extends SnapshotGlPictureRecorder implemen
@Override @Override
protected void dispatchResult() { protected void dispatchResult() {
// TODO if (mState == STATE_WAITING_IMAGE) {
if (false && mState == STATE_WAITING_IMAGE) {
// Revert our changes. // Revert our changes.
LOG.i("dispatchResult:", "Reverting the flash changes."); LOG.i("dispatchResult:", "Reverting the flash changes.");
try { try {

Loading…
Cancel
Save