From 278267a43e560e7146ae842e393329501ab7dc9b Mon Sep 17 00:00:00 2001 From: Weijie Wang Date: Fri, 21 Jul 2017 10:00:45 +0800 Subject: SnapdragonCamera: Move property to PersistUtil Move property to PersistUtil Change-Id: I0735d8215ba302ef4c632d6a15ad95a04cd259a0 --- src/com/android/camera/CameraActivity.java | 11 +- src/com/android/camera/CameraSettings.java | 3 +- src/com/android/camera/CaptureModule.java | 56 ++---- src/com/android/camera/MediaSaveService.java | 4 +- src/com/android/camera/PhotoModule.java | 18 +- .../android/camera/imageprocessor/ZSLQueue.java | 6 +- src/com/android/camera/util/PersistUtil.java | 204 ++++++++++++++++++++- .../snapcam/filter/ClearSightImageProcessor.java | 19 +- 8 files changed, 236 insertions(+), 85 deletions(-) mode change 100755 => 100644 src/com/android/camera/CameraActivity.java (limited to 'src') diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java old mode 100755 new mode 100644 index ea4bc03ba..7f155cbd7 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -129,7 +129,7 @@ public class CameraActivity extends Activity ActionBar.OnMenuVisibilityListener, ShareActionProvider.OnShareTargetSelectedListener { - private static final String TAG = "CAM_Activity"; + private static final String TAG = "CAM_Activity"; private static final String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE = "android.media.action.STILL_IMAGE_CAMERA_SECURE"; @@ -639,14 +639,8 @@ public class CameraActivity extends Activity View decorView = getWindow().getDecorView(); int currentSystemUIVisibility = decorView.getSystemUiVisibility(); - boolean hidePreview = SystemProperties.getBoolean("camera.ui.no_navigation_bar", false); int systemUIVisibility = DEFAULT_SYSTEM_UI_VISIBILITY; int systemUINotVisible = View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN; - if (hidePreview) { - systemUIVisibility |= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; - systemUINotVisible |= (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); - } int newSystemUIVisibility = systemUIVisibility | (visible ? View.SYSTEM_UI_FLAG_VISIBLE : systemUINotVisible); @@ -1651,7 +1645,8 @@ public class CameraActivity extends Activity SETTING_LIST_WIDTH_1 = lower / 2 + offset; SETTING_LIST_WIDTH_2 = lower / 2 - offset; registerSDcardMountedReceiver(); - mAutoTestEnabled = SystemProperties.getBoolean("camera.ui.auto_test", false); + + mAutoTestEnabled = PersistUtil.isAutoTestEnabled(); if (mAutoTestEnabled) { registerAutoTestReceiver(); diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 5471f1550..44f3978f5 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -38,6 +38,7 @@ import android.util.Log; import com.android.camera.util.ApiHelper; import com.android.camera.util.CameraUtil; import com.android.camera.util.GcamHelper; +import com.android.camera.util.PersistUtil; import org.codeaurora.snapcam.R; import org.codeaurora.snapcam.wrapper.CamcorderProfileWrapper; import org.codeaurora.snapcam.wrapper.ParametersWrapper; @@ -1041,7 +1042,7 @@ public class CameraSettings { removePreference(group, cameraHdrPlus.getKey()); } - if (SystemProperties.getBoolean("persist.env.camera.saveinsd", false)) { + if (PersistUtil.isSaveInSdEnabled()) { final String CAMERA_SAVEPATH_SDCARD = "1"; final int CAMERA_SAVEPATH_SDCARD_IDX = 1; final int CAMERA_SAVEPATH_PHONE_IDX = 0; diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 46a822e67..dee81d566 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2387,42 +2387,6 @@ public class CaptureModule implements CameraModule, PhotoController, updateMaxVideoDuration(); } - private Size checkOverridePreviewSize(int cur_width, int cur_height) { - int preview_resolution = PersistUtil.getCameraPreviewSize(); - - switch (preview_resolution) { - case 1: { - cur_width = 640; - cur_height = 480; - Log.v(TAG, "Preview resolution hardcoded to 640x480"); - break; - } - case 2: { - cur_width = 720; - cur_height = 480; - Log.v(TAG, "Preview resolution hardcoded to 720x480"); - break; - } - case 3: { - cur_width = 1280; - cur_height = 720; - Log.v(TAG, "Preview resolution hardcoded to 1280x720"); - break; - } - case 4: { - cur_width = 1920; - cur_height = 1080; - Log.v(TAG, "Preview resolution hardcoded to 1920x1080"); - break; - } - default: { - Log.v(TAG, "Preview resolution as per Snapshot aspect ratio"); - break; - } - } - return new Size(cur_width, cur_height); - } - private void updatePreviewSize() { int width = mPreviewSize.getWidth(); int height = mPreviewSize.getHeight(); @@ -2433,7 +2397,16 @@ public class CaptureModule implements CameraModule, PhotoController, width = mVideoSize.getWidth(); height = mVideoSize.getHeight(); } - mPreviewSize = checkOverridePreviewSize(width, height); + + Point previewSize = PersistUtil.getCameraPreviewSize(); + if (previewSize != null) { + width = previewSize.x; + height = previewSize.y; + } + + Log.d(TAG, "updatePreviewSize final preview size = " + width + ", " + height); + + mPreviewSize = new Size(width, height); mUI.setPreviewSize(mPreviewSize.getWidth(), mPreviewSize.getHeight()); } @@ -3150,8 +3123,13 @@ public class CaptureModule implements CameraModule, PhotoController, Size[] prevSizes = mSettingsManager.getSupportedOutputSize(getMainCameraId(), MediaRecorder.class); mVideoPreviewSize = getOptimalPreviewSize(mVideoSize, prevSizes); - mVideoPreviewSize = checkOverridePreviewSize(mVideoPreviewSize.getWidth(), - mVideoPreviewSize.getHeight()); + + Point previewSize = PersistUtil.getCameraPreviewSize(); + if (previewSize != null) { + mVideoPreviewSize = new Size(previewSize.x, previewSize.y); + } + Log.d(TAG, "updatePreviewSize final preview size = " + mVideoPreviewSize.getWidth() + + ", " + mVideoPreviewSize.getHeight()); } private void updateVideoSnapshotSize() { diff --git a/src/com/android/camera/MediaSaveService.java b/src/com/android/camera/MediaSaveService.java index 6ca37b9e2..217f44f27 100644 --- a/src/com/android/camera/MediaSaveService.java +++ b/src/com/android/camera/MediaSaveService.java @@ -41,6 +41,7 @@ import com.android.camera.exif.ExifInterface; import com.android.camera.mpo.MpoData; import com.android.camera.mpo.MpoImageData; import com.android.camera.mpo.MpoInterface; +import com.android.camera.util.PersistUtil; import com.android.camera.util.XmpUtil; import org.codeaurora.snapcam.filter.GDepth; @@ -58,7 +59,8 @@ public class MediaSaveService extends Service { // The memory limit for unsaved image is 50MB. private static final int SAVE_TASK_MEMORY_LIMIT_IN_MB = - android.os.SystemProperties.getInt("persist.camera.perf.memlimit", 60); + PersistUtil.getSaveTaskMemoryLimitInMb(); + private static final int SAVE_TASK_MEMORY_LIMIT = SAVE_TASK_MEMORY_LIMIT_IN_MB * 1024 * 1024; private static final String TAG = "CAM_" + MediaSaveService.class.getSimpleName(); diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 17d45890a..f3c57cb71 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -84,6 +84,7 @@ import com.android.camera.ui.RotateTextToast; import com.android.camera.util.ApiHelper; import com.android.camera.util.CameraUtil; import com.android.camera.util.GcamHelper; +import com.android.camera.util.PersistUtil; import com.android.camera.util.UsageStatistics; import org.codeaurora.snapcam.R; import org.codeaurora.snapcam.wrapper.ParametersWrapper; @@ -221,12 +222,7 @@ public class PhotoModule private boolean mFaceDetectionStarted = false; - private static final String PERSIST_LONG_SAVE = "persist.camera.longshot.save"; - private static final String PERSIST_PREVIEW_RESTART = "persist.camera.feature.restart"; - private static final String PERSIST_CAPTURE_ANIMATION = "persist.camera.capture.animate"; - private static final boolean PERSIST_SKIP_MEM_CHECK = - android.os.SystemProperties.getBoolean("persist.camera.perf.skip_memck", false); - private static final String PERSIST_ZZHDR_ENABLE="persist.camera.zzhdr.enable"; + private static final boolean PERSIST_SKIP_MEM_CHECK = PersistUtil.isSkipMemoryCheckEnabled(); private static final int MINIMUM_BRIGHTNESS = 0; private static final int MAXIMUM_BRIGHTNESS = 6; @@ -1763,8 +1759,7 @@ public class PhotoModule mBurstSnapNum = 1; } mReceivedSnapNum = 0; - mPreviewRestartSupport = SystemProperties.getBoolean( - PERSIST_PREVIEW_RESTART, false); + mPreviewRestartSupport = PersistUtil.isPreviewRestartEnabled(); mPreviewRestartSupport &= CameraSettings.isInternalPreviewSupported( mParameters); mPreviewRestartSupport &= (mBurstSnapNum == 1); @@ -2002,7 +1997,7 @@ public class PhotoModule colorEffect = mParameters.getColorEffect(); String defaultEffect = mActivity.getString(R.string.pref_camera_coloreffect_default); if (CameraUtil.SCENE_MODE_HDR.equals(mSceneMode)) { - if(SystemProperties.getInt(PERSIST_ZZHDR_ENABLE, 0) != 1) { + if ( !PersistUtil.isZzhdrEnabled() ){ disableLongShot = true; } if (colorEffect != null & !colorEffect.equals(defaultEffect)) { @@ -2461,7 +2456,7 @@ public class PhotoModule Log.d(TAG, "longshot_enable = " + longshot_enable); if (longshot_enable.equals("on")) { - boolean enable = SystemProperties.getBoolean(PERSIST_LONG_SAVE, false); + boolean enable = PersistUtil.isLongSaveEnabled(); mLongshotSave = enable; //Cancel the previous countdown when long press shutter button for longshot. @@ -2620,8 +2615,7 @@ public class PhotoModule mOnResumeTime = SystemClock.uptimeMillis(); checkDisplayRotation(); - mAnimateCapture = SystemProperties.getBoolean( - PERSIST_CAPTURE_ANIMATION, true); + mAnimateCapture = PersistUtil.isCaptureAnimationEnabled(); } @Override diff --git a/src/com/android/camera/imageprocessor/ZSLQueue.java b/src/com/android/camera/imageprocessor/ZSLQueue.java index c9ecb79a2..0509b8fb5 100644 --- a/src/com/android/camera/imageprocessor/ZSLQueue.java +++ b/src/com/android/camera/imageprocessor/ZSLQueue.java @@ -42,9 +42,7 @@ import java.util.LinkedList; import java.util.NoSuchElementException; public class ZSLQueue { - private static final String CIRCULAR_BUFFER_SIZE_PERSIST = "persist.camera.zsl.buffer.size"; - private static final int CIRCULAR_BUFFER_SIZE_DEFAULT = 5; - private int mCircularBufferSize = CIRCULAR_BUFFER_SIZE_DEFAULT; + private int mCircularBufferSize; private ImageItem[] mBuffer; private int mImageHead; private int mMetaHead; @@ -56,7 +54,7 @@ public class ZSLQueue { private static final String TAG = "ZSLQueue"; public ZSLQueue(CaptureModule module) { - mCircularBufferSize = SystemProperties.getInt(CIRCULAR_BUFFER_SIZE_PERSIST, CIRCULAR_BUFFER_SIZE_DEFAULT); + mCircularBufferSize = PersistUtil.getCircularBufferSize(); synchronized (mLock) { mBuffer = new ImageItem[mCircularBufferSize]; mImageHead = 0; diff --git a/src/com/android/camera/util/PersistUtil.java b/src/com/android/camera/util/PersistUtil.java index 8c1b57e98..976389ea2 100644 --- a/src/com/android/camera/util/PersistUtil.java +++ b/src/com/android/camera/util/PersistUtil.java @@ -28,20 +28,32 @@ */ package com.android.camera.util; +import android.graphics.Point; import android.os.SystemProperties; +import android.text.TextUtils; +import android.util.Log; public class PersistUtil { + public static final int CAMERA2_DEBUG_DUMP_IMAGE = 1; + public static final int CAMERA2_DEBUG_DUMP_LOG = 2; + public static final int CAMERA2_DEBUG_DUMP_ALL = 100; + + private static final int CAMERA_SENSOR_HORIZONTAL_ALIGNED = 0; + private static final int CAMERA_SENSOR_VERTICAL_ALIGNED = 1; + private static final int PERSIST_MEMORY_LIMIT = SystemProperties.getInt("persist.vendor.camera.perf.memlimit", 60); private static final boolean PERSIST_SKIP_MEMORY_CHECK = SystemProperties.getBoolean("persist.vendor.camera.perf.skip_memck", false); private static final int PERSIST_LONGSHOT_SHOT_LIMIT = SystemProperties.getInt("persist.vendor.camera.longshot.shotnum", 50); - private static final int PERSIST_CAMERA_PREVIEW_SIZE = - SystemProperties.getInt("persist.vendor.camera.preview.size", 0); + private static final String PERSIST_CAMERA_PREVIEW_SIZE = + SystemProperties.get("persist.vendor.camera.preview.size", ""); private static final boolean PERSIST_CAMERA_CAMERA2 = SystemProperties.getBoolean("persist.vendor.camera.camera2", true); + private static final boolean PERSIST_CAMERA_ZSL = + SystemProperties.getBoolean("persist.vendor.camera.zsl.disabled", false); private static final int PERSIST_CAMERA2_DEBUG = SystemProperties.getInt("persist.vendor.camera2.debug", 0); private static final int PERSIST_CAMERA_CANCEL_TOUCHFOCUS_DELAY = @@ -56,10 +68,59 @@ public class PersistUtil { SystemProperties.get("persist.vendor.camera.stm_smooth", "0"); private static final int PERSIST_CAMERA_STILLMORE_NUM_REQUIRED_IMAGE = SystemProperties.getInt("persist.vendor.camera.stm_img_nums", 5); - - public static final int CAMERA2_DEBUG_DUMP_IMAGE = 1; - public static final int CAMERA2_DEBUG_DUMP_LOG = 2; - public static final int CAMERA2_DEBUG_DUMP_ALL = 100; + private static final String PERSIST_CAMERA_CS_BRINTENSITY_KEY = + SystemProperties.get("persist.vendor.camera.sensor.brinten", "0.0"); + private static final String PERSIST_CAMERA_CS_SMOOTH_KEY = + SystemProperties.get("persist.vendor.camera.sensor.smooth", "0.5"); + private static final int PERSIST_CAMERA_SENSOR_ALIGN_KEY = + SystemProperties.getInt("persist.vendor.camera.sensor.align", + CAMERA_SENSOR_HORIZONTAL_ALIGNED); + private static final int CIRCULAR_BUFFER_SIZE_PERSIST = + SystemProperties.getInt("persist.vendor.camera.zsl.buffer.size", 5); + private static final int SAVE_TASK_MEMORY_LIMIT_IN_MB = + SystemProperties.getInt("persist.vendor.camera.perf.memlimit", 60); + private static final boolean PERSIST_CAMERA_UI_AUTO_TEST_ENABLED = + SystemProperties.getBoolean("persist.vendor.camera.ui.auto_test", false); + private static final boolean PERSIST_CAMERA_SAVE_IN_SD_ENABLED = + SystemProperties.getBoolean("persist.vendor.env.camera.saveinsd", false); + private static final boolean PERSIST_LONG_SAVE_ENABLED = + SystemProperties.getBoolean("persist.vendor.camera.longshot.save", false); + private static final boolean PERSIST_CAMERA_PREVIEW_RESTART_ENABLED = + SystemProperties.getBoolean("persist.vendor.camera.feature.restart", false); + private static final boolean PERSIST_CAPTURE_ANIMATION_ENABLED = + SystemProperties.getBoolean("persist.vendor.camera.capture.animate", true); + private static final boolean PERSIST_SKIP_MEM_CHECK_ENABLED = + SystemProperties.getBoolean("persist.vendor.camera.perf.skip_memck", false); + private static final boolean PERSIST_ZZHDR_ENABLED = + SystemProperties.getBoolean("persist.vendor.camera.zzhdr.enable", false); + private static final int PERSIST_PREVIEW_SIZE = + SystemProperties.getInt("persist.vendor.camera.preview.size", 0); + private static final long PERSIST_TIMESTAMP_LIMIT = + SystemProperties.getLong("persist.vendor.camera.cs.threshold", 10); + private static final int PERSIST_BURST_COUNT = + SystemProperties.getInt("persist.vendor.camera.cs.burstcount", 4); + private static final boolean PERSIST_DUMP_FRAMES_ENABLED = + SystemProperties.getBoolean("persist.vendor.camera.cs.dumpframes", false); + private static final boolean PERSIST_DUMP_YUV_ENABLED = + SystemProperties.getBoolean("persist.vendor.camera.cs.dumpyuv", false); + private static final int PERSIST_CS_TIMEOUT = + SystemProperties.getInt("persist.vendor.camera.cs.timeout", 300); + private static final boolean PERSIST_DUMP_DEPTH_ENABLED = + SystemProperties.getBoolean("persist.vendor.camera.cs.dumpdepth", false); + private static final boolean PERSIST_DISABLE_QCOM_MISC_SETTING = + SystemProperties.getBoolean("persist.vendor.camera.qcom.misc.disable", false); + private static final int PREVIEW_FLIP_VALUE = + SystemProperties.getInt("persist.vendor.debug.camera.preview.flip", 0); + private static final int PERSIST_VIDEO_FLIP_VALUE = + SystemProperties.getInt("persist.vendor.debug.camera.video.flip", 0); + private static final int PERSIST_PICTURE_FLIP_VALUE = + SystemProperties.getInt("persist.vendor.debug.camera.picture.flip", 0); + private static final boolean PERSIST_YV_12_FORMAT_ENABLED = + SystemProperties.getBoolean("persist.vendor.camera.debug.camera.yv12", false); + private static final String PERSIST_DISPLAY_UMAX = + SystemProperties.get("persist.vendor.camera.display.umax", ""); + private static final String PERSIST_DISPLAY_LMAX = + SystemProperties.get("persist.vendor.camera.display.lmax", ""); public static int getMemoryLimit() { return PERSIST_MEMORY_LIMIT; @@ -72,15 +133,31 @@ public class PersistUtil { public static int getLongshotShotLimit() { return PERSIST_LONGSHOT_SHOT_LIMIT; } + public static int getLongshotShotLimit(int defaultValue) { + return SystemProperties.getInt("persist.vendor.camera.longshot.shotnum", defaultValue); + } - public static int getCameraPreviewSize() { - return PERSIST_CAMERA_PREVIEW_SIZE; + public static Point getCameraPreviewSize() { + Point result = null; + if (PERSIST_CAMERA_PREVIEW_SIZE != null) { + String[] sourceStrArray = PERSIST_CAMERA_PREVIEW_SIZE.split("x"); + if (sourceStrArray != null && sourceStrArray.length >= 2) { + result = new Point(); + result.x = Integer.parseInt(sourceStrArray[0]); + result.y = Integer.parseInt(sourceStrArray[1]); + } + } + return result; } public static boolean getCamera2Mode() { return PERSIST_CAMERA_CAMERA2; } + public static boolean getCameraZSLDisabled() { + return PERSIST_CAMERA_ZSL; + } + public static int getCamera2Debug() { return PERSIST_CAMERA_DEBUG; } @@ -110,4 +187,115 @@ public class PersistUtil { public static int getCancelTouchFocusDelay() { return PERSIST_CAMERA_CANCEL_TOUCHFOCUS_DELAY; } + + public static float getDualCameraBrIntensity() { + return Float.parseFloat(PERSIST_CAMERA_CS_BRINTENSITY_KEY); + } + + public static float getDualCameraSmoothingIntensity() { + return Float.parseFloat(PERSIST_CAMERA_CS_SMOOTH_KEY); + } + + public static boolean getDualCameraSensorAlign() { + return PERSIST_CAMERA_SENSOR_ALIGN_KEY == CAMERA_SENSOR_VERTICAL_ALIGNED; + } + + public static int getCircularBufferSize(){ + return CIRCULAR_BUFFER_SIZE_PERSIST; + } + + public static int getSaveTaskMemoryLimitInMb(){ + return SAVE_TASK_MEMORY_LIMIT_IN_MB; + } + + public static boolean isAutoTestEnabled(){ + return PERSIST_CAMERA_UI_AUTO_TEST_ENABLED; + } + + public static boolean isSaveInSdEnabled(){ + return PERSIST_CAMERA_SAVE_IN_SD_ENABLED; + } + + public static boolean isLongSaveEnabled(){ + return PERSIST_LONG_SAVE_ENABLED; + } + + public static boolean isPreviewRestartEnabled(){ + return PERSIST_CAMERA_PREVIEW_RESTART_ENABLED; + } + + public static boolean isCaptureAnimationEnabled(){ + return PERSIST_CAPTURE_ANIMATION_ENABLED; + } + + public static boolean isSkipMemoryCheckEnabled(){ + return PERSIST_SKIP_MEM_CHECK_ENABLED; + } + + public static boolean isZzhdrEnabled(){ + return PERSIST_ZZHDR_ENABLED; + } + + public static int getPreviewSize(){ + //Read Preview Resolution from adb command + //value: 0(default) - Default value as per snapshot aspect ratio + //value: 1 - 640x480 + //value: 2 - 720x480 + //value: 3 - 1280x720 + //value: 4 - 1920x1080 + return PERSIST_PREVIEW_SIZE; + } + + public static long getTimestampLimit(){ + return PERSIST_TIMESTAMP_LIMIT; + } + + public static int getImageToBurst(){ + return PERSIST_BURST_COUNT; + } + + public static boolean isDumpFramesEnabled(){ + return PERSIST_DUMP_FRAMES_ENABLED; + } + + public static boolean isDumpYUVEnabled(){ + return PERSIST_DUMP_YUV_ENABLED; + } + + public static int getClearSightTimeout(){ + return PERSIST_CS_TIMEOUT; + } + + public static boolean isDumpDepthEnabled() { + return PERSIST_DUMP_DEPTH_ENABLED; + } + + public static boolean isDisableQcomMiscSetting(){ + return PERSIST_DISABLE_QCOM_MISC_SETTING; + } + + public static int getPreviewFlip() { + return PREVIEW_FLIP_VALUE; + } + + public static int getVideoFlip() { + return PERSIST_VIDEO_FLIP_VALUE; + } + + public static int getPictureFlip() { + return PERSIST_PICTURE_FLIP_VALUE; + } + + public static boolean isYv12FormatEnable() { + return PERSIST_YV_12_FORMAT_ENABLED; + } + + public static String getDisplayUMax() { + return PERSIST_DISPLAY_UMAX; + } + + public static String getDisplayLMax() { + return PERSIST_DISPLAY_LMAX; + } + } diff --git a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java index 03e06a1a1..8a871aa01 100644 --- a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java +++ b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java @@ -87,16 +87,11 @@ import com.android.camera.PhotoModule.NamedImages.NamedEntity; import com.android.camera.SettingsManager; import com.android.camera.Storage; import com.android.camera.util.CameraUtil; +import com.android.camera.util.PersistUtil; import com.android.camera.util.VendorTagUtil; public class ClearSightImageProcessor { private static final String TAG = "ClearSightImageProcessor"; - private static final String PERSIST_TIMESTAMP_LIMIT_KEY = "persist.vendor.camera.cs.threshold"; - private static final String PERSIST_BURST_COUNT_KEY = "persist.vendor.camera.cs.burstcount"; - private static final String PERSIST_DUMP_FRAMES_KEY = "persist.vendor.camera.cs.dumpframes"; - private static final String PERSIST_DUMP_YUV_KEY = "persist.vendor.camera.cs.dumpyuv"; - private static final String PERSIST_CS_TIMEOUT_KEY = "persist.vendor.camera.cs.timeout"; - private static final String PERSIST_DUMP_DEPTH_KEY = "persist.vendor.camera.cs.dumpdepth"; private static final long DEFAULT_TIMESTAMP_THRESHOLD_MS = 10; private static final int DEFAULT_IMAGES_TO_BURST = 4; @@ -172,26 +167,26 @@ public class ClearSightImageProcessor { private ClearSightImageProcessor() { mNamedImages = new NamedImages(); - long threshMs = SystemProperties.getLong(PERSIST_TIMESTAMP_LIMIT_KEY, DEFAULT_TIMESTAMP_THRESHOLD_MS); + long threshMs = PersistUtil.getTimestampLimit(); mTimestampThresholdNs = threshMs * 1000000; Log.d(TAG, "mTimestampThresholdNs: " + mTimestampThresholdNs); - mNumBurstCount = SystemProperties.getInt(PERSIST_BURST_COUNT_KEY, DEFAULT_IMAGES_TO_BURST); + mNumBurstCount = PersistUtil.getImageToBurst(); Log.d(TAG, "mNumBurstCount: " + mNumBurstCount); mNumFrameCount = mNumBurstCount - 1; Log.d(TAG, "mNumFrameCount: " + mNumFrameCount); - mDumpImages = SystemProperties.getBoolean(PERSIST_DUMP_FRAMES_KEY, false); + mDumpImages = PersistUtil.isDumpFramesEnabled(); Log.d(TAG, "mDumpImages: " + mDumpImages); - mDumpYUV = SystemProperties.getBoolean(PERSIST_DUMP_YUV_KEY, false); + mDumpYUV = PersistUtil.isDumpYUVEnabled(); Log.d(TAG, "mDumpYUV: " + mDumpYUV); - mDumpDepth = SystemProperties.getBoolean(PERSIST_DUMP_DEPTH_KEY, false); + mDumpDepth = PersistUtil.isDumpDepthEnabled(); Log.d(TAG, "mDumpDepth: " + mDumpDepth); - mCsTimeout = SystemProperties.getInt(PERSIST_CS_TIMEOUT_KEY, DEFAULT_CS_TIMEOUT_MS); + mCsTimeout = PersistUtil.getClearSightTimeout(); Log.d(TAG, "mCsTimeout: " + mCsTimeout); } -- cgit v1.2.3