diff options
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 36b6507f0..d4c0162df 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -239,7 +239,7 @@ <!-- The Video quality settings in preference [CHAR LIMIT=21] --> <string name="pref_video_quality_title">Video quality</string> <!-- The default quality value is NULL --> - <string name="pref_video_quality_default" translatable="false"></string> + <string name="pref_video_quality_default" translatable="false">1920x1080</string> <!-- Video quality setting entry. Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] --> <string name="pref_video_quality_entry_4kdci" translatable="false"> diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index ffbbc0ed4..2bd5e1584 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -784,12 +784,15 @@ public class VideoModule implements CameraModule, mParameters = mCameraDevice.getParameters(); String defaultQuality = mActivity.getResources().getString( R.string.pref_video_quality_default); - if (!defaultQuality.equals("")){ + if (!defaultQuality.equals("") && + CameraUtil.isSupported(defaultQuality, + CameraSettings.getSupportedVideoQualities( + mCameraId, mParameters))){ videoQuality = defaultQuality; } else { - // check for highest quality supported - videoQuality = CameraSettings.getSupportedHighestVideoQuality( - mCameraId, mParameters); + // check for highest quality supported + videoQuality = CameraSettings.getSupportedHighestVideoQuality( + mCameraId, mParameters); } mPreferences.edit().putString(CameraSettings.KEY_VIDEO_QUALITY, videoQuality).apply(); } |