diff options
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/camera/CaptureModule.java | 52 |
1 files changed, 42 insertions, 10 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 052aea1ff..80e9d55bf 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -557,6 +557,11 @@ public class CaptureModule implements CameraModule, PhotoController, mSettingsManager.getSensorActiveArraySize(getMainCameraId())); } + private boolean canStartMonoPreview() { + return getCameraMode() == MONO_MODE || + (getCameraMode() == DUAL_MODE && isMonoPreviewOn()); + } + private boolean isMonoPreviewOn() { String value = mSettingsManager.getValue(SettingsManager.KEY_MONO_PREVIEW); if (value == null) return false; @@ -717,8 +722,15 @@ public class CaptureModule implements CameraModule, PhotoController, mIsLinked = true; } // Finally, we start displaying the camera preview. - mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id] - .build(), mCaptureCallback, mCameraHandler); + // for cases where we are in dual mode with mono preview off, + // don't set repeating request for mono + if(id == MONO_ID && !canStartMonoPreview()) { + mCaptureSession[id].capture(mPreviewRequestBuilder[id] + .build(), mCaptureCallback, mCameraHandler); + } else { + mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id] + .build(), mCaptureCallback, mCameraHandler); + } if (isClearSightOn()) { ClearSightImageProcessor.getInstance().onCaptureSessionConfigured(id == BAYER_ID, cameraCaptureSession); } @@ -786,8 +798,13 @@ public class CaptureModule implements CameraModule, PhotoController, applyAFRegions(mPreviewRequestBuilder[id], id); applyAERegions(mPreviewRequestBuilder[id], id); try { - mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id] - .build(), mCaptureCallback, mCameraHandler); + if(id == MONO_ID && !canStartMonoPreview()) { + mCaptureSession[id].capture(mPreviewRequestBuilder[id] + .build(), mCaptureCallback, mCameraHandler); + } else { + mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id] + .build(), mCaptureCallback, mCameraHandler); + } } catch (CameraAccessException e) { e.printStackTrace(); } @@ -1315,8 +1332,13 @@ public class CaptureModule implements CameraModule, PhotoController, mState[id] = STATE_PREVIEW; mControlAFMode = CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE; setAFModeToPreview(id, mControlAFMode); - mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id].build(), - mCaptureCallback, mCameraHandler); + if(id == MONO_ID && !canStartMonoPreview()) { + mCaptureSession[id].capture(mPreviewRequestBuilder[id] + .build(), mCaptureCallback, mCameraHandler); + } else { + mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id].build(), + mCaptureCallback, mCameraHandler); + } mTakingPicture[id] = false; mActivity.runOnUiThread(new Runnable() { @Override @@ -2599,8 +2621,13 @@ public class CaptureModule implements CameraModule, PhotoController, private void applyZoomAndUpdate(int id) { applyZoom(mPreviewRequestBuilder[id], id); try { - mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id] - .build(), mCaptureCallback, mCameraHandler); + if(id == MONO_ID && !canStartMonoPreview()) { + mCaptureSession[id].capture(mPreviewRequestBuilder[id] + .build(), mCaptureCallback, mCameraHandler); + } else { + mCaptureSession[id].setRepeatingRequest(mPreviewRequestBuilder[id] + .build(), mCaptureCallback, mCameraHandler); + } } catch (CameraAccessException e) { e.printStackTrace(); } @@ -2904,8 +2931,13 @@ public class CaptureModule implements CameraModule, PhotoController, } if (updatePreviewMono) { try { - mCaptureSession[MONO_ID].setRepeatingRequest(mPreviewRequestBuilder[MONO_ID] - .build(), mCaptureCallback, mCameraHandler); + if(canStartMonoPreview()) { + mCaptureSession[MONO_ID].setRepeatingRequest(mPreviewRequestBuilder[MONO_ID] + .build(), mCaptureCallback, mCameraHandler); + } else { + mCaptureSession[MONO_ID].capture(mPreviewRequestBuilder[MONO_ID] + .build(), mCaptureCallback, mCameraHandler); + } } catch (CameraAccessException e) { e.printStackTrace(); } |