diff options
| author | Chiou-Hao Hsu <chsu@codeaurora.org> | 2014-07-21 22:57:45 -0700 |
|---|---|---|
| committer | Sachin Shah <sachins@codeaurora.org> | 2014-08-16 11:50:19 -0700 |
| commit | 7ec9d242fd268ab698b665a894bbb7368e9a1776 (patch) | |
| tree | ce24a3c7099d5f7965cb5e860604834957b0e599 /src/com/android/camera | |
| parent | ec58b34450e9f3b4d3aa11396cc7525200c2460b (diff) | |
| download | android_packages_apps_Snap-7ec9d242fd268ab698b665a894bbb7368e9a1776.tar.gz android_packages_apps_Snap-7ec9d242fd268ab698b665a894bbb7368e9a1776.tar.bz2 android_packages_apps_Snap-7ec9d242fd268ab698b665a894bbb7368e9a1776.zip | |
Camera2: Enhance KK cameraapp for L
Enhance KK cameraapp for L.
Change-Id: If708b253f34a131d7842f8921e54c008283e0056
Diffstat (limited to 'src/com/android/camera')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 1027c9c39..4a05994d5 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -844,9 +844,9 @@ public class CameraSettings { supported.add(Integer.toString(CamcorderProfile.QUALITY_4kDCI)); } } - if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_4kUHD)) { + if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_2160P)) { if (checkSupportedVideoQuality(parameters,3840,2160)) { - supported.add(Integer.toString(CamcorderProfile.QUALITY_4kUHD)); + supported.add(Integer.toString(CamcorderProfile.QUALITY_2160P)); } } if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_1080P)) { diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 79ab14761..16911f1f0 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -810,7 +810,7 @@ public class VideoModule implements CameraModule, } private boolean is4KEnabled() { - if (mProfile.quality == CamcorderProfile.QUALITY_4kUHD || + if (mProfile.quality == CamcorderProfile.QUALITY_2160P || mProfile.quality == CamcorderProfile.QUALITY_4kDCI) { return true; } else { @@ -1622,7 +1622,7 @@ public class VideoModule implements CameraModule, Log.v(TAG, "pauseVideoRecording"); mMediaRecorderPausing = true; mRecordingTotalTime += SystemClock.uptimeMillis() - mRecordingStartTime; - mMediaRecorder.pause(); + //mMediaRecorder.pause(); } private void resumeVideoRecording() { @@ -1630,7 +1630,7 @@ public class VideoModule implements CameraModule, mMediaRecorderPausing = false; mRecordingStartTime = SystemClock.uptimeMillis(); updateRecordingTime(); - mMediaRecorder.start(); + //mMediaRecorder.start(); } private boolean stopVideoRecording() { |