diff options
| -rw-r--r-- | res/values/qcomstrings.xml | 3 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 21 |
2 files changed, 24 insertions, 0 deletions
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index a5a51a13e..50ee79c23 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -194,6 +194,9 @@ <!-- Default mce setting. Do not translate. --> <string name="pref_camera_mce_default">enable</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/HSR is not supported for DIS and/ TimeLapse</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 1d0c8adc5..2c859dbc9 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1997,6 +1997,27 @@ public class VideoModule implements CameraModule, mParameters.setVideoHDRMode(videoHDR); } else mParameters.setVideoHDRMode("off"); + + //HFR/HSR recording not supported for DIS and/ TimeLapse option + String hfr = mParameters.getVideoHighFrameRate(); + String hsr = mParameters.get("video-hsr"); + if ( ((hfr != null) && (!hfr.equals("off"))) || + ((hsr != null) && (!hsr.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/HSR selection, turning HFR/HSR off"); + Toast.makeText(mActivity, R.string.error_app_unsupported_hfr_selection, + Toast.LENGTH_LONG).show(); + mParameters.setVideoHighFrameRate("off"); + mParameters.set("video-hsr", "off"); + mUI.overrideSettings(CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE,"disable"); + mUI.initializePopup(mPreferenceGroup); + } + } } @SuppressWarnings("deprecation") private void setCameraParameters() { |