diff options
| author | Suman Mukherjee <sumam@codeaurora.org> | 2014-04-23 13:02:07 +0530 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-10-20 22:26:07 +0000 |
| commit | 6f5cb2700e6df99171b9d051dae88f4e6af752f9 (patch) | |
| tree | 367d1907b456c89888d800068049dba349a3aeea | |
| parent | 0cb7b88c950d1f2b1b5e770a1db2099844113064 (diff) | |
| download | android_packages_apps_Camera2-6f5cb2700e6df99171b9d051dae88f4e6af752f9.tar.gz android_packages_apps_Camera2-6f5cb2700e6df99171b9d051dae88f4e6af752f9.tar.bz2 android_packages_apps_Camera2-6f5cb2700e6df99171b9d051dae88f4e6af752f9.zip | |
Camera: Block HFR option for Video HDR
Video HDR can’t work with HFR and that caused AEC behaviour change.
Fix Made: User'll be notified that HFR/HSR selection is not allowed
for HDR mode. After that, HFR selection will be set to off and the
option will be disabled. It'll not be vice versa as HDR has higher
priority than HFR.
[mikeioannina]: Removed HSR code
Change-Id: I4b0f8362667a53e46a83223cab77b7248e1410e2
CRs-Fixed: 652078
| -rw-r--r-- | res/values/qcomstrings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 3f1b61662..d3ab22bfb 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -109,7 +109,7 @@ <string name="pref_camera_redeyereduction_default" translatable="false">disable</string> <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode --> - <string name="error_app_unsupported_hfr_selection">HFR is not supported when video stabilization or time lapse is on</string> + <string name="error_app_unsupported_hfr_selection">HFR is not supported when video stabilization, time lapse or video HDR is on</string> <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode --> <string name="error_app_unsupported_hfr">HFR is not supported for selected resolution</string> diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 79ba012ff..bb7512cb7 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2114,16 +2114,19 @@ public class VideoModule implements CameraModule, } else mParameters.setVideoHDRMode("off"); - //HFR recording not supported for DIS and/ TimeLapse option + //HFR recording not supported with DIS,TimeLapse,HDR option String hfr = mParameters.getVideoHighFrameRate(); + String hdr = mParameters.getVideoHDRMode(); if ((hfr != null) && (!hfr.equals("off"))) { // Read time lapse recording interval. String frameIntervalStr = mPreferences.getString( CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL, mActivity.getString(R.string.pref_video_time_lapse_frame_interval_default)); int timeLapseInterval = Integer.parseInt(frameIntervalStr); - if ((timeLapseInterval != 0) || (disMode.equals("enable")) ) { - Log.v(TAG,"DIS/Time Lapse ON for HFR selection, turning HFR off"); + if ( (timeLapseInterval != 0) || + (disMode.equals("enable")) || + ((hdr != null) && (!hdr.equals("off"))) ) { + Log.v(TAG,"HDR/DIS/Time Lapse ON for HFR selection, turning HFR off"); Toast.makeText(mActivity, R.string.error_app_unsupported_hfr_selection, Toast.LENGTH_LONG).show(); mParameters.setVideoHighFrameRate("off"); |