diff options
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 9 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index dbfdd049a..148e1fc1c 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -380,11 +380,18 @@ public class CameraSettings { } public static String getSupportedHighestVideoQuality( - int cameraId, Parameters parameters) { + Context context, int cameraId, Parameters parameters) { // When launching the camera app first time, we will set the video quality // to the first one (i.e. highest quality) in the supported list List<String> supported = getSupportedVideoQualities(cameraId, parameters); assert (supported != null) : "No supported video quality is found"; + for (String candidate : context.getResources().getStringArray( + R.array.pref_video_quality_entryvalues)) { + if (supported.indexOf(candidate) >= 0) { + return candidate; + } + } + Log.w(TAG, "No supported video size matches, using the first reported size"); return supported.get(0); } diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index c8efd47e3..0246d6b9c 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -865,7 +865,7 @@ public class VideoModule implements CameraModule, } else { // check for highest quality supported videoQuality = CameraSettings.getSupportedHighestVideoQuality( - mCameraId, mParameters); + mActivity, mCameraId, mParameters); } mPreferences.edit().putString(CameraSettings.KEY_VIDEO_QUALITY, videoQuality).apply(); } |