summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndy Huibers <andyhuibers@google.com>2014-03-06 17:11:11 -0800
committerAndy Huibers <andyhuibers@google.com>2014-03-06 17:11:11 -0800
commit89489880d0f0d3a6ede7a689ffb39c185f3897d7 (patch)
treeadcd60ed14d60d64915cd7fc910f261abe96e748 /src
parent7865bb08e2989964dcbf9684090fb6c2b6e993df (diff)
downloadandroid_packages_apps_Camera2-89489880d0f0d3a6ede7a689ffb39c185f3897d7.tar.gz
android_packages_apps_Camera2-89489880d0f0d3a6ede7a689ffb39c185f3897d7.tar.bz2
android_packages_apps_Camera2-89489880d0f0d3a6ede7a689ffb39c185f3897d7.zip
Remove video-size parameter setting causing 720p video issues on Palman.
Bug: 13304124 Change-Id: I3e449afe446941a5286f36fe739311a1bb9ab135
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/VideoModule.java1
-rw-r--r--src/com/android/camera/settings/SettingsUtil.java6
2 files changed, 0 insertions, 7 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index fbd713e44..f53ca8ccd 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1457,7 +1457,6 @@ public class VideoModule extends CameraModule
SettingsManager settingsManager = mActivity.getSettingsManager();
mParameters.setPreviewSize(mDesiredPreviewWidth, mDesiredPreviewHeight);
- mParameters.set("video-size", mProfile.videoFrameWidth+"x"+mProfile.videoFrameHeight);
int[] fpsRange = CameraUtil.getMaxPreviewFpsRange(mParameters);
if (fpsRange.length > 0) {
mParameters.setPreviewFpsRange(
diff --git a/src/com/android/camera/settings/SettingsUtil.java b/src/com/android/camera/settings/SettingsUtil.java
index bb613b848..22d711c46 100644
--- a/src/com/android/camera/settings/SettingsUtil.java
+++ b/src/com/android/camera/settings/SettingsUtil.java
@@ -22,7 +22,6 @@ import android.hardware.Camera;
import android.hardware.Camera.Parameters;
import android.hardware.Camera.Size;
import android.media.CamcorderProfile;
-import android.os.Build;
import android.util.Log;
import com.android.camera.app.CameraManager;
@@ -228,11 +227,6 @@ public class SettingsUtil {
private static int getNextSupportedVideoQualityIndex(int cameraId, int start) {
int i = start;
for (; i < sVideoQualities.length; ++i) {
- // Skip QUALITY_720P for LG-V510 (Palman) due to encoding bug.
- if (Build.MODEL.startsWith("LG-V510") &&
- sVideoQualities[i] == CamcorderProfile.QUALITY_720P) {
- continue;
- }
if (CamcorderProfile.hasProfile(cameraId, sVideoQualities[i])) {
break;
}