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

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

Issue 2193753002: Add an option to enable level control to Android 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 28 matching lines...) Expand all
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 50
50 private String keyPrefRoomServerUrl; 51 private String keyPrefRoomServerUrl;
51 private String keyPrefDisplayHud; 52 private String keyPrefDisplayHud;
52 private String keyPrefTracing; 53 private String keyPrefTracing;
53 54
54 @Override 55 @Override
55 protected void onCreate(Bundle savedInstanceState) { 56 protected void onCreate(Bundle savedInstanceState) {
56 super.onCreate(savedInstanceState); 57 super.onCreate(savedInstanceState);
57 keyprefVideoCall = getString(R.string.pref_videocall_key); 58 keyprefVideoCall = getString(R.string.pref_videocall_key);
58 keyprefCamera2 = getString(R.string.pref_camera2_key); 59 keyprefCamera2 = getString(R.string.pref_camera2_key);
59 keyprefResolution = getString(R.string.pref_resolution_key); 60 keyprefResolution = getString(R.string.pref_resolution_key);
60 keyprefFps = getString(R.string.pref_fps_key); 61 keyprefFps = getString(R.string.pref_fps_key);
61 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey); 62 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey);
62 keyprefStartVideoBitrateType = getString(R.string.pref_startvideobitrate_key ); 63 keyprefStartVideoBitrateType = getString(R.string.pref_startvideobitrate_key );
63 keyprefStartVideoBitrateValue = getString(R.string.pref_startvideobitrateval ue_key); 64 keyprefStartVideoBitrateValue = getString(R.string.pref_startvideobitrateval ue_key);
64 keyPrefVideoCodec = getString(R.string.pref_videocodec_key); 65 keyPrefVideoCodec = getString(R.string.pref_videocodec_key);
65 keyprefHwCodec = getString(R.string.pref_hwcodec_key); 66 keyprefHwCodec = getString(R.string.pref_hwcodec_key);
66 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key); 67 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key);
67 68
68 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key ); 69 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key );
69 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval ue_key); 70 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval ue_key);
70 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key); 71 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key);
71 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key); 72 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key);
72 keyprefAecDump = getString(R.string.pref_aecdump_key); 73 keyprefAecDump = getString(R.string.pref_aecdump_key);
73 keyprefOpenSLES = getString(R.string.pref_opensles_key); 74 keyprefOpenSLES = getString(R.string.pref_opensles_key);
74 keyprefDisableBuiltInAEC = getString(R.string.pref_disable_built_in_aec_key) ; 75 keyprefDisableBuiltInAEC = getString(R.string.pref_disable_built_in_aec_key) ;
75 keyprefDisableBuiltInAGC = getString(R.string.pref_disable_built_in_agc_key) ; 76 keyprefDisableBuiltInAGC = getString(R.string.pref_disable_built_in_agc_key) ;
76 keyprefDisableBuiltInNS = getString(R.string.pref_disable_built_in_ns_key); 77 keyprefDisableBuiltInNS = getString(R.string.pref_disable_built_in_ns_key);
78 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key );
77 79
78 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key); 80 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key);
79 keyPrefDisplayHud = getString(R.string.pref_displayhud_key); 81 keyPrefDisplayHud = getString(R.string.pref_displayhud_key);
80 keyPrefTracing = getString(R.string.pref_tracing_key); 82 keyPrefTracing = getString(R.string.pref_tracing_key);
81 83
82 // Display the fragment as the main content. 84 // Display the fragment as the main content.
83 settingsFragment = new SettingsFragment(); 85 settingsFragment = new SettingsFragment();
84 getFragmentManager().beginTransaction() 86 getFragmentManager().beginTransaction()
85 .replace(android.R.id.content, settingsFragment) 87 .replace(android.R.id.content, settingsFragment)
86 .commit(); 88 .commit();
(...skipping 21 matching lines...) Expand all
108 updateSummary(sharedPreferences, keyprefStartAudioBitrateType); 110 updateSummary(sharedPreferences, keyprefStartAudioBitrateType);
109 updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue); 111 updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue);
110 setAudioBitrateEnable(sharedPreferences); 112 setAudioBitrateEnable(sharedPreferences);
111 updateSummary(sharedPreferences, keyPrefAudioCodec); 113 updateSummary(sharedPreferences, keyPrefAudioCodec);
112 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing); 114 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing);
113 updateSummaryB(sharedPreferences, keyprefAecDump); 115 updateSummaryB(sharedPreferences, keyprefAecDump);
114 updateSummaryB(sharedPreferences, keyprefOpenSLES); 116 updateSummaryB(sharedPreferences, keyprefOpenSLES);
115 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC); 117 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC);
116 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC); 118 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC);
117 updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS); 119 updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS);
120 updateSummaryB(sharedPreferences, keyprefEnableLevelControl);
118 121
119 updateSummary(sharedPreferences, keyPrefRoomServerUrl); 122 updateSummary(sharedPreferences, keyPrefRoomServerUrl);
120 updateSummaryB(sharedPreferences, keyPrefDisplayHud); 123 updateSummaryB(sharedPreferences, keyPrefDisplayHud);
121 updateSummaryB(sharedPreferences, keyPrefTracing); 124 updateSummaryB(sharedPreferences, keyPrefTracing);
122 125
123 if (!Camera2Enumerator.isSupported()) { 126 if (!Camera2Enumerator.isSupported()) {
124 Preference camera2Preference = 127 Preference camera2Preference =
125 settingsFragment.findPreference(keyprefCamera2); 128 settingsFragment.findPreference(keyprefCamera2);
126 129
127 camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported )); 130 camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported ));
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 || key.equals(keyPrefTracing) 188 || key.equals(keyPrefTracing)
186 || key.equals(keyprefCaptureQualitySlider) 189 || key.equals(keyprefCaptureQualitySlider)
187 || key.equals(keyprefHwCodec) 190 || key.equals(keyprefHwCodec)
188 || key.equals(keyprefCaptureToTexture) 191 || key.equals(keyprefCaptureToTexture)
189 || key.equals(keyprefNoAudioProcessing) 192 || key.equals(keyprefNoAudioProcessing)
190 || key.equals(keyprefAecDump) 193 || key.equals(keyprefAecDump)
191 || key.equals(keyprefOpenSLES) 194 || key.equals(keyprefOpenSLES)
192 || key.equals(keyprefDisableBuiltInAEC) 195 || key.equals(keyprefDisableBuiltInAEC)
193 || key.equals(keyprefDisableBuiltInAGC) 196 || key.equals(keyprefDisableBuiltInAGC)
194 || key.equals(keyprefDisableBuiltInNS) 197 || key.equals(keyprefDisableBuiltInNS)
198 || key.equals(keyprefEnableLevelControl)
195 || key.equals(keyPrefDisplayHud)) { 199 || key.equals(keyPrefDisplayHud)) {
196 updateSummaryB(sharedPreferences, key); 200 updateSummaryB(sharedPreferences, key);
197 } 201 }
198 if (key.equals(keyprefStartVideoBitrateType)) { 202 if (key.equals(keyprefStartVideoBitrateType)) {
199 setVideoBitrateEnable(sharedPreferences); 203 setVideoBitrateEnable(sharedPreferences);
200 } 204 }
201 if (key.equals(keyprefStartAudioBitrateType)) { 205 if (key.equals(keyprefStartAudioBitrateType)) {
202 setAudioBitrateEnable(sharedPreferences); 206 setAudioBitrateEnable(sharedPreferences);
203 } 207 }
204 } 208 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t); 245 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t);
242 String bitrateType = sharedPreferences.getString( 246 String bitrateType = sharedPreferences.getString(
243 keyprefStartAudioBitrateType, bitrateTypeDefault); 247 keyprefStartAudioBitrateType, bitrateTypeDefault);
244 if (bitrateType.equals(bitrateTypeDefault)) { 248 if (bitrateType.equals(bitrateTypeDefault)) {
245 bitratePreferenceValue.setEnabled(false); 249 bitratePreferenceValue.setEnabled(false);
246 } else { 250 } else {
247 bitratePreferenceValue.setEnabled(true); 251 bitratePreferenceValue.setEnabled(true);
248 } 252 }
249 } 253 }
250 } 254 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698