diff options
| author | Suman Mukherjee <sumam@codeaurora.org> | 2014-04-10 16:20:07 +0530 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-10-20 22:25:37 +0000 |
| commit | 0cb7b88c950d1f2b1b5e770a1db2099844113064 (patch) | |
| tree | 0c5ee857d793d6a7c7369f48db3ce6e0623a60d7 | |
| parent | d1a6002bb9cfc4fcf62c887e186d0c18ff1e816c (diff) | |
| download | android_packages_apps_Camera2-0cb7b88c950d1f2b1b5e770a1db2099844113064.tar.gz android_packages_apps_Camera2-0cb7b88c950d1f2b1b5e770a1db2099844113064.tar.bz2 android_packages_apps_Camera2-0cb7b88c950d1f2b1b5e770a1db2099844113064.zip | |
Camera: Disable DIS option for unsupported resolution
DIS will not work for unsupported resolution.
If user'll start recording with DIS alongwith 720p resolution
using front camera, then it'll crash.
Fix: Block in UI, so that user'll not be able to select DIS with
unsupported resolution after intimating through toasts.
Change-Id: Ie788d456a7b15061f16a44ca34ccd3d1e6d90071
CRs-Fixed: 644268
| -rw-r--r-- | res/values/qcomstrings.xml | 3 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 16 |
2 files changed, 17 insertions, 2 deletions
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index aa83bb8ed..3f1b61662 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -120,6 +120,9 @@ <!-- The message is shown in dialog when the app encounters an unsupported video resolution--> <string name="error_app_unsupported">Unsupported video resolution for this codec type</string> + <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode --> + <string name="error_app_unsupported_dis">Video stabilization is not supported for selected resolution</string> + <!-- Settings screen, AE bracketing and HDR location dialog choices --> <string name="pref_camera_ae_bracket_hdr_title">Auto Exposure Bracketing</string> <string name="pref_camera_ae_bracket_hdr_default" translatable="false">Off</string> diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 6fb6f35d6..79ba012ff 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2127,10 +2127,22 @@ public class VideoModule implements CameraModule, Toast.makeText(mActivity, R.string.error_app_unsupported_hfr_selection, Toast.LENGTH_LONG).show(); mParameters.setVideoHighFrameRate("off"); - mUI.overrideSettings(CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE,"disable"); - mUI.initializePopup(mPreferenceGroup); + mUI.overrideSettings(CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE,"off"); } } + + //getSupportedPictureSizes will always send a sorted a list in descending order + Size biggestSize = mParameters.getSupportedPictureSizes().get(0); + + if (biggestSize.width <= videoWidth || biggestSize.height <= videoHeight) { + if (disMode.equals("enable")) { + Log.v(TAG,"DIS is not supported for this video quality"); + Toast.makeText(mActivity, R.string.error_app_unsupported_dis, + Toast.LENGTH_LONG).show(); + mParameters.set(CameraSettings.KEY_QC_DIS_MODE, "disable"); + mUI.overrideSettings(CameraSettings.KEY_DIS,"disable"); + } + } } @SuppressWarnings("deprecation") private void setCameraParameters() { |