SnapdragonCamera: Add noise reduction modes.

- Add menu for noise reduction modes

Change-Id: Ie5cd6590e08938fb8fbb668ac1b48aac5fe801c3

3 files changed, 56 insertions, 0 deletions

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 6d8778bcc..d3f565600 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -114,6 +114,7 @@ public class CameraSettings {
     public static final String KEY_VIDEO_SNAPSHOT_SIZE = "pref_camera_videosnapsize_key";
     public static final String KEY_VIDEO_HIGH_FRAME_RATE = "pref_camera_hfr_key";
     public static final String KEY_SEE_MORE = "pref_camera_see_more_key";
+    public static final String KEY_NOISE_REDUCTION = "pref_camera_noise_reduction_key";
     public static final String KEY_VIDEO_HDR = "pref_camera_video_hdr_key";
     public static final String DEFAULT_VIDEO_QUALITY_VALUE = "custom";
     public static final String KEY_SKIN_TONE_ENHANCEMENT = "pref_camera_skinToneEnhancement_key";
@@ -135,6 +136,7 @@ public class CameraSettings {
     private static final String KEY_QC_SUPPORTED_FACE_RECOGNITION_MODES = "face-recognition-values";
     private static final String KEY_QC_SUPPORTED_DIS_MODES = "dis-values";
     private static final String KEY_QC_SUPPORTED_SEE_MORE_MODES = "see-more-values";
+    private static final String KEY_QC_SUPPORTED_NOISE_REDUCTION_MODES = "noise-reduction-mode-values";
     private static final String KEY_QC_SUPPORTED_STILL_MORE_MODES = "still-more-values";
     private static final String KEY_QC_SUPPORTED_CDS_MODES = "cds-mode-values";
     private static final String KEY_QC_SUPPORTED_VIDEO_CDS_MODES = "video-cds-mode-values";
@@ -167,6 +169,7 @@ public class CameraSettings {
     public static final String KEY_SNAPCAM_HDR_NEED_1X = "hdr-need-1x";
     public static final String KEY_VIDEO_HSR = "video-hsr";
     public static final String KEY_QC_SEE_MORE_MODE = "see-more";
+    public static final String KEY_QC_NOISE_REDUCTION_MODE = "noise-reduction-mode";
 
     public static final String KEY_LUMINANCE_CONITION = "luminance-condition";
     public static final String LUMINANCE_CONITION_LOW = "low";
@@ -484,6 +487,14 @@ public class CameraSettings {
         return split(str);
     }
 
+    public static List<String> getSupportedNoiseReductionModes(Parameters params) {
+        String str = params.get(KEY_QC_SUPPORTED_NOISE_REDUCTION_MODES);
+        if (str == null) {
+            return null;
+        }
+        return split(str);
+    }
+
     public static List<String> getSupportedAEBracketingModes(Parameters params) {
         String str = params.get(KEY_QC_SUPPORTED_AE_BRACKETING_MODES);
         if (str == null) {
@@ -903,9 +914,16 @@ public class CameraSettings {
                 group.findPreference(KEY_VIDEO_HIGH_FRAME_RATE);
         ListPreference seeMoreMode = group.findPreference(KEY_SEE_MORE);
         ListPreference savePath = group.findPreference(KEY_CAMERA_SAVEPATH);
+        ListPreference noiseReductionMode = group.findPreference(KEY_NOISE_REDUCTION);
 
         // Since the screen could be loaded from different resources, we need
         // to check if the preference is available here
+
+        if (noiseReductionMode != null) {
+            filterUnsupportedOptions(group, noiseReductionMode,
+                    getSupportedNoiseReductionModes(mParameters));
+        }
+
         if (seeMoreMode != null) {
             filterUnsupportedOptions(group, seeMoreMode,
                     getSupportedSeeMoreModes(mParameters));
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 58331cfd3..1fd8b5d5f 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -135,6 +135,7 @@ public class VideoMenu extends MenuController
                 CameraSettings.KEY_POWER_SHUTTER,
                 CameraSettings.KEY_MAX_BRIGHTNESS,
                 CameraSettings.KEY_SEE_MORE,
+                CameraSettings.KEY_NOISE_REDUCTION,
                 CameraSettings.KEY_DIS,
                 CameraSettings.KEY_VIDEO_EFFECT,
                 CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL,
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 02bf9d4b4..5dc4c219e 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2522,6 +2522,43 @@ public class VideoModule implements CameraModule,
             mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_TNR_MODE, video_tnr);
         }
 
+        String noiseReductionMode = mPreferences.getString(
+                CameraSettings.KEY_NOISE_REDUCTION,
+                mActivity.getString(R.string.pref_camera_noise_reduction_default));
+        Log.v(TAG, "Noise ReductionMode =" + noiseReductionMode);
+
+        if (isSupported(noiseReductionMode,
+                CameraSettings.getSupportedNoiseReductionModes(mParameters))) {
+            /* Disable CDS */
+            if (noiseReductionMode.equals(
+                    mActivity.getString(R.string.pref_camera_noise_reduction_value_high_quality)) &&
+                    video_cds.equals(mActivity.getString(R.string.
+                            pref_camera_video_cds_value_on))) {
+                mParameters.set(CameraSettings.KEY_QC_VIDEO_CDS_MODE,
+                        mActivity.getString(R.string.pref_camera_video_cds_value_off));
+                mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_CDS_MODE,
+                        mActivity.getString(R.string.pref_camera_video_cds_value_off));
+                Toast.makeText(mActivity, R.string.disable_CDS_during_HighQualityNoiseReduction,
+                        Toast.LENGTH_LONG).show();
+            }
+
+            /* Disable TNR */
+            if (noiseReductionMode.equals(
+                    mActivity.getString(R.string.pref_camera_noise_reduction_value_high_quality)) &&
+                    video_tnr.equals(mActivity.getString(R.string.
+                            pref_camera_video_tnr_value_on))) {
+                mParameters.set(CameraSettings.KEY_QC_VIDEO_TNR_MODE,
+                        mActivity.getString(R.string.pref_camera_video_tnr_value_off));
+                mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_TNR_MODE,
+                        mActivity.getString(R.string.pref_camera_video_tnr_value_off));
+                Toast.makeText(mActivity, R.string.disable_TNR_during_HighQualityNoiseReduction,
+                        Toast.LENGTH_LONG).show();
+            }
+
+            /* Set Noise Reduction mode */
+            mParameters.set(CameraSettings.KEY_QC_NOISE_REDUCTION_MODE, noiseReductionMode);
+        }
+
         String seeMoreMode = mPreferences.getString(
                 CameraSettings.KEY_SEE_MORE,
                 mActivity.getString(R.string.pref_camera_see_more_default));