diff options
| -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"); |