diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 3 | ||||
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 3 | ||||
-rwxr-xr-x | src/com/android/camera/MediaSaveService.java | 4 | ||||
-rwxr-xr-x | src/com/android/camera/PhotoModule.java | 17 | ||||
-rw-r--r-- | src/com/android/camera/imageprocessor/ZSLQueue.java | 6 | ||||
-rwxr-xr-x | src/com/android/camera/util/PersistUtil.java | 106 | ||||
-rw-r--r--[-rwxr-xr-x] | src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java | 20 |
7 files changed, 127 insertions, 32 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 127214023..1e7c431af 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1651,7 +1651,8 @@ public class CameraActivity extends Activity SETTING_LIST_WIDTH_1 = lower / 2 + offset; SETTING_LIST_WIDTH_2 = lower / 2 - offset; registerSDcardMountedReceiver(); - mAutoTestEnabled = SystemProperties.getBoolean("persist.vendor.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 db19bbe15..0e07f543c 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; @@ -1038,7 +1039,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/MediaSaveService.java b/src/com/android/camera/MediaSaveService.java index e3980f752..dd9a1360b 100755 --- 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.sys.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 7f656648f..e8775f6aa 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -226,12 +226,7 @@ public class PhotoModule private boolean mFaceDetectionStarted = false; - private static final String PERSIST_LONG_SAVE = "persist.sys.camera.longshot.save"; - private static final String PERSIST_PREVIEW_RESTART = "persist.sys.camera.feature.restart"; - private static final String PERSIST_CAPTURE_ANIMATION = "persist.sys.camera.capture.animate"; - private static final boolean PERSIST_SKIP_MEM_CHECK = - android.os.SystemProperties.getBoolean("persist.sys.camera.perf.skip_memck", false); - private static final String PERSIST_ZZHDR_ENABLE="persist.sys.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; @@ -1825,8 +1820,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); @@ -2064,7 +2058,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)) { @@ -2523,7 +2517,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. @@ -2682,8 +2676,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 4bfb1e3bc..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.sys.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 c8df6006a..16549c973 100755 --- a/src/com/android/camera/util/PersistUtil.java +++ b/src/com/android/camera/util/PersistUtil.java @@ -75,6 +75,39 @@ public class PersistUtil { 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); + public static int getMemoryLimit() { return PERSIST_MEMORY_LIMIT; @@ -87,6 +120,9 @@ 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 Point getCameraPreviewSize() { Point result = null; @@ -150,4 +186,74 @@ public class PersistUtil { 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; + } } diff --git a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java index a5521bed2..957a9ee49 100755..100644 --- a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java +++ b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java @@ -87,17 +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; @@ -173,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); } |