diff options
-rw-r--r-- | res/values/qcomarrays.xml | 13 | ||||
-rw-r--r-- | res/values/qcomstrings.xml | 16 | ||||
-rw-r--r-- | res/values/strings.xml | 6 | ||||
-rw-r--r-- | res/xml/video_preferences.xml | 6 | ||||
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 18 | ||||
-rw-r--r-- | src/com/android/camera/VideoMenu.java | 1 | ||||
-rw-r--r-- | src/com/android/camera/VideoModule.java | 37 |
7 files changed, 97 insertions, 0 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 02686864e..f21e52bb4 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -453,6 +453,19 @@ <item>@string/pref_camera_hfr_value_hsr_120</item> </string-array> + <!-- Video Preferences Noise Reduction dialog box entries --> + <string-array name="pref_camera_noise_reduction_entries"> + <item>@string/pref_camera_noise_reduction_entry_off</item> + <item>@string/pref_camera_noise_reduction_entry_fast</item> + <item>@string/pref_camera_noise_reduction_entry_high_quality</item> + </string-array> + <!-- Do not localize entryvalues --> + <string-array name="pref_camera_noise_reduction_entryvalues"> + <item>@string/pref_camera_noise_reduction_value_off</item> + <item>@string/pref_camera_noise_reduction_value_fast</item> + <item>@string/pref_camera_noise_reduction_value_high_quality</item> + </string-array> + <!-- Video Preferences See More dialog box entries --> <string-array name="pref_camera_see_more_entries"> <item>@string/pref_camera_see_more_entry_off</item> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index eace72dad..23ee4427d 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -393,6 +393,22 @@ <string name="pref_camera_hfr_value_hsr_90">hsr90</string> <string name="pref_camera_hfr_value_hsr_120">hsr120</string> + <!-- Default noise reduction setting. Do not translate. --> + <string name="pref_camera_noise_reduction_default">off</string> + + <!-- Settings screen, Select See More title --> + <string name="pref_camera_noise_reduction_title">Noise Reduction</string> + + <!-- Settings screen, see more radio button choices --> + <string name="pref_camera_noise_reduction_entry_off">Off</string> + <string name="pref_camera_noise_reduction_entry_fast">Fast</string> + <string name="pref_camera_noise_reduction_entry_high_quality">High Quality</string> + + <!-- see more entry values. Do not translate. --> + <string name="pref_camera_noise_reduction_value_off">off</string> + <string name="pref_camera_noise_reduction_value_fast">fast</string> + <string name="pref_camera_noise_reduction_value_high_quality">high-quality</string> + <!-- Default see more setting. Do not translate. --> <string name="pref_camera_see_more_default">off</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index d4c0162df..1a2b8879f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -438,6 +438,12 @@ <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled --> <string name="video_quality_4k_disable_SeeMore">SeeMore cannot be enabled during 4k video.</string> + <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled --> + <string name="disable_CDS_during_HighQualityNoiseReduction">High Quality Noise Reduction will disable CDS.</string> + + <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled --> + <string name="disable_TNR_during_HighQualityNoiseReduction">High Quality Noise Reduction will disable TNR.</string> + <!-- Toast after SeeMore has been enabled to show CDS is disabled --> <string name="disable_CDS_during_SeeMore">SeeMore will disable CDS.</string> diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 99786ce26..cec9442a3 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -133,6 +133,12 @@ camera:entries="@array/pref_camera_hfr_entries" camera:entryValues="@array/pref_camera_hfr_entryvalues"/> <ListPreference + camera:key="pref_camera_noise_reduction_key" + camera:defaultValue="@string/pref_camera_noise_reduction_default" + camera:title="@string/pref_camera_noise_reduction_title" + camera:entries="@array/pref_camera_noise_reduction_entries" + camera:entryValues="@array/pref_camera_noise_reduction_entryvalues"/> + <ListPreference camera:key="pref_camera_see_more_key" camera:defaultValue="@string/pref_camera_see_more_default" camera:title="@string/pref_camera_see_more_title" diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index da3dbfda3..9d8b18135 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -112,6 +112,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"; @@ -163,6 +165,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_INTERNAL_PREVIEW_RESTART = "internal-restart"; public static final String KEY_QC_ZSL_HDR_SUPPORTED = "zsl-hdr-supported"; @@ -386,6 +389,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) { @@ -760,9 +771,16 @@ public class CameraSettings { group.findPreference(KEY_VIDEO_HIGH_FRAME_RATE); ListPreference seeMoreMode = group.findPreference(KEY_SEE_MORE); ListPreference videoEncoder = group.findPreference(KEY_VIDEO_ENCODER); + 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 8dbc4f2aa..fb30a90d7 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -124,6 +124,7 @@ public class VideoMenu extends MenuController CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, 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 3aa874f7d..a69f96224 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2214,6 +2214,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)); |