diff options
| author | Camera Software Integration <camswint@localhost> | 2016-07-04 08:35:24 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-04 08:35:24 -0700 |
| commit | de98a47425d6f9b1ee017829f99d61ad0620266f (patch) | |
| tree | d961a7bd27ab832234cde0402c4467eb40377f20 /src/com/android/camera/SettingsManager.java | |
| parent | 72d4541f16e42ba56a3c8dc18bd3bc4b667b2e75 (diff) | |
| parent | b5821430f199a516c4b3181b63609a264e613719 (diff) | |
| download | android_packages_apps_Snap-de98a47425d6f9b1ee017829f99d61ad0620266f.tar.gz android_packages_apps_Snap-de98a47425d6f9b1ee017829f99d61ad0620266f.tar.bz2 android_packages_apps_Snap-de98a47425d6f9b1ee017829f99d61ad0620266f.zip | |
Merge "SnapdragonCamera: Allow take snapshot while recording video" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
| -rw-r--r-- | src/com/android/camera/SettingsManager.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 57dc62479..37976f190 100644 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -104,6 +104,7 @@ public class SettingsManager implements ListMenu.SettingsListener { public static final String KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL = "pref_camera2_video_time_lapse_frame_interval_key"; public static final String KEY_FACE_DETECTION = "pref_camera2_facedetection_key"; + public static final String KEY_AUTO_VIDEOSNAP_SIZE = "pref_camera2_videosnap_key"; private static final String TAG = "SnapCam_SettingsManager"; private static SettingsManager sInstance; @@ -730,6 +731,12 @@ public class SettingsManager implements ListMenu.SettingsListener { return res; } + public Size[] getSupportedOutputSize(int cameraId, int format) { + StreamConfigurationMap map = mCharacteristics.get(cameraId).get( + CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); + return map.getOutputSizes(format); + } + public Size[] getSupportedOutputSize(int cameraId, Class cl) { StreamConfigurationMap map = mCharacteristics.get(cameraId).get( CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); |