From b5de27139a64c261bcf2de031f50354c2ebade55 Mon Sep 17 00:00:00 2001 From: Sultanxda Date: Mon, 26 Oct 2015 18:39:05 -0700 Subject: SnapdragonCamera: Add option to control antibanding in camcorder The antibanding setting in camcorder is linked to the setting in camera mode for better UX (if you change one, the other will change accordingly). Change-Id: I98c1bc65472cf8eec530f5a7572f46458b0ab3fa --- src/com/android/camera/VideoMenu.java | 1 + src/com/android/camera/VideoModule.java | 23 +++++++---------------- 2 files changed, 8 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 6018fcf1e..e8aca488c 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -137,6 +137,7 @@ public class VideoMenu extends MenuController CameraSettings.KEY_VIDEO_ENCODER, CameraSettings.KEY_AUDIO_ENCODER, CameraSettings.KEY_VIDEO_HDR, + CameraSettings.KEY_ANTIBANDING, CameraSettings.KEY_VIDEO_ROTATION, CameraSettings.KEY_VIDEO_CDS_MODE, CameraSettings.KEY_VIDEO_TNR_MODE diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 92d9e2986..6b882ae19 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -328,7 +328,6 @@ public class VideoModule implements CameraModule, private boolean mUnsupportedHFRVideoSize = false; private boolean mUnsupportedHSRVideoSize = false; private boolean mUnsupportedHFRVideoCodec = false; - private String mDefaultAntibanding = null; public void onScreenSizeChanged(int width, int height) { if (mFocusManager != null) mFocusManager.setPreviewSize(width, height); @@ -2278,23 +2277,15 @@ public class VideoModule implements CameraModule, } } - if (mDefaultAntibanding == null) { - mDefaultAntibanding = mParameters.getAntibanding(); - Log.d(TAG, "default antibanding value = " + mDefaultAntibanding); + // Set anti banding parameter. + String antiBanding = mPreferences.getString( + CameraSettings.KEY_ANTIBANDING, + mActivity.getString(R.string.pref_camera_antibanding_default)); + Log.v(TAG, "antiBanding value =" + antiBanding); + if (CameraUtil.isSupported(antiBanding, mParameters.getSupportedAntibanding())) { + mParameters.setAntibanding(antiBanding); } - if (disMode.equals("enable")) { - Log.d(TAG, "dis is enabled, set antibanding to auto."); - if (isSupported(Parameters.ANTIBANDING_AUTO, mParameters.getSupportedAntibanding())) { - mParameters.setAntibanding(Parameters.ANTIBANDING_AUTO); - } - } else { - if (isSupported(mDefaultAntibanding, mParameters.getSupportedAntibanding())) { - mParameters.setAntibanding(mDefaultAntibanding); - } - } - Log.d(TAG, "antiBanding value = " + mParameters.getAntibanding()); - String seeMoreMode = mPreferences.getString( CameraSettings.KEY_SEE_MORE, mActivity.getString(R.string.pref_camera_see_more_default)); -- cgit v1.2.3