diff options
author | Camera Software Integration <camswint@quicinc.com> | 2017-05-11 04:01:55 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-11 04:01:55 -0700 |
commit | 9d91e7ac658f4020a4c00ab7ac4d01a7b51b2def (patch) | |
tree | 9b4842d4bdf521153c34f547eb3346be4f5231f7 | |
parent | b58257d6a6b29ab6799ce51903df37e0f3e83e79 (diff) | |
parent | ed806d23b93e8dae24465402e7c736c2f334a986 (diff) | |
download | android_packages_apps_Snap-9d91e7ac658f4020a4c00ab7ac4d01a7b51b2def.tar.gz android_packages_apps_Snap-9d91e7ac658f4020a4c00ab7ac4d01a7b51b2def.tar.bz2 android_packages_apps_Snap-9d91e7ac658f4020a4c00ab7ac4d01a7b51b2def.zip |
Merge "SnapdragonCamera: Only support max picture size" into camera.lnx.2.0-dev
-rw-r--r--[-rwxr-xr-x] | src/com/android/camera/CaptureModule.java | 6 | ||||
-rw-r--r-- | src/com/android/camera/SettingsActivity.java | 10 | ||||
-rw-r--r-- | src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java | 14 |
3 files changed, 27 insertions, 3 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 0f6e8ed62..96ec5d8f2 100755..100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1728,8 +1728,10 @@ public class CaptureModule implements CameraModule, PhotoController, if (isClearSightOn()) { if(i == getMainCameraId()) { - ClearSightImageProcessor.getInstance().init(map, mPictureSize.getWidth(), - mPictureSize.getHeight(), mActivity, mOnMediaSavedListener); +// ClearSightImageProcessor.getInstance().init(map, mPictureSize.getWidth(), +// mPictureSize.getHeight(), mActivity, mOnMediaSavedListener); + ClearSightImageProcessor.getInstance().init(map, mActivity, + mOnMediaSavedListener); ClearSightImageProcessor.getInstance().setCallback(this); } } else { diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index d3f0b5a96..8d732b73a 100644 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -218,6 +218,7 @@ public class SettingsActivity extends PreferenceActivity { updatePreference(SettingsManager.KEY_VIDEO_HIGH_FRAME_RATE); updatePreference(SettingsManager.KEY_VIDEO_ENCODER); updatePreference(SettingsManager.KEY_ZOOM); + updatePictureSizePreferenceButton(); Map<String, SettingsManager.Values> map = mSettingsManager.getValuesMap(); Set<Map.Entry<String, SettingsManager.Values>> set = map.entrySet(); @@ -268,6 +269,15 @@ public class SettingsActivity extends PreferenceActivity { } } + private void updatePictureSizePreferenceButton() { + Preference picturePref = findPreference(SettingsManager.KEY_PICTURE_SIZE); + String sceneMode = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE); + if ( sceneMode != null && picturePref != null ){ + int sceneModeInt = Integer.parseInt(sceneMode); + picturePref.setEnabled(sceneModeInt != SettingsManager.SCENE_MODE_DUAL_INT); + } + } + private void updatePreference(String key) { ListPreference pref = (ListPreference) findPreference(key); if (pref != null) { diff --git a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java index 8a6e7667f..c042fba1f 100644 --- a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java +++ b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java @@ -84,6 +84,7 @@ import com.android.camera.MediaSaveService; import com.android.camera.MediaSaveService.OnMediaSavedListener; import com.android.camera.PhotoModule.NamedImages; import com.android.camera.PhotoModule.NamedImages.NamedEntity; +import com.android.camera.SettingsManager; import com.android.camera.Storage; import com.android.camera.util.CameraUtil; @@ -209,6 +210,17 @@ public class ClearSightImageProcessor { return mInstance; } + public void init(StreamConfigurationMap map, + Context context, OnMediaSavedListener mediaListener) { + Size maxSize = findMaxOutputSize(map); + int maxWidth = maxSize.getWidth(); + int maxHeight = maxSize.getHeight(); + SettingsManager settingsManager = SettingsManager.getInstance(); + settingsManager.setValue(SettingsManager.KEY_PICTURE_SIZE, + String.valueOf(maxWidth) + "x" + String.valueOf(maxHeight)); + init(map, maxWidth, maxHeight, context, mediaListener); + } + public void init(StreamConfigurationMap map, int width, int height, Context context, OnMediaSavedListener mediaListener) { Log.d(TAG, "init() start"); @@ -991,7 +1003,6 @@ public class ClearSightImageProcessor { } private void processClearSight(NamedEntity namedEntity) { - mImageEncodeHandler.obtainMessage(MSG_START_CAPTURE).sendToTarget(); short encodeRequest = 0; /* In same case, timeout will reset ClearSightNativeEngine object, so fields @@ -1382,6 +1393,7 @@ public class ClearSightImageProcessor { } private void generateDepthmap() { + mImageEncodeHandler.obtainMessage(MSG_START_CAPTURE).sendToTarget(); GDepth.DepthMap depthMap = null; int[] size = new int[2]; if ( mDDMNativeEngine.getDepthMapSize(size) ) { |