OLD | NEW |
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 private String keyprefVideoBitrateType; | 61 private String keyprefVideoBitrateType; |
62 private String keyprefVideoBitrateValue; | 62 private String keyprefVideoBitrateValue; |
63 private String keyprefVideoCodec; | 63 private String keyprefVideoCodec; |
64 private String keyprefAudioBitrateType; | 64 private String keyprefAudioBitrateType; |
65 private String keyprefAudioBitrateValue; | 65 private String keyprefAudioBitrateValue; |
66 private String keyprefAudioCodec; | 66 private String keyprefAudioCodec; |
67 private String keyprefHwCodecAcceleration; | 67 private String keyprefHwCodecAcceleration; |
68 private String keyprefNoAudioProcessingPipeline; | 68 private String keyprefNoAudioProcessingPipeline; |
69 private String keyprefOpenSLES; | 69 private String keyprefOpenSLES; |
70 private String keyprefDisplayHud; | 70 private String keyprefDisplayHud; |
| 71 private String keyprefTracing; |
71 private String keyprefRoomServerUrl; | 72 private String keyprefRoomServerUrl; |
72 private String keyprefRoom; | 73 private String keyprefRoom; |
73 private String keyprefRoomList; | 74 private String keyprefRoomList; |
74 private ArrayList<String> roomList; | 75 private ArrayList<String> roomList; |
75 private ArrayAdapter<String> adapter; | 76 private ArrayAdapter<String> adapter; |
76 | 77 |
77 @Override | 78 @Override |
78 public void onCreate(Bundle savedInstanceState) { | 79 public void onCreate(Bundle savedInstanceState) { |
79 super.onCreate(savedInstanceState); | 80 super.onCreate(savedInstanceState); |
80 | 81 |
81 // Get setting keys. | 82 // Get setting keys. |
82 PreferenceManager.setDefaultValues(this, R.xml.preferences, false); | 83 PreferenceManager.setDefaultValues(this, R.xml.preferences, false); |
83 sharedPref = PreferenceManager.getDefaultSharedPreferences(this); | 84 sharedPref = PreferenceManager.getDefaultSharedPreferences(this); |
84 keyprefVideoCallEnabled = getString(R.string.pref_videocall_key); | 85 keyprefVideoCallEnabled = getString(R.string.pref_videocall_key); |
85 keyprefResolution = getString(R.string.pref_resolution_key); | 86 keyprefResolution = getString(R.string.pref_resolution_key); |
86 keyprefFps = getString(R.string.pref_fps_key); | 87 keyprefFps = getString(R.string.pref_fps_key); |
87 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k
ey); | 88 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k
ey); |
88 keyprefVideoBitrateType = getString(R.string.pref_startvideobitrate_key); | 89 keyprefVideoBitrateType = getString(R.string.pref_startvideobitrate_key); |
89 keyprefVideoBitrateValue = getString(R.string.pref_startvideobitratevalue_ke
y); | 90 keyprefVideoBitrateValue = getString(R.string.pref_startvideobitratevalue_ke
y); |
90 keyprefVideoCodec = getString(R.string.pref_videocodec_key); | 91 keyprefVideoCodec = getString(R.string.pref_videocodec_key); |
91 keyprefHwCodecAcceleration = getString(R.string.pref_hwcodec_key); | 92 keyprefHwCodecAcceleration = getString(R.string.pref_hwcodec_key); |
92 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); | 93 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); |
93 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke
y); | 94 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke
y); |
94 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); | 95 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); |
95 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing
_key); | 96 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing
_key); |
96 keyprefOpenSLES = getString(R.string.pref_opensles_key); | 97 keyprefOpenSLES = getString(R.string.pref_opensles_key); |
97 keyprefDisplayHud = getString(R.string.pref_displayhud_key); | 98 keyprefDisplayHud = getString(R.string.pref_displayhud_key); |
| 99 keyprefTracing = getString(R.string.pref_tracing_key); |
98 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key); | 100 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key); |
99 keyprefRoom = getString(R.string.pref_room_key); | 101 keyprefRoom = getString(R.string.pref_room_key); |
100 keyprefRoomList = getString(R.string.pref_room_list_key); | 102 keyprefRoomList = getString(R.string.pref_room_list_key); |
101 | 103 |
102 setContentView(R.layout.activity_connect); | 104 setContentView(R.layout.activity_connect); |
103 | 105 |
104 roomEditText = (EditText) findViewById(R.id.room_edittext); | 106 roomEditText = (EditText) findViewById(R.id.room_edittext); |
105 roomEditText.setOnEditorActionListener( | 107 roomEditText.setOnEditorActionListener( |
106 new TextView.OnEditorActionListener() { | 108 new TextView.OnEditorActionListener() { |
107 @Override | 109 @Override |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
315 if (!bitrateType.equals(bitrateTypeDefault)) { | 317 if (!bitrateType.equals(bitrateTypeDefault)) { |
316 String bitrateValue = sharedPref.getString(keyprefAudioBitrateValue, | 318 String bitrateValue = sharedPref.getString(keyprefAudioBitrateValue, |
317 getString(R.string.pref_startaudiobitratevalue_default)); | 319 getString(R.string.pref_startaudiobitratevalue_default)); |
318 audioStartBitrate = Integer.parseInt(bitrateValue); | 320 audioStartBitrate = Integer.parseInt(bitrateValue); |
319 } | 321 } |
320 | 322 |
321 // Check statistics display option. | 323 // Check statistics display option. |
322 boolean displayHud = sharedPref.getBoolean(keyprefDisplayHud, | 324 boolean displayHud = sharedPref.getBoolean(keyprefDisplayHud, |
323 Boolean.valueOf(getString(R.string.pref_displayhud_default))); | 325 Boolean.valueOf(getString(R.string.pref_displayhud_default))); |
324 | 326 |
| 327 boolean tracing = sharedPref.getBoolean(keyprefTracing, |
| 328 Boolean.valueOf(getString(R.string.pref_tracing_default))); |
| 329 |
325 // Start AppRTCDemo activity. | 330 // Start AppRTCDemo activity. |
326 Log.d(TAG, "Connecting to room " + roomId + " at URL " + roomUrl); | 331 Log.d(TAG, "Connecting to room " + roomId + " at URL " + roomUrl); |
327 if (validateUrl(roomUrl)) { | 332 if (validateUrl(roomUrl)) { |
328 Uri uri = Uri.parse(roomUrl); | 333 Uri uri = Uri.parse(roomUrl); |
329 Intent intent = new Intent(this, CallActivity.class); | 334 Intent intent = new Intent(this, CallActivity.class); |
330 intent.setData(uri); | 335 intent.setData(uri); |
331 intent.putExtra(CallActivity.EXTRA_ROOMID, roomId); | 336 intent.putExtra(CallActivity.EXTRA_ROOMID, roomId); |
332 intent.putExtra(CallActivity.EXTRA_LOOPBACK, loopback); | 337 intent.putExtra(CallActivity.EXTRA_LOOPBACK, loopback); |
333 intent.putExtra(CallActivity.EXTRA_VIDEO_CALL, videoCallEnabled); | 338 intent.putExtra(CallActivity.EXTRA_VIDEO_CALL, videoCallEnabled); |
334 intent.putExtra(CallActivity.EXTRA_VIDEO_WIDTH, videoWidth); | 339 intent.putExtra(CallActivity.EXTRA_VIDEO_WIDTH, videoWidth); |
335 intent.putExtra(CallActivity.EXTRA_VIDEO_HEIGHT, videoHeight); | 340 intent.putExtra(CallActivity.EXTRA_VIDEO_HEIGHT, videoHeight); |
336 intent.putExtra(CallActivity.EXTRA_VIDEO_FPS, cameraFps); | 341 intent.putExtra(CallActivity.EXTRA_VIDEO_FPS, cameraFps); |
337 intent.putExtra(CallActivity.EXTRA_VIDEO_CAPTUREQUALITYSLIDER_ENABLED, | 342 intent.putExtra(CallActivity.EXTRA_VIDEO_CAPTUREQUALITYSLIDER_ENABLED, |
338 captureQualitySlider); | 343 captureQualitySlider); |
339 intent.putExtra(CallActivity.EXTRA_VIDEO_BITRATE, videoStartBitrate); | 344 intent.putExtra(CallActivity.EXTRA_VIDEO_BITRATE, videoStartBitrate); |
340 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec); | 345 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec); |
341 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); | 346 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); |
342 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, | 347 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, |
343 noAudioProcessing); | 348 noAudioProcessing); |
344 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES); | 349 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES); |
345 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); | 350 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); |
346 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); | 351 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); |
347 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); | 352 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); |
| 353 intent.putExtra(CallActivity.EXTRA_TRACING, tracing); |
348 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun); | 354 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun); |
349 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs); | 355 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs); |
350 | 356 |
351 startActivityForResult(intent, CONNECTION_REQUEST); | 357 startActivityForResult(intent, CONNECTION_REQUEST); |
352 } | 358 } |
353 } | 359 } |
354 | 360 |
355 private boolean validateUrl(String url) { | 361 private boolean validateUrl(String url) { |
356 if (URLUtil.isHttpsUrl(url) || URLUtil.isHttpUrl(url)) { | 362 if (URLUtil.isHttpsUrl(url) || URLUtil.isHttpUrl(url)) { |
357 return true; | 363 return true; |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
400 } | 406 } |
401 } | 407 } |
402 if (position != AdapterView.INVALID_POSITION) { | 408 if (position != AdapterView.INVALID_POSITION) { |
403 return adapter.getItem(position); | 409 return adapter.getItem(position); |
404 } else { | 410 } else { |
405 return null; | 411 return null; |
406 } | 412 } |
407 } | 413 } |
408 | 414 |
409 } | 415 } |
OLD | NEW |