diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-06 00:45:35 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-06 00:45:35 -0800 |
| commit | 25dee8bc2d2fc082e11649b3f226e0908dd92ad6 (patch) | |
| tree | 9c2858d850c73f97c42ed043c81cbcfc35c13a4a /src/com | |
| parent | 5344e1a11b8cab7f351bbaa27e7e17e28ed026b0 (diff) | |
| parent | 9747e00d9796d0680bacc9d6400452ad1ef552e0 (diff) | |
| download | android_packages_apps_Snap-25dee8bc2d2fc082e11649b3f226e0908dd92ad6.tar.gz android_packages_apps_Snap-25dee8bc2d2fc082e11649b3f226e0908dd92ad6.tar.bz2 android_packages_apps_Snap-25dee8bc2d2fc082e11649b3f226e0908dd92ad6.zip | |
Merge "SnapdragonCamera: To enable duplication for 720p"
Diffstat (limited to 'src/com')
| -rwxr-xr-x | src/com/android/camera/VideoModule.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 1600a1022..34ce64388 100755 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -835,6 +835,14 @@ public class VideoModule implements CameraModule, } } + private boolean is720pEnabled() { + if (mProfile.quality == CamcorderProfile.QUALITY_720P) { + return true; + } else { + return false; + } + } + boolean isHFREnabled(int videoWidth, int videoHeight) { if ((null == mPreferences) || (null == mParameters)) { return false; @@ -897,7 +905,7 @@ public class VideoModule implements CameraModule, return; } mParameters = mCameraDevice.getParameters(); - if (mParameters.getSupportedVideoSizes() == null || is1080pEnabled() || + if (mParameters.getSupportedVideoSizes() == null || is1080pEnabled() || is720pEnabled() || isHFREnabled(mProfile.videoFrameWidth, mProfile.videoFrameHeight)) { mDesiredPreviewWidth = mProfile.videoFrameWidth; mDesiredPreviewHeight = mProfile.videoFrameHeight; @@ -2048,8 +2056,8 @@ public class VideoModule implements CameraModule, mParameters.setPreviewFormat (ImageFormat.YV12); } - if (is1080pEnabled()) { - Log.v(TAG, "1080p enabled, preview format set to NV12_VENUS"); + if (is1080pEnabled() || is720pEnabled()) { + Log.v(TAG, "1080p or 720p enabled, preview format set to NV12_VENUS"); mParameters.set(KEY_PREVIEW_FORMAT, FORMAT_NV12_VENUS); } |