diff options
author | Shuzhen Wang <shuzhenw@codeaurora.org> | 2016-01-02 20:14:18 +0100 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-02 20:47:57 +0100 |
commit | a575c653126a54850ed220b8255f035df4cdfe05 (patch) | |
tree | 09519219c8c8e4c3ce987d639e09bcae4ac53f88 /src/com/android/camera/CameraSettings.java | |
parent | 0575f19cf85fc06a070dd1ec15d952126e76d96c (diff) | |
download | android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.tar.gz android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.tar.bz2 android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.zip |
SnapdragonCamera: Fix compilation
1. Address compilation due to compiler upgrade.
2. Comment out video dependencies to enable camera.
3. Fix compilation issue due to IMountService interface change.
4. Comment out ExtendedFace.
5. Remove non-standard video resolutions.
Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 465c69049..e8d1a9945 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1175,11 +1175,13 @@ public class CameraSettings { @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2) private static void getFineResolutionQuality(ArrayList<String> supported, int cameraId,Parameters parameters) { +/* if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_4kDCI)) { if (checkSupportedVideoQuality(parameters,4096,2160)) { supported.add(Integer.toString(CamcorderProfile.QUALITY_4kDCI)); } } +*/ if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_2160P)) { if (checkSupportedVideoQuality(parameters,3840,2160)) { supported.add(Integer.toString(CamcorderProfile.QUALITY_2160P)); @@ -1200,26 +1202,11 @@ public class CameraSettings { supported.add(Integer.toString(CamcorderProfile.QUALITY_480P)); } } - if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_FWVGA)) { - if (checkSupportedVideoQuality(parameters,864,480)){ - supported.add(Integer.toString(CamcorderProfile.QUALITY_FWVGA)); - } - } - if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_WVGA)) { - if (checkSupportedVideoQuality(parameters,800,480)){ - supported.add(Integer.toString(CamcorderProfile.QUALITY_WVGA)); - } - } if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_VGA)) { if (checkSupportedVideoQuality(parameters,640,480)){ supported.add(Integer.toString(CamcorderProfile.QUALITY_VGA)); } } - if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_HVGA)) { - if (checkSupportedVideoQuality(parameters,480,360)){ - supported.add(Integer.toString(CamcorderProfile.QUALITY_HVGA)); - } - } if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_CIF)) { if (checkSupportedVideoQuality(parameters,352,288)){ supported.add(Integer.toString(CamcorderProfile.QUALITY_CIF)); |