diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2014-10-24 11:26:25 +0300 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-17 23:26:02 +0300 |
| commit | fb4957c0017b1aa47fa643c1c6fa9179fe8ebd29 (patch) | |
| tree | 56ebbe38d6bb75f236c49fd6f6b4a90fddd7e2e9 /src/com/android/camera/CameraSettings.java | |
| parent | e34ec5cfdabbf983e8089e8f7302c70b3c4dd8d6 (diff) | |
| download | android_packages_apps_Snap-fb4957c0017b1aa47fa643c1c6fa9179fe8ebd29.tar.gz android_packages_apps_Snap-fb4957c0017b1aa47fa643c1c6fa9179fe8ebd29.tar.bz2 android_packages_apps_Snap-fb4957c0017b1aa47fa643c1c6fa9179fe8ebd29.zip | |
Camera2: Remove CAF video duration code
Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index a464217fe..9004dd261 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -79,7 +79,6 @@ public class CameraSettings { public static final String KEY_VIDEO_ENCODER = "pref_camera_videoencoder_key"; public static final String KEY_AUDIO_ENCODER = "pref_camera_audioencoder_key"; - public static final String KEY_VIDEO_DURATION = "pref_camera_video_duration_key"; public static final String KEY_POWER_MODE = "pref_camera_powermode_key"; public static final String KEY_PICTURE_FORMAT = "pref_camera_pictureformat_key"; public static final String KEY_ZSL = "pref_camera_zsl_key"; @@ -182,10 +181,6 @@ public class CameraSettings { private static final String KEY_QC_PICTURE_FORMAT = "picture-format-values"; public static final String KEY_VIDEO_ROTATION = "pref_camera_video_rotation_key"; - private static final String VIDEO_QUALITY_HIGH = "high"; - private static final String VIDEO_QUALITY_MMS = "mms"; - private static final String VIDEO_QUALITY_YOUTUBE = "youtube"; - //manual 3A keys and parameter strings public static final String KEY_MANUAL_EXPOSURE = "pref_camera_manual_exp_key"; @@ -244,11 +239,6 @@ public class CameraSettings { public static final int CURRENT_VERSION = 5; public static final int CURRENT_LOCAL_VERSION = 2; - public static final int DEFAULT_VIDEO_DURATION = 0; // no limit - private static final int MMS_VIDEO_DURATION = (CamcorderProfile.get(CamcorderProfile.QUALITY_LOW) != null) ? - CamcorderProfile.get(CamcorderProfile.QUALITY_LOW).duration :30; - private static final int YOUTUBE_VIDEO_DURATION = 15 * 60; // 15 mins - private static final String TAG = "CameraSettings"; private final Context mContext; @@ -1049,7 +1039,6 @@ public class CameraSettings { // Just use video quality to replace it and // ignore the current settings. editor.remove("pref_camera_videoquality_key"); - editor.remove("pref_camera_video_duration_key"); } editor.putInt(KEY_VERSION, CURRENT_VERSION); @@ -1233,7 +1222,6 @@ public class CameraSettings { supported.add(Integer.toString(CamcorderProfile.QUALITY_QCIF)); } } - } public static ArrayList<String> getSupportedVideoQualities(int cameraId,Parameters parameters) { @@ -1249,14 +1237,6 @@ public class CameraSettings { } return supported; } - public static int getVideoDurationInMillis(String quality) { - if (VIDEO_QUALITY_MMS.equals(quality)) { - return MMS_VIDEO_DURATION * 1000; - } else if (VIDEO_QUALITY_YOUTUBE.equals(quality)) { - return YOUTUBE_VIDEO_DURATION * 1000; - } - return DEFAULT_VIDEO_DURATION * 1000; - } public static boolean isInternalPreviewSupported(Parameters params) { boolean ret = false; |