diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-25 21:05:27 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-25 21:05:27 -0700 |
| commit | c59f23259d0f7b18d1a3a8280246b1546800de1a (patch) | |
| tree | 8039c5f53808c532e7a990dc4d71d2e82b3d64b3 | |
| parent | cfbfa14182d1d726bbe0856da8949e6a847a8ece (diff) | |
| parent | 932f06b5df83042d971bb2a187fc15b0c19ef47e (diff) | |
| download | android_packages_apps_Snap-c59f23259d0f7b18d1a3a8280246b1546800de1a.tar.gz android_packages_apps_Snap-c59f23259d0f7b18d1a3a8280246b1546800de1a.tar.bz2 android_packages_apps_Snap-c59f23259d0f7b18d1a3a8280246b1546800de1a.zip | |
Merge "SnapdragonCamera: Remove HFR restriction based on encoder type" into camera.lnx.1.0-dev.1.0
| -rwxr-xr-x | src/com/android/camera/VideoModule.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 612660450..e9985e8e7 100755 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2338,9 +2338,6 @@ public class VideoModule implements CameraModule, mParameters.set(CameraSettings.KEY_VIDEO_HSR, hfrRate); } } - if(mVideoEncoder != MediaRecorder.VideoEncoder.H264) { - mUnsupportedHFRVideoCodec = true; - } } else { mParameters.setVideoHighFrameRate("off"); mParameters.set(CameraSettings.KEY_VIDEO_HSR, "off"); |