Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java

Issue 2184653002: Add an option to disable built-in AGC/NS to AppRTC Demo. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 26 matching lines...) Expand all
37 private String keyprefHwCodec; 37 private String keyprefHwCodec;
38 private String keyprefCaptureToTexture; 38 private String keyprefCaptureToTexture;
39 39
40 private String keyprefStartAudioBitrateType; 40 private String keyprefStartAudioBitrateType;
41 private String keyprefStartAudioBitrateValue; 41 private String keyprefStartAudioBitrateValue;
42 private String keyPrefAudioCodec; 42 private String keyPrefAudioCodec;
43 private String keyprefNoAudioProcessing; 43 private String keyprefNoAudioProcessing;
44 private String keyprefAecDump; 44 private String keyprefAecDump;
45 private String keyprefOpenSLES; 45 private String keyprefOpenSLES;
46 private String keyprefDisableBuiltInAEC; 46 private String keyprefDisableBuiltInAEC;
47 private String keyprefDisableBuiltInAGC;
48 private String keyprefDisableBuiltInNS;
47 49
48 private String keyPrefRoomServerUrl; 50 private String keyPrefRoomServerUrl;
49 private String keyPrefDisplayHud; 51 private String keyPrefDisplayHud;
50 private String keyPrefTracing; 52 private String keyPrefTracing;
51 53
52 @Override 54 @Override
53 protected void onCreate(Bundle savedInstanceState) { 55 protected void onCreate(Bundle savedInstanceState) {
54 super.onCreate(savedInstanceState); 56 super.onCreate(savedInstanceState);
55 keyprefVideoCall = getString(R.string.pref_videocall_key); 57 keyprefVideoCall = getString(R.string.pref_videocall_key);
56 keyprefCamera2 = getString(R.string.pref_camera2_key); 58 keyprefCamera2 = getString(R.string.pref_camera2_key);
57 keyprefResolution = getString(R.string.pref_resolution_key); 59 keyprefResolution = getString(R.string.pref_resolution_key);
58 keyprefFps = getString(R.string.pref_fps_key); 60 keyprefFps = getString(R.string.pref_fps_key);
59 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey); 61 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey);
60 keyprefStartVideoBitrateType = getString(R.string.pref_startvideobitrate_key ); 62 keyprefStartVideoBitrateType = getString(R.string.pref_startvideobitrate_key );
61 keyprefStartVideoBitrateValue = getString(R.string.pref_startvideobitrateval ue_key); 63 keyprefStartVideoBitrateValue = getString(R.string.pref_startvideobitrateval ue_key);
62 keyPrefVideoCodec = getString(R.string.pref_videocodec_key); 64 keyPrefVideoCodec = getString(R.string.pref_videocodec_key);
63 keyprefHwCodec = getString(R.string.pref_hwcodec_key); 65 keyprefHwCodec = getString(R.string.pref_hwcodec_key);
64 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key); 66 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key);
65 67
66 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key ); 68 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key );
67 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval ue_key); 69 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval ue_key);
68 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key); 70 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key);
69 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key); 71 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key);
70 keyprefAecDump = getString(R.string.pref_aecdump_key); 72 keyprefAecDump = getString(R.string.pref_aecdump_key);
71 keyprefOpenSLES = getString(R.string.pref_opensles_key); 73 keyprefOpenSLES = getString(R.string.pref_opensles_key);
72 keyprefDisableBuiltInAEC = getString(R.string.pref_disable_built_in_aec_key) ; 74 keyprefDisableBuiltInAEC = getString(R.string.pref_disable_built_in_aec_key) ;
75 keyprefDisableBuiltInAGC = getString(R.string.pref_disable_built_in_agc_key) ;
76 keyprefDisableBuiltInNS = getString(R.string.pref_disable_built_in_ns_key);
73 77
74 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key); 78 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key);
75 keyPrefDisplayHud = getString(R.string.pref_displayhud_key); 79 keyPrefDisplayHud = getString(R.string.pref_displayhud_key);
76 keyPrefTracing = getString(R.string.pref_tracing_key); 80 keyPrefTracing = getString(R.string.pref_tracing_key);
77 81
78 // Display the fragment as the main content. 82 // Display the fragment as the main content.
79 settingsFragment = new SettingsFragment(); 83 settingsFragment = new SettingsFragment();
80 getFragmentManager().beginTransaction() 84 getFragmentManager().beginTransaction()
81 .replace(android.R.id.content, settingsFragment) 85 .replace(android.R.id.content, settingsFragment)
82 .commit(); 86 .commit();
(...skipping 19 matching lines...) Expand all
102 updateSummaryB(sharedPreferences, keyprefCaptureToTexture); 106 updateSummaryB(sharedPreferences, keyprefCaptureToTexture);
103 107
104 updateSummary(sharedPreferences, keyprefStartAudioBitrateType); 108 updateSummary(sharedPreferences, keyprefStartAudioBitrateType);
105 updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue); 109 updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue);
106 setAudioBitrateEnable(sharedPreferences); 110 setAudioBitrateEnable(sharedPreferences);
107 updateSummary(sharedPreferences, keyPrefAudioCodec); 111 updateSummary(sharedPreferences, keyPrefAudioCodec);
108 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing); 112 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing);
109 updateSummaryB(sharedPreferences, keyprefAecDump); 113 updateSummaryB(sharedPreferences, keyprefAecDump);
110 updateSummaryB(sharedPreferences, keyprefOpenSLES); 114 updateSummaryB(sharedPreferences, keyprefOpenSLES);
111 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC); 115 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC);
116 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC);
117 updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS);
112 118
113 updateSummary(sharedPreferences, keyPrefRoomServerUrl); 119 updateSummary(sharedPreferences, keyPrefRoomServerUrl);
114 updateSummaryB(sharedPreferences, keyPrefDisplayHud); 120 updateSummaryB(sharedPreferences, keyPrefDisplayHud);
115 updateSummaryB(sharedPreferences, keyPrefTracing); 121 updateSummaryB(sharedPreferences, keyPrefTracing);
116 122
117 if (!Camera2Enumerator.isSupported()) { 123 if (!Camera2Enumerator.isSupported()) {
118 Preference camera2Preference = 124 Preference camera2Preference =
119 settingsFragment.findPreference(keyprefCamera2); 125 settingsFragment.findPreference(keyprefCamera2);
120 126
121 camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported )); 127 camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported ));
122 camera2Preference.setEnabled(false); 128 camera2Preference.setEnabled(false);
123 } 129 }
124 130
125 // Disable forcing WebRTC based AEC so it won't affect our value. 131 // Disable forcing WebRTC based AEC so it won't affect our value.
126 // Otherwise, if it was enabled, isAcousticEchoCancelerSupported would alway s return false. 132 // Otherwise, if it was enabled, isAcousticEchoCancelerSupported would alway s return false.
127 WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(false); 133 WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(false);
128 if (!WebRtcAudioUtils.isAcousticEchoCancelerSupported()) { 134 if (!WebRtcAudioUtils.isAcousticEchoCancelerSupported()) {
129 Preference disableBuiltInAECPreference = 135 Preference disableBuiltInAECPreference =
130 settingsFragment.findPreference(keyprefDisableBuiltInAEC); 136 settingsFragment.findPreference(keyprefDisableBuiltInAEC);
131 137
132 disableBuiltInAECPreference.setSummary(getString(R.string.pref_built_in_ae c_not_available)); 138 disableBuiltInAECPreference.setSummary(getString(R.string.pref_built_in_ae c_not_available));
133 disableBuiltInAECPreference.setEnabled(false); 139 disableBuiltInAECPreference.setEnabled(false);
134 } 140 }
141
142 WebRtcAudioUtils.setWebRtcBasedAutomaticGainControl(false);
143 if (!WebRtcAudioUtils.isAutomaticGainControlSupported()) {
144 Preference disableBuiltInAGCPreference =
145 settingsFragment.findPreference(keyprefDisableBuiltInAGC);
146
147 disableBuiltInAGCPreference.setSummary(getString(R.string.pref_built_in_ag c_not_available));
148 disableBuiltInAGCPreference.setEnabled(false);
149 }
150
151 WebRtcAudioUtils.setWebRtcBasedNoiseSuppressor(false);
152 if (!WebRtcAudioUtils.isNoiseSuppressorSupported()) {
153 Preference disableBuiltInNSPreference =
154 settingsFragment.findPreference(keyprefDisableBuiltInNS);
155
156 disableBuiltInNSPreference.setSummary(getString(R.string.pref_built_in_ns_ not_available));
157 disableBuiltInNSPreference.setEnabled(false);
158 }
135 } 159 }
136 160
137 @Override 161 @Override
138 protected void onPause() { 162 protected void onPause() {
139 super.onPause(); 163 super.onPause();
140 SharedPreferences sharedPreferences = 164 SharedPreferences sharedPreferences =
141 settingsFragment.getPreferenceScreen().getSharedPreferences(); 165 settingsFragment.getPreferenceScreen().getSharedPreferences();
142 sharedPreferences.unregisterOnSharedPreferenceChangeListener(this); 166 sharedPreferences.unregisterOnSharedPreferenceChangeListener(this);
143 } 167 }
144 168
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t); 239 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t);
216 String bitrateType = sharedPreferences.getString( 240 String bitrateType = sharedPreferences.getString(
217 keyprefStartAudioBitrateType, bitrateTypeDefault); 241 keyprefStartAudioBitrateType, bitrateTypeDefault);
218 if (bitrateType.equals(bitrateTypeDefault)) { 242 if (bitrateType.equals(bitrateTypeDefault)) {
219 bitratePreferenceValue.setEnabled(false); 243 bitratePreferenceValue.setEnabled(false);
220 } else { 244 } else {
221 bitratePreferenceValue.setEnabled(true); 245 bitratePreferenceValue.setEnabled(true);
222 } 246 }
223 } 247 }
224 } 248 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698