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

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

Issue 2464243002: Add Datachannel support to Android AppRTCMobile (Closed)
Patch Set: restore videoCapturerStopped = true Created 4 years, 1 month 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
« no previous file with comments | « webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 private String keyprefDisableBuiltInAEC; 45 private String keyprefDisableBuiltInAEC;
46 private String keyprefDisableBuiltInAGC; 46 private String keyprefDisableBuiltInAGC;
47 private String keyprefDisableBuiltInNS; 47 private String keyprefDisableBuiltInNS;
48 private String keyprefEnableLevelControl; 48 private String keyprefEnableLevelControl;
49 private String keyprefSpeakerphone; 49 private String keyprefSpeakerphone;
50 50
51 private String keyPrefRoomServerUrl; 51 private String keyPrefRoomServerUrl;
52 private String keyPrefDisplayHud; 52 private String keyPrefDisplayHud;
53 private String keyPrefTracing; 53 private String keyPrefTracing;
54 54
55 private String keyprefEnableDataChannel;
56 private String keyprefOrdered;
57 private String keyprefMaxRetransmitTimeMs;
58 private String keyprefMaxRetransmits;
59 private String keyprefDataProtocol;
60 private String keyprefNegotiated;
61 private String keyprefDataId;
62
55 @Override 63 @Override
56 protected void onCreate(Bundle savedInstanceState) { 64 protected void onCreate(Bundle savedInstanceState) {
57 super.onCreate(savedInstanceState); 65 super.onCreate(savedInstanceState);
58 keyprefVideoCall = getString(R.string.pref_videocall_key); 66 keyprefVideoCall = getString(R.string.pref_videocall_key);
59 keyprefScreencapture = getString(R.string.pref_screencapture_key); 67 keyprefScreencapture = getString(R.string.pref_screencapture_key);
60 keyprefCamera2 = getString(R.string.pref_camera2_key); 68 keyprefCamera2 = getString(R.string.pref_camera2_key);
61 keyprefResolution = getString(R.string.pref_resolution_key); 69 keyprefResolution = getString(R.string.pref_resolution_key);
62 keyprefFps = getString(R.string.pref_fps_key); 70 keyprefFps = getString(R.string.pref_fps_key);
63 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey); 71 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey);
64 keyprefMaxVideoBitrateType = getString(R.string.pref_maxvideobitrate_key); 72 keyprefMaxVideoBitrateType = getString(R.string.pref_maxvideobitrate_key);
65 keyprefMaxVideoBitrateValue = getString(R.string.pref_maxvideobitratevalue_k ey); 73 keyprefMaxVideoBitrateValue = getString(R.string.pref_maxvideobitratevalue_k ey);
66 keyPrefVideoCodec = getString(R.string.pref_videocodec_key); 74 keyPrefVideoCodec = getString(R.string.pref_videocodec_key);
67 keyprefHwCodec = getString(R.string.pref_hwcodec_key); 75 keyprefHwCodec = getString(R.string.pref_hwcodec_key);
68 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key); 76 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key);
69 77
70 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key ); 78 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key );
71 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval ue_key); 79 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval ue_key);
72 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key); 80 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key);
73 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key); 81 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key);
74 keyprefAecDump = getString(R.string.pref_aecdump_key); 82 keyprefAecDump = getString(R.string.pref_aecdump_key);
75 keyprefOpenSLES = getString(R.string.pref_opensles_key); 83 keyprefOpenSLES = getString(R.string.pref_opensles_key);
76 keyprefDisableBuiltInAEC = getString(R.string.pref_disable_built_in_aec_key) ; 84 keyprefDisableBuiltInAEC = getString(R.string.pref_disable_built_in_aec_key) ;
77 keyprefDisableBuiltInAGC = getString(R.string.pref_disable_built_in_agc_key) ; 85 keyprefDisableBuiltInAGC = getString(R.string.pref_disable_built_in_agc_key) ;
78 keyprefDisableBuiltInNS = getString(R.string.pref_disable_built_in_ns_key); 86 keyprefDisableBuiltInNS = getString(R.string.pref_disable_built_in_ns_key);
79 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key ); 87 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key );
80 keyprefSpeakerphone = getString(R.string.pref_speakerphone_key); 88 keyprefSpeakerphone = getString(R.string.pref_speakerphone_key);
81 89
90 keyprefEnableDataChannel = getString(R.string.pref_enable_datachannel_key);
91 keyprefOrdered = getString(R.string.pref_ordered_key);
92 keyprefMaxRetransmitTimeMs = getString(R.string.pref_max_retransmit_time_ms_ key);
93 keyprefMaxRetransmits = getString(R.string.pref_max_retransmits_key);
94 keyprefDataProtocol = getString(R.string.pref_data_protocol_key);
95 keyprefNegotiated = getString(R.string.pref_negotiated_key);
96 keyprefDataId = getString(R.string.pref_data_id_key);
97
82 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key); 98 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key);
83 keyPrefDisplayHud = getString(R.string.pref_displayhud_key); 99 keyPrefDisplayHud = getString(R.string.pref_displayhud_key);
84 keyPrefTracing = getString(R.string.pref_tracing_key); 100 keyPrefTracing = getString(R.string.pref_tracing_key);
85 101
86 // Display the fragment as the main content. 102 // Display the fragment as the main content.
87 settingsFragment = new SettingsFragment(); 103 settingsFragment = new SettingsFragment();
88 getFragmentManager() 104 getFragmentManager()
89 .beginTransaction() 105 .beginTransaction()
90 .replace(android.R.id.content, settingsFragment) 106 .replace(android.R.id.content, settingsFragment)
91 .commit(); 107 .commit();
(...skipping 25 matching lines...) Expand all
117 updateSummary(sharedPreferences, keyPrefAudioCodec); 133 updateSummary(sharedPreferences, keyPrefAudioCodec);
118 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing); 134 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing);
119 updateSummaryB(sharedPreferences, keyprefAecDump); 135 updateSummaryB(sharedPreferences, keyprefAecDump);
120 updateSummaryB(sharedPreferences, keyprefOpenSLES); 136 updateSummaryB(sharedPreferences, keyprefOpenSLES);
121 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC); 137 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC);
122 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC); 138 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC);
123 updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS); 139 updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS);
124 updateSummaryB(sharedPreferences, keyprefEnableLevelControl); 140 updateSummaryB(sharedPreferences, keyprefEnableLevelControl);
125 updateSummaryList(sharedPreferences, keyprefSpeakerphone); 141 updateSummaryList(sharedPreferences, keyprefSpeakerphone);
126 142
143 updateSummaryB(sharedPreferences, keyprefEnableDataChannel);
144 updateSummaryB(sharedPreferences, keyprefOrdered);
145 updateSummary(sharedPreferences, keyprefMaxRetransmitTimeMs);
146 updateSummary(sharedPreferences, keyprefMaxRetransmits);
147 updateSummary(sharedPreferences, keyprefDataProtocol);
148 updateSummaryB(sharedPreferences, keyprefNegotiated);
149 updateSummary(sharedPreferences, keyprefDataId);
150 setDataChannelEnable(sharedPreferences);
151
127 updateSummary(sharedPreferences, keyPrefRoomServerUrl); 152 updateSummary(sharedPreferences, keyPrefRoomServerUrl);
128 updateSummaryB(sharedPreferences, keyPrefDisplayHud); 153 updateSummaryB(sharedPreferences, keyPrefDisplayHud);
129 updateSummaryB(sharedPreferences, keyPrefTracing); 154 updateSummaryB(sharedPreferences, keyPrefTracing);
130 155
131 if (!Camera2Enumerator.isSupported(this)) { 156 if (!Camera2Enumerator.isSupported(this)) {
132 Preference camera2Preference = settingsFragment.findPreference(keyprefCame ra2); 157 Preference camera2Preference = settingsFragment.findPreference(keyprefCame ra2);
133 158
134 camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported )); 159 camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported ));
135 camera2Preference.setEnabled(false); 160 camera2Preference.setEnabled(false);
136 } 161 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 200
176 @Override 201 @Override
177 public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Str ing key) { 202 public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Str ing key) {
178 // clang-format off 203 // clang-format off
179 if (key.equals(keyprefResolution) 204 if (key.equals(keyprefResolution)
180 || key.equals(keyprefFps) 205 || key.equals(keyprefFps)
181 || key.equals(keyprefMaxVideoBitrateType) 206 || key.equals(keyprefMaxVideoBitrateType)
182 || key.equals(keyPrefVideoCodec) 207 || key.equals(keyPrefVideoCodec)
183 || key.equals(keyprefStartAudioBitrateType) 208 || key.equals(keyprefStartAudioBitrateType)
184 || key.equals(keyPrefAudioCodec) 209 || key.equals(keyPrefAudioCodec)
185 || key.equals(keyPrefRoomServerUrl)) { 210 || key.equals(keyPrefRoomServerUrl)
211 || key.equals(keyprefMaxRetransmitTimeMs)
212 || key.equals(keyprefMaxRetransmits)
213 || key.equals(keyprefDataProtocol)
214 || key.equals(keyprefDataId)) {
186 updateSummary(sharedPreferences, key); 215 updateSummary(sharedPreferences, key);
187 } else if (key.equals(keyprefMaxVideoBitrateValue) 216 } else if (key.equals(keyprefMaxVideoBitrateValue)
188 || key.equals(keyprefStartAudioBitrateValue)) { 217 || key.equals(keyprefStartAudioBitrateValue)) {
189 updateSummaryBitrate(sharedPreferences, key); 218 updateSummaryBitrate(sharedPreferences, key);
190 } else if (key.equals(keyprefVideoCall) 219 } else if (key.equals(keyprefVideoCall)
191 || key.equals(keyprefScreencapture) 220 || key.equals(keyprefScreencapture)
192 || key.equals(keyprefCamera2) 221 || key.equals(keyprefCamera2)
193 || key.equals(keyPrefTracing) 222 || key.equals(keyPrefTracing)
194 || key.equals(keyprefCaptureQualitySlider) 223 || key.equals(keyprefCaptureQualitySlider)
195 || key.equals(keyprefHwCodec) 224 || key.equals(keyprefHwCodec)
196 || key.equals(keyprefCaptureToTexture) 225 || key.equals(keyprefCaptureToTexture)
197 || key.equals(keyprefNoAudioProcessing) 226 || key.equals(keyprefNoAudioProcessing)
198 || key.equals(keyprefAecDump) 227 || key.equals(keyprefAecDump)
199 || key.equals(keyprefOpenSLES) 228 || key.equals(keyprefOpenSLES)
200 || key.equals(keyprefDisableBuiltInAEC) 229 || key.equals(keyprefDisableBuiltInAEC)
201 || key.equals(keyprefDisableBuiltInAGC) 230 || key.equals(keyprefDisableBuiltInAGC)
202 || key.equals(keyprefDisableBuiltInNS) 231 || key.equals(keyprefDisableBuiltInNS)
203 || key.equals(keyprefEnableLevelControl) 232 || key.equals(keyprefEnableLevelControl)
204 || key.equals(keyPrefDisplayHud)) { 233 || key.equals(keyPrefDisplayHud)
234 || key.equals(keyprefEnableDataChannel)
235 || key.equals(keyprefOrdered)
236 || key.equals(keyprefNegotiated)) {
205 updateSummaryB(sharedPreferences, key); 237 updateSummaryB(sharedPreferences, key);
206 } else if (key.equals(keyprefSpeakerphone)) { 238 } else if (key.equals(keyprefSpeakerphone)) {
207 updateSummaryList(sharedPreferences, key); 239 updateSummaryList(sharedPreferences, key);
208 } 240 }
209 // clang-format on 241 // clang-format on
210 if (key.equals(keyprefMaxVideoBitrateType)) { 242 if (key.equals(keyprefMaxVideoBitrateType)) {
211 setVideoBitrateEnable(sharedPreferences); 243 setVideoBitrateEnable(sharedPreferences);
212 } 244 }
213 if (key.equals(keyprefStartAudioBitrateType)) { 245 if (key.equals(keyprefStartAudioBitrateType)) {
214 setAudioBitrateEnable(sharedPreferences); 246 setAudioBitrateEnable(sharedPreferences);
215 } 247 }
248 if (key.equals(keyprefEnableDataChannel)) {
249 setDataChannelEnable(sharedPreferences);
250 }
216 } 251 }
217 252
218 private void updateSummary(SharedPreferences sharedPreferences, String key) { 253 private void updateSummary(SharedPreferences sharedPreferences, String key) {
219 Preference updatedPref = settingsFragment.findPreference(key); 254 Preference updatedPref = settingsFragment.findPreference(key);
220 // Set summary to be the user-description for the selected value 255 // Set summary to be the user-description for the selected value
221 updatedPref.setSummary(sharedPreferences.getString(key, "")); 256 updatedPref.setSummary(sharedPreferences.getString(key, ""));
222 } 257 }
223 258
224 private void updateSummaryBitrate(SharedPreferences sharedPreferences, String key) { 259 private void updateSummaryBitrate(SharedPreferences sharedPreferences, String key) {
225 Preference updatedPref = settingsFragment.findPreference(key); 260 Preference updatedPref = settingsFragment.findPreference(key);
(...skipping 30 matching lines...) Expand all
256 settingsFragment.findPreference(keyprefStartAudioBitrateValue); 291 settingsFragment.findPreference(keyprefStartAudioBitrateValue);
257 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t); 292 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t);
258 String bitrateType = 293 String bitrateType =
259 sharedPreferences.getString(keyprefStartAudioBitrateType, bitrateTypeDef ault); 294 sharedPreferences.getString(keyprefStartAudioBitrateType, bitrateTypeDef ault);
260 if (bitrateType.equals(bitrateTypeDefault)) { 295 if (bitrateType.equals(bitrateTypeDefault)) {
261 bitratePreferenceValue.setEnabled(false); 296 bitratePreferenceValue.setEnabled(false);
262 } else { 297 } else {
263 bitratePreferenceValue.setEnabled(true); 298 bitratePreferenceValue.setEnabled(true);
264 } 299 }
265 } 300 }
301
302 private void setDataChannelEnable(SharedPreferences sharedPreferences) {
303 boolean enabled = sharedPreferences.getBoolean(keyprefEnableDataChannel, tru e);
304 settingsFragment.findPreference(keyprefOrdered).setEnabled(enabled);
305 settingsFragment.findPreference(keyprefMaxRetransmitTimeMs).setEnabled(enabl ed);
306 settingsFragment.findPreference(keyprefMaxRetransmits).setEnabled(enabled);
307 settingsFragment.findPreference(keyprefDataProtocol).setEnabled(enabled);
308 settingsFragment.findPreference(keyprefNegotiated).setEnabled(enabled);
309 settingsFragment.findPreference(keyprefDataId).setEnabled(enabled);
310 }
266 } 311 }
OLDNEW
« no previous file with comments | « webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698