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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 private String keyprefVideoCodec; | 64 private String keyprefVideoCodec; |
65 private String keyprefAudioBitrateType; | 65 private String keyprefAudioBitrateType; |
66 private String keyprefAudioBitrateValue; | 66 private String keyprefAudioBitrateValue; |
67 private String keyprefAudioCodec; | 67 private String keyprefAudioCodec; |
68 private String keyprefHwCodecAcceleration; | 68 private String keyprefHwCodecAcceleration; |
69 private String keyprefCaptureToTexture; | 69 private String keyprefCaptureToTexture; |
70 private String keyprefNoAudioProcessingPipeline; | 70 private String keyprefNoAudioProcessingPipeline; |
71 private String keyprefAecDump; | 71 private String keyprefAecDump; |
72 private String keyprefOpenSLES; | 72 private String keyprefOpenSLES; |
73 private String keyprefDisableBuiltInAec; | 73 private String keyprefDisableBuiltInAec; |
| 74 private String keyprefDisableBuiltInAgc; |
| 75 private String keyprefDisableBuiltInNs; |
74 private String keyprefDisplayHud; | 76 private String keyprefDisplayHud; |
75 private String keyprefTracing; | 77 private String keyprefTracing; |
76 private String keyprefRoomServerUrl; | 78 private String keyprefRoomServerUrl; |
77 private String keyprefRoom; | 79 private String keyprefRoom; |
78 private String keyprefRoomList; | 80 private String keyprefRoomList; |
79 private ArrayList<String> roomList; | 81 private ArrayList<String> roomList; |
80 private ArrayAdapter<String> adapter; | 82 private ArrayAdapter<String> adapter; |
81 | 83 |
82 @Override | 84 @Override |
83 public void onCreate(Bundle savedInstanceState) { | 85 public void onCreate(Bundle savedInstanceState) { |
(...skipping 12 matching lines...) Expand all Loading... |
96 keyprefVideoCodec = getString(R.string.pref_videocodec_key); | 98 keyprefVideoCodec = getString(R.string.pref_videocodec_key); |
97 keyprefHwCodecAcceleration = getString(R.string.pref_hwcodec_key); | 99 keyprefHwCodecAcceleration = getString(R.string.pref_hwcodec_key); |
98 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key); | 100 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key); |
99 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); | 101 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); |
100 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke
y); | 102 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke
y); |
101 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); | 103 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); |
102 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing
_key); | 104 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing
_key); |
103 keyprefAecDump = getString(R.string.pref_aecdump_key); | 105 keyprefAecDump = getString(R.string.pref_aecdump_key); |
104 keyprefOpenSLES = getString(R.string.pref_opensles_key); | 106 keyprefOpenSLES = getString(R.string.pref_opensles_key); |
105 keyprefDisableBuiltInAec = getString(R.string.pref_disable_built_in_aec_key)
; | 107 keyprefDisableBuiltInAec = getString(R.string.pref_disable_built_in_aec_key)
; |
| 108 keyprefDisableBuiltInAgc = getString(R.string.pref_disable_built_in_agc_key)
; |
| 109 keyprefDisableBuiltInNs = getString(R.string.pref_disable_built_in_ns_key); |
106 keyprefDisplayHud = getString(R.string.pref_displayhud_key); | 110 keyprefDisplayHud = getString(R.string.pref_displayhud_key); |
107 keyprefTracing = getString(R.string.pref_tracing_key); | 111 keyprefTracing = getString(R.string.pref_tracing_key); |
108 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key); | 112 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key); |
109 keyprefRoom = getString(R.string.pref_room_key); | 113 keyprefRoom = getString(R.string.pref_room_key); |
110 keyprefRoomList = getString(R.string.pref_room_list_key); | 114 keyprefRoomList = getString(R.string.pref_room_list_key); |
111 | 115 |
112 setContentView(R.layout.activity_connect); | 116 setContentView(R.layout.activity_connect); |
113 | 117 |
114 roomEditText = (EditText) findViewById(R.id.room_edittext); | 118 roomEditText = (EditText) findViewById(R.id.room_edittext); |
115 roomEditText.setOnEditorActionListener( | 119 roomEditText.setOnEditorActionListener( |
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
292 // Check OpenSL ES enabled flag. | 296 // Check OpenSL ES enabled flag. |
293 boolean useOpenSLES = sharedPref.getBoolean( | 297 boolean useOpenSLES = sharedPref.getBoolean( |
294 keyprefOpenSLES, | 298 keyprefOpenSLES, |
295 Boolean.valueOf(getString(R.string.pref_opensles_default))); | 299 Boolean.valueOf(getString(R.string.pref_opensles_default))); |
296 | 300 |
297 // Check Disable built-in AEC flag. | 301 // Check Disable built-in AEC flag. |
298 boolean disableBuiltInAEC = sharedPref.getBoolean( | 302 boolean disableBuiltInAEC = sharedPref.getBoolean( |
299 keyprefDisableBuiltInAec, | 303 keyprefDisableBuiltInAec, |
300 Boolean.valueOf(getString(R.string.pref_disable_built_in_aec_default))); | 304 Boolean.valueOf(getString(R.string.pref_disable_built_in_aec_default))); |
301 | 305 |
| 306 // Check Disable built-in AGC flag. |
| 307 boolean disableBuiltInAGC = sharedPref.getBoolean( |
| 308 keyprefDisableBuiltInAgc, |
| 309 Boolean.valueOf(getString(R.string.pref_disable_built_in_agc_default))); |
| 310 |
| 311 // Check Disable built-in NS flag. |
| 312 boolean disableBuiltInNS = sharedPref.getBoolean( |
| 313 keyprefDisableBuiltInNs, |
| 314 Boolean.valueOf(getString(R.string.pref_disable_built_in_ns_default))); |
| 315 |
302 // Get video resolution from settings. | 316 // Get video resolution from settings. |
303 int videoWidth = 0; | 317 int videoWidth = 0; |
304 int videoHeight = 0; | 318 int videoHeight = 0; |
305 String resolution = sharedPref.getString(keyprefResolution, | 319 String resolution = sharedPref.getString(keyprefResolution, |
306 getString(R.string.pref_resolution_default)); | 320 getString(R.string.pref_resolution_default)); |
307 String[] dimensions = resolution.split("[ x]+"); | 321 String[] dimensions = resolution.split("[ x]+"); |
308 if (dimensions.length == 2) { | 322 if (dimensions.length == 2) { |
309 try { | 323 try { |
310 videoWidth = Integer.parseInt(dimensions[0]); | 324 videoWidth = Integer.parseInt(dimensions[0]); |
311 videoHeight = Integer.parseInt(dimensions[1]); | 325 videoHeight = Integer.parseInt(dimensions[1]); |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 captureQualitySlider); | 392 captureQualitySlider); |
379 intent.putExtra(CallActivity.EXTRA_VIDEO_BITRATE, videoStartBitrate); | 393 intent.putExtra(CallActivity.EXTRA_VIDEO_BITRATE, videoStartBitrate); |
380 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec); | 394 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec); |
381 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); | 395 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); |
382 intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, captureToText
ure); | 396 intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, captureToText
ure); |
383 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, | 397 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, |
384 noAudioProcessing); | 398 noAudioProcessing); |
385 intent.putExtra(CallActivity.EXTRA_AECDUMP_ENABLED, aecDump); | 399 intent.putExtra(CallActivity.EXTRA_AECDUMP_ENABLED, aecDump); |
386 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES); | 400 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES); |
387 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AEC, disableBuiltInAEC
); | 401 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AEC, disableBuiltInAEC
); |
| 402 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AGC, disableBuiltInAGC
); |
| 403 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_NS, disableBuiltInNS); |
388 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); | 404 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); |
389 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); | 405 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); |
390 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); | 406 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); |
391 intent.putExtra(CallActivity.EXTRA_TRACING, tracing); | 407 intent.putExtra(CallActivity.EXTRA_TRACING, tracing); |
392 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun); | 408 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun); |
393 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs); | 409 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs); |
394 | 410 |
395 startActivityForResult(intent, CONNECTION_REQUEST); | 411 startActivityForResult(intent, CONNECTION_REQUEST); |
396 } | 412 } |
397 } | 413 } |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
433 } | 449 } |
434 }; | 450 }; |
435 | 451 |
436 private final OnClickListener connectListener = new OnClickListener() { | 452 private final OnClickListener connectListener = new OnClickListener() { |
437 @Override | 453 @Override |
438 public void onClick(View view) { | 454 public void onClick(View view) { |
439 connectToRoom(roomEditText.getText().toString(), false, false, 0); | 455 connectToRoom(roomEditText.getText().toString(), false, false, 0); |
440 } | 456 } |
441 }; | 457 }; |
442 } | 458 } |
OLD | NEW |