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

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

Issue 2306433002: Add option to set maximum video encoder bitrate to AppRTCDemo. (Closed)
Patch Set: Created 4 years, 3 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 13 matching lines...) Expand all
24 * Settings activity for AppRTC. 24 * Settings activity for AppRTC.
25 */ 25 */
26 public class SettingsActivity extends Activity 26 public class SettingsActivity extends Activity
27 implements OnSharedPreferenceChangeListener{ 27 implements OnSharedPreferenceChangeListener{
28 private SettingsFragment settingsFragment; 28 private SettingsFragment settingsFragment;
29 private String keyprefVideoCall; 29 private String keyprefVideoCall;
30 private String keyprefCamera2; 30 private String keyprefCamera2;
31 private String keyprefResolution; 31 private String keyprefResolution;
32 private String keyprefFps; 32 private String keyprefFps;
33 private String keyprefCaptureQualitySlider; 33 private String keyprefCaptureQualitySlider;
34 private String keyprefStartVideoBitrateType; 34 private String keyprefMaxVideoBitrateType;
35 private String keyprefStartVideoBitrateValue; 35 private String keyprefMaxVideoBitrateValue;
36 private String keyPrefVideoCodec; 36 private String keyPrefVideoCodec;
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; 47 private String keyprefDisableBuiltInAGC;
48 private String keyprefDisableBuiltInNS; 48 private String keyprefDisableBuiltInNS;
49 private String keyprefEnableLevelControl; 49 private String keyprefEnableLevelControl;
50 private String keyprefSpeakerphone; 50 private String keyprefSpeakerphone;
51 51
52 private String keyPrefRoomServerUrl; 52 private String keyPrefRoomServerUrl;
53 private String keyPrefDisplayHud; 53 private String keyPrefDisplayHud;
54 private String keyPrefTracing; 54 private String keyPrefTracing;
55 55
56 @Override 56 @Override
57 protected void onCreate(Bundle savedInstanceState) { 57 protected void onCreate(Bundle savedInstanceState) {
58 super.onCreate(savedInstanceState); 58 super.onCreate(savedInstanceState);
59 keyprefVideoCall = getString(R.string.pref_videocall_key); 59 keyprefVideoCall = getString(R.string.pref_videocall_key);
60 keyprefCamera2 = getString(R.string.pref_camera2_key); 60 keyprefCamera2 = getString(R.string.pref_camera2_key);
61 keyprefResolution = getString(R.string.pref_resolution_key); 61 keyprefResolution = getString(R.string.pref_resolution_key);
62 keyprefFps = getString(R.string.pref_fps_key); 62 keyprefFps = getString(R.string.pref_fps_key);
63 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey); 63 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey);
64 keyprefStartVideoBitrateType = getString(R.string.pref_startvideobitrate_key ); 64 keyprefMaxVideoBitrateType = getString(R.string.pref_maxvideobitrate_key);
65 keyprefStartVideoBitrateValue = getString(R.string.pref_startvideobitrateval ue_key); 65 keyprefMaxVideoBitrateValue = getString(R.string.pref_maxvideobitratevalue_k ey);
66 keyPrefVideoCodec = getString(R.string.pref_videocodec_key); 66 keyPrefVideoCodec = getString(R.string.pref_videocodec_key);
67 keyprefHwCodec = getString(R.string.pref_hwcodec_key); 67 keyprefHwCodec = getString(R.string.pref_hwcodec_key);
68 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key); 68 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key);
69 69
70 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key ); 70 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key );
71 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval ue_key); 71 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval ue_key);
72 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key); 72 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key);
73 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key); 73 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key);
74 keyprefAecDump = getString(R.string.pref_aecdump_key); 74 keyprefAecDump = getString(R.string.pref_aecdump_key);
75 keyprefOpenSLES = getString(R.string.pref_opensles_key); 75 keyprefOpenSLES = getString(R.string.pref_opensles_key);
(...skipping 19 matching lines...) Expand all
95 super.onResume(); 95 super.onResume();
96 // Set summary to be the user-description for the selected value 96 // Set summary to be the user-description for the selected value
97 SharedPreferences sharedPreferences = 97 SharedPreferences sharedPreferences =
98 settingsFragment.getPreferenceScreen().getSharedPreferences(); 98 settingsFragment.getPreferenceScreen().getSharedPreferences();
99 sharedPreferences.registerOnSharedPreferenceChangeListener(this); 99 sharedPreferences.registerOnSharedPreferenceChangeListener(this);
100 updateSummaryB(sharedPreferences, keyprefVideoCall); 100 updateSummaryB(sharedPreferences, keyprefVideoCall);
101 updateSummaryB(sharedPreferences, keyprefCamera2); 101 updateSummaryB(sharedPreferences, keyprefCamera2);
102 updateSummary(sharedPreferences, keyprefResolution); 102 updateSummary(sharedPreferences, keyprefResolution);
103 updateSummary(sharedPreferences, keyprefFps); 103 updateSummary(sharedPreferences, keyprefFps);
104 updateSummaryB(sharedPreferences, keyprefCaptureQualitySlider); 104 updateSummaryB(sharedPreferences, keyprefCaptureQualitySlider);
105 updateSummary(sharedPreferences, keyprefStartVideoBitrateType); 105 updateSummary(sharedPreferences, keyprefMaxVideoBitrateType);
106 updateSummaryBitrate(sharedPreferences, keyprefStartVideoBitrateValue); 106 updateSummaryBitrate(sharedPreferences, keyprefMaxVideoBitrateValue);
107 setVideoBitrateEnable(sharedPreferences); 107 setVideoBitrateEnable(sharedPreferences);
108 updateSummary(sharedPreferences, keyPrefVideoCodec); 108 updateSummary(sharedPreferences, keyPrefVideoCodec);
109 updateSummaryB(sharedPreferences, keyprefHwCodec); 109 updateSummaryB(sharedPreferences, keyprefHwCodec);
110 updateSummaryB(sharedPreferences, keyprefCaptureToTexture); 110 updateSummaryB(sharedPreferences, keyprefCaptureToTexture);
111 111
112 updateSummary(sharedPreferences, keyprefStartAudioBitrateType); 112 updateSummary(sharedPreferences, keyprefStartAudioBitrateType);
113 updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue); 113 updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue);
114 setAudioBitrateEnable(sharedPreferences); 114 setAudioBitrateEnable(sharedPreferences);
115 updateSummary(sharedPreferences, keyPrefAudioCodec); 115 updateSummary(sharedPreferences, keyPrefAudioCodec);
116 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing); 116 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 SharedPreferences sharedPreferences = 170 SharedPreferences sharedPreferences =
171 settingsFragment.getPreferenceScreen().getSharedPreferences(); 171 settingsFragment.getPreferenceScreen().getSharedPreferences();
172 sharedPreferences.unregisterOnSharedPreferenceChangeListener(this); 172 sharedPreferences.unregisterOnSharedPreferenceChangeListener(this);
173 } 173 }
174 174
175 @Override 175 @Override
176 public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, 176 public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
177 String key) { 177 String key) {
178 if (key.equals(keyprefResolution) 178 if (key.equals(keyprefResolution)
179 || key.equals(keyprefFps) 179 || key.equals(keyprefFps)
180 || key.equals(keyprefStartVideoBitrateType) 180 || key.equals(keyprefMaxVideoBitrateType)
181 || key.equals(keyPrefVideoCodec) 181 || key.equals(keyPrefVideoCodec)
182 || key.equals(keyprefStartAudioBitrateType) 182 || key.equals(keyprefStartAudioBitrateType)
183 || key.equals(keyPrefAudioCodec) 183 || key.equals(keyPrefAudioCodec)
184 || key.equals(keyPrefRoomServerUrl)) { 184 || key.equals(keyPrefRoomServerUrl)) {
185 updateSummary(sharedPreferences, key); 185 updateSummary(sharedPreferences, key);
186 } else if (key.equals(keyprefStartVideoBitrateValue) 186 } else if (key.equals(keyprefMaxVideoBitrateValue)
187 || key.equals(keyprefStartAudioBitrateValue)) { 187 || key.equals(keyprefStartAudioBitrateValue)) {
188 updateSummaryBitrate(sharedPreferences, key); 188 updateSummaryBitrate(sharedPreferences, key);
189 } else if (key.equals(keyprefVideoCall) 189 } else if (key.equals(keyprefVideoCall)
190 || key.equals(keyprefCamera2) 190 || key.equals(keyprefCamera2)
191 || key.equals(keyPrefTracing) 191 || key.equals(keyPrefTracing)
192 || key.equals(keyprefCaptureQualitySlider) 192 || key.equals(keyprefCaptureQualitySlider)
193 || key.equals(keyprefHwCodec) 193 || key.equals(keyprefHwCodec)
194 || key.equals(keyprefCaptureToTexture) 194 || key.equals(keyprefCaptureToTexture)
195 || key.equals(keyprefNoAudioProcessing) 195 || key.equals(keyprefNoAudioProcessing)
196 || key.equals(keyprefAecDump) 196 || key.equals(keyprefAecDump)
197 || key.equals(keyprefOpenSLES) 197 || key.equals(keyprefOpenSLES)
198 || key.equals(keyprefDisableBuiltInAEC) 198 || key.equals(keyprefDisableBuiltInAEC)
199 || key.equals(keyprefDisableBuiltInAGC) 199 || key.equals(keyprefDisableBuiltInAGC)
200 || key.equals(keyprefDisableBuiltInNS) 200 || key.equals(keyprefDisableBuiltInNS)
201 || key.equals(keyprefEnableLevelControl) 201 || key.equals(keyprefEnableLevelControl)
202 || key.equals(keyPrefDisplayHud)) { 202 || key.equals(keyPrefDisplayHud)) {
203 updateSummaryB(sharedPreferences, key); 203 updateSummaryB(sharedPreferences, key);
204 } else if (key.equals(keyprefSpeakerphone)) { 204 } else if (key.equals(keyprefSpeakerphone)) {
205 updateSummaryList(sharedPreferences, key); 205 updateSummaryList(sharedPreferences, key);
206 } 206 }
207 if (key.equals(keyprefStartVideoBitrateType)) { 207 if (key.equals(keyprefMaxVideoBitrateType)) {
208 setVideoBitrateEnable(sharedPreferences); 208 setVideoBitrateEnable(sharedPreferences);
209 } 209 }
210 if (key.equals(keyprefStartAudioBitrateType)) { 210 if (key.equals(keyprefStartAudioBitrateType)) {
211 setAudioBitrateEnable(sharedPreferences); 211 setAudioBitrateEnable(sharedPreferences);
212 } 212 }
213 } 213 }
214 214
215 private void updateSummary(SharedPreferences sharedPreferences, String key) { 215 private void updateSummary(SharedPreferences sharedPreferences, String key) {
216 Preference updatedPref = settingsFragment.findPreference(key); 216 Preference updatedPref = settingsFragment.findPreference(key);
217 // Set summary to be the user-description for the selected value 217 // Set summary to be the user-description for the selected value
(...skipping 13 matching lines...) Expand all
231 : getString(R.string.pref_value_disabled)); 231 : getString(R.string.pref_value_disabled));
232 } 232 }
233 233
234 private void updateSummaryList(SharedPreferences sharedPreferences, String key ) { 234 private void updateSummaryList(SharedPreferences sharedPreferences, String key ) {
235 ListPreference updatedPref = (ListPreference) settingsFragment.findPreferenc e(key); 235 ListPreference updatedPref = (ListPreference) settingsFragment.findPreferenc e(key);
236 updatedPref.setSummary(updatedPref.getEntry()); 236 updatedPref.setSummary(updatedPref.getEntry());
237 } 237 }
238 238
239 private void setVideoBitrateEnable(SharedPreferences sharedPreferences) { 239 private void setVideoBitrateEnable(SharedPreferences sharedPreferences) {
240 Preference bitratePreferenceValue = 240 Preference bitratePreferenceValue =
241 settingsFragment.findPreference(keyprefStartVideoBitrateValue); 241 settingsFragment.findPreference(keyprefMaxVideoBitrateValue);
242 String bitrateTypeDefault = getString(R.string.pref_startvideobitrate_defaul t); 242 String bitrateTypeDefault = getString(R.string.pref_maxvideobitrate_default) ;
243 String bitrateType = sharedPreferences.getString( 243 String bitrateType = sharedPreferences.getString(
244 keyprefStartVideoBitrateType, bitrateTypeDefault); 244 keyprefMaxVideoBitrateType, bitrateTypeDefault);
245 if (bitrateType.equals(bitrateTypeDefault)) { 245 if (bitrateType.equals(bitrateTypeDefault)) {
246 bitratePreferenceValue.setEnabled(false); 246 bitratePreferenceValue.setEnabled(false);
247 } else { 247 } else {
248 bitratePreferenceValue.setEnabled(true); 248 bitratePreferenceValue.setEnabled(true);
249 } 249 }
250 } 250 }
251 251
252 private void setAudioBitrateEnable(SharedPreferences sharedPreferences) { 252 private void setAudioBitrateEnable(SharedPreferences sharedPreferences) {
253 Preference bitratePreferenceValue = 253 Preference bitratePreferenceValue =
254 settingsFragment.findPreference(keyprefStartAudioBitrateValue); 254 settingsFragment.findPreference(keyprefStartAudioBitrateValue);
255 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t); 255 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t);
256 String bitrateType = sharedPreferences.getString( 256 String bitrateType = sharedPreferences.getString(
257 keyprefStartAudioBitrateType, bitrateTypeDefault); 257 keyprefStartAudioBitrateType, bitrateTypeDefault);
258 if (bitrateType.equals(bitrateTypeDefault)) { 258 if (bitrateType.equals(bitrateTypeDefault)) {
259 bitratePreferenceValue.setEnabled(false); 259 bitratePreferenceValue.setEnabled(false);
260 } else { 260 } else {
261 bitratePreferenceValue.setEnabled(true); 261 bitratePreferenceValue.setEnabled(true);
262 } 262 }
263 } 263 }
264 } 264 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698