diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-27 17:00:38 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-27 17:00:38 -0800 |
| commit | 2d894ed368689085e89b6f0b79fb355575267e97 (patch) | |
| tree | 28f5d469dba72bf33f0b3660601716300f0175a8 /src/com/android/camera/VideoModule.java | |
| parent | e42a3f0ca7913bfb6e0d5b4274dd267736923583 (diff) | |
| parent | cd1f25e6cb5146dd3a00cd334f6ab4349c84b333 (diff) | |
| download | android_packages_apps_Snap-2d894ed368689085e89b6f0b79fb355575267e97.tar.gz android_packages_apps_Snap-2d894ed368689085e89b6f0b79fb355575267e97.tar.bz2 android_packages_apps_Snap-2d894ed368689085e89b6f0b79fb355575267e97.zip | |
Merge "SnapdragonCamera: Set highest supported video resolution by default."
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 84273dbda..6e3198390 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -780,17 +780,9 @@ public class VideoModule implements CameraModule, null); if (videoQuality == null) { mParameters = mCameraDevice.getParameters(); - String defaultQuality = mActivity.getResources().getString( - R.string.pref_video_quality_default); - boolean hasProfile = CamcorderProfile.hasProfile( - CameraSettings.VIDEO_QUALITY_TABLE.get(defaultQuality)); - if (hasProfile == true){ - videoQuality = defaultQuality; - } else { - // check for highest quality if default quality is not supported - videoQuality = CameraSettings.getSupportedHighestVideoQuality(mCameraId, - defaultQuality, mParameters); - } + // check for highest quality supported + videoQuality = CameraSettings.getSupportedHighestVideoQuality( + mCameraId, mParameters); mPreferences.edit().putString(CameraSettings.KEY_VIDEO_QUALITY, videoQuality); } int quality = CameraSettings.VIDEO_QUALITY_TABLE.get(videoQuality); |