diff options
| author | Suman Mukherjee <sumam@codeaurora.org> | 2014-04-10 16:20:07 +0530 |
|---|---|---|
| committer | LorDClockaN <davor@losinj.com> | 2014-10-21 14:31:06 +0200 |
| commit | a1ef95597afa4315f87eebd9540a18cf071fd46c (patch) | |
| tree | d6204a0baf167ff9013f3e9e3046ec135f83acdc /src/com/android/camera/VideoModule.java | |
| parent | 5ddf1c1c8438528105b42821b0ce86f275443bf9 (diff) | |
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
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 6fb6f35d..79ba012f 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() { |