diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2016-12-26 20:47:16 +0100 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2018-01-27 00:41:41 +0100 |
| commit | ba57c48121628a3bb8ebf160d8ba3233e1de19ef (patch) | |
| tree | d5448f1eb1181e5891c5f37f943b71610ef4b57d /src/com/android/camera/imageprocessor | |
| parent | eaad57426c2bb2a0e61a65b24ba1c7feeccf3255 (diff) | |
| download | android_packages_apps_Snap-ba57c48121628a3bb8ebf160d8ba3233e1de19ef.tar.gz android_packages_apps_Snap-ba57c48121628a3bb8ebf160d8ba3233e1de19ef.tar.bz2 android_packages_apps_Snap-ba57c48121628a3bb8ebf160d8ba3233e1de19ef.zip | |
Snap: CaptureModule: check if ZSL is supported before using it
Change-Id: Ifde34ce367ceeb19ad71bcff0c4518d578bb52a5
Diffstat (limited to 'src/com/android/camera/imageprocessor')
| -rwxr-xr-x | src/com/android/camera/imageprocessor/PostProcessor.java | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java index acaf9ea3b..f133c66b9 100755 --- a/src/com/android/camera/imageprocessor/PostProcessor.java +++ b/src/com/android/camera/imageprocessor/PostProcessor.java @@ -132,7 +132,7 @@ public class PostProcessor{ private CameraCaptureSession mCaptureSession; private ImageReader mImageReader; private ImageReader mZSLReprocessImageReader; - private boolean mUseZSL = true; + private boolean mUseZSL = false; private boolean mSaveRaw = false; private Handler mZSLHandler; private HandlerThread mZSLHandlerThread; @@ -147,6 +147,14 @@ public class PostProcessor{ private int mPendingContinuousRequestCount = 0; public int mMaxRequiredImageNum; + private void checkAndEnableZSL(int cameraId) { + if (mController.mSettingsManager.isZslSupported(cameraId)) { + mUseZSL = true; + } else { + mUseZSL = false; + } + } + public int getMaxRequiredImageNum() { return mMaxRequiredImageNum; } @@ -619,6 +627,7 @@ public class PostProcessor{ public PostProcessor(CameraActivity activity, CaptureModule module) { mController = module; mActivity = activity; + checkAndEnableZSL(mController.getMainCameraId()); mNamedImages = new PhotoModule.NamedImages(); } @@ -679,21 +688,26 @@ public class PostProcessor{ boolean isSupportedQcfa) { mImageHandlerTask = new ImageHandlerTask(); mSaveRaw = isSaveRaw; - if(setFilter(postFilterId) || isFlashModeOn || isTrackingFocusOn || isMakeupOn || isSelfieMirrorOn - || PersistUtil.getCameraZSLDisabled() - || !SettingsManager.getInstance().isZSLInAppEnabled() - || SettingsManager.SCENE_MODE_BOKEH_STRING.equals( - SettingsManager.getInstance().getValue(SettingsManager.KEY_SCENE_MODE)) - || "enable".equals( - SettingsManager.getInstance().getValue(SettingsManager.KEY_AUTO_HDR)) - || SettingsManager.getInstance().isCamera2HDRSupport() - || "18".equals(SettingsManager.getInstance().getValue( - SettingsManager.KEY_SCENE_MODE)) - || mController.getCameraMode() == CaptureModule.DUAL_MODE - || isSupportedQcfa) { - mUseZSL = false; + if (mController.mSettingsManager.isZslSupported(mController.getMainCameraId())) { + if(setFilter(postFilterId) || isFlashModeOn || isTrackingFocusOn || isMakeupOn || isSelfieMirrorOn + || PersistUtil.getCameraZSLDisabled() + || !SettingsManager.getInstance().isZSLInAppEnabled() + || "disable".equals(SettingsManager.getInstance().getValue(SettingsManager.KEY_ZSL)) + || SettingsManager.SCENE_MODE_BOKEH_STRING.equals( + SettingsManager.getInstance().getValue(SettingsManager.KEY_SCENE_MODE)) + || "enable".equals( + SettingsManager.getInstance().getValue(SettingsManager.KEY_AUTO_HDR)) + || SettingsManager.getInstance().isCamera2HDRSupport() + || "18".equals(SettingsManager.getInstance().getValue( + SettingsManager.KEY_SCENE_MODE)) + || mController.getCameraMode() == CaptureModule.DUAL_MODE + || isSupportedQcfa) { + mUseZSL = false; + } else { + mUseZSL = true; + } } else { - mUseZSL = true; + mUseZSL = false; } Log.d(TAG,"ZSL is "+mUseZSL); startBackgroundThread(); |