From 92defff221591e21df85e8a1d33f54b469fb9fe0 Mon Sep 17 00:00:00 2001 From: Camera Software Integration Date: Wed, 29 Jul 2015 11:29:17 -0700 Subject: SnapdragonCamera: Add noise reduction modes. - Add menu for noise reduction modes Change-Id: Ie5cd6590e08938fb8fbb668ac1b48aac5fe801c3 --- res/values/qcomarrays.xml | 16 ++++++++++++- res/values/qcomstrings.xml | 17 ++++++++++++++ res/values/strings.xml | 12 ++++++++++ res/xml/video_preferences.xml | 8 ++++++- src/com/android/camera/CameraSettings.java | 18 +++++++++++++++ src/com/android/camera/VideoMenu.java | 1 + src/com/android/camera/VideoModule.java | 37 ++++++++++++++++++++++++++++++ 7 files changed, 107 insertions(+), 2 deletions(-) diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 2b565fd56..0bacfe3a9 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -513,13 +513,27 @@ @string/setting_off @string/setting_on - + off on + + + @string/pref_camera_noise_reduction_entry_off + @string/pref_camera_noise_reduction_entry_fast + @string/pref_camera_noise_reduction_entry_high_quality + + + + + @string/pref_camera_noise_reduction_value_off + @string/pref_camera_noise_reduction_value_fast + @string/pref_camera_noise_reduction_value_high_quality + + @string/setting_off diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index f54df4f41..371c03ac8 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -195,6 +195,23 @@ Denoise + + + off + + + Noise Reduction + + + Off + Fast + High Quality + + + off + fast + high-quality + denoise-on diff --git a/res/values/strings.xml b/res/values/strings.xml index 7f97f5a9c..ddadda6e2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -385,6 +385,18 @@ Not selectable in scene mode. + + High Quality Noise Reduction will disable CDS + + + High Quality Noise Reduction will disable TNR + + + SeeMore will disable CDS. + + + SeeMore will disable TNR. + Exposure 0 diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index f4f8522ba..2cf47b5ee 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -131,7 +131,13 @@ camera:singleIcon="@drawable/ic_settings_fps" camera:entries="@array/pref_camera_hfr_entries" camera:entryValues="@array/pref_camera_hfr_entryvalues"/> - + getSupportedNoiseReductionModes(Parameters params) { + String str = params.get(KEY_QC_SUPPORTED_NOISE_REDUCTION_MODES); + if (str == null) { + return null; + } + return split(str); + } + public static List 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)); -- cgit v1.2.3