Camera2: Remove CAF video duration code

Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2

4 files changed, 5 insertions, 42 deletions

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index f3aab98c9..3b476441e 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";
@@ -192,10 +191,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";
@@ -262,11 +257,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;
@@ -1166,7 +1156,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);
@@ -1344,7 +1333,6 @@ public class CameraSettings {
               supported.add(Integer.toString(CamcorderProfile.QUALITY_QCIF));
            }
         }
-
     }
 
     public static ArrayList<String> getSupportedVideoQualities(int cameraId,Parameters parameters) {
@@ -1360,14 +1348,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;
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 32d360cd9..6084a84ed 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2303,6 +2303,10 @@ public class CaptureModule implements CameraModule, PhotoController,
 
     private void updateMaxVideoDuration() {
         String minutesStr = mSettingsManager.getValue(SettingsManager.KEY_VIDEO_DURATION);
+        if (minutesStr == null) {
+            mMaxVideoDurationInMs = 0;
+            return;
+        }
         int minutes = Integer.parseInt(minutesStr);
         if (minutes == -1) {
             // User wants lowest, set 30s */
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index a482a919d..a10045ba0 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -112,7 +112,6 @@ public class VideoMenu extends MenuController
         mOtherKeys1 = new String[] {
                 CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE,
                 CameraSettings.KEY_VIDEO_QUALITY,
-                CameraSettings.KEY_VIDEO_DURATION,
                 CameraSettings.KEY_RECORD_LOCATION,
                 CameraSettings.KEY_CAMERA_SAVEPATH,
                 CameraSettings.KEY_WHITE_BALANCE,
@@ -122,7 +121,6 @@ public class VideoMenu extends MenuController
         mOtherKeys2 = new String[] {
                 CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE,
                 CameraSettings.KEY_VIDEO_QUALITY,
-                CameraSettings.KEY_VIDEO_DURATION,
                 CameraSettings.KEY_RECORD_LOCATION,
                 CameraSettings.KEY_CAMERA_SAVEPATH,
                 CameraSettings.KEY_WHITE_BALANCE,
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 63d863d1f..888d29572 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -826,25 +826,6 @@ public class VideoModule implements CameraModule,
 
         Log.v(TAG, "Audio Encoder selected = " +mAudioEncoder);
 
-        String minutesStr = mPreferences.getString(
-              CameraSettings.KEY_VIDEO_DURATION,
-              mActivity.getString(R.string.pref_camera_video_duration_default));
-        int minutes = -1;
-        try {
-            minutes = Integer.parseInt(minutesStr);
-        } catch(NumberFormatException npe) {
-            // use default value continue
-            minutes = Integer.parseInt(mActivity.getString(
-                         R.string.pref_camera_video_duration_default));
-        }
-        if (minutes == -1) {
-            // User wants lowest, set 30s */
-            mMaxVideoDurationInMs = 30000;
-        } else {
-            // 1 minute = 60000ms
-            mMaxVideoDurationInMs = 60000 * minutes;
-        }
-
         if(mParameters.isPowerModeSupported()) {
             String powermode = mPreferences.getString(
                     CameraSettings.KEY_POWER_MODE,
@@ -863,7 +844,7 @@ public class VideoModule implements CameraModule,
                     mActivity.getString(R.string.pref_camera_denoise_default));
             mParameters.setDenoise(denoise);
         }
-   }
+    }
 
     private void readVideoPreferences() {
         // The preference stores values from ListPreference and is thus string type for all values.