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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 private String keyprefHwCodecAcceleration; | 67 private String keyprefHwCodecAcceleration; |
68 private String keyprefCaptureToTexture; | 68 private String keyprefCaptureToTexture; |
69 private String keyprefFlexfec; | 69 private String keyprefFlexfec; |
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; | 74 private String keyprefDisableBuiltInAgc; |
75 private String keyprefDisableBuiltInNs; | 75 private String keyprefDisableBuiltInNs; |
76 private String keyprefEnableLevelControl; | 76 private String keyprefEnableLevelControl; |
| 77 private String keyprefDisableWebRtcAGCAndHPF; |
77 private String keyprefDisplayHud; | 78 private String keyprefDisplayHud; |
78 private String keyprefTracing; | 79 private String keyprefTracing; |
79 private String keyprefRoomServerUrl; | 80 private String keyprefRoomServerUrl; |
80 private String keyprefRoom; | 81 private String keyprefRoom; |
81 private String keyprefRoomList; | 82 private String keyprefRoomList; |
82 private ArrayList<String> roomList; | 83 private ArrayList<String> roomList; |
83 private ArrayAdapter<String> adapter; | 84 private ArrayAdapter<String> adapter; |
84 private String keyprefEnableDataChannel; | 85 private String keyprefEnableDataChannel; |
85 private String keyprefOrdered; | 86 private String keyprefOrdered; |
86 private String keyprefMaxRetransmitTimeMs; | 87 private String keyprefMaxRetransmitTimeMs; |
(...skipping 24 matching lines...) Expand all Loading... |
111 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); | 112 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); |
112 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke
y); | 113 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke
y); |
113 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); | 114 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); |
114 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing
_key); | 115 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing
_key); |
115 keyprefAecDump = getString(R.string.pref_aecdump_key); | 116 keyprefAecDump = getString(R.string.pref_aecdump_key); |
116 keyprefOpenSLES = getString(R.string.pref_opensles_key); | 117 keyprefOpenSLES = getString(R.string.pref_opensles_key); |
117 keyprefDisableBuiltInAec = getString(R.string.pref_disable_built_in_aec_key)
; | 118 keyprefDisableBuiltInAec = getString(R.string.pref_disable_built_in_aec_key)
; |
118 keyprefDisableBuiltInAgc = getString(R.string.pref_disable_built_in_agc_key)
; | 119 keyprefDisableBuiltInAgc = getString(R.string.pref_disable_built_in_agc_key)
; |
119 keyprefDisableBuiltInNs = getString(R.string.pref_disable_built_in_ns_key); | 120 keyprefDisableBuiltInNs = getString(R.string.pref_disable_built_in_ns_key); |
120 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key
); | 121 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key
); |
| 122 keyprefDisableWebRtcAGCAndHPF = getString(R.string.pref_disable_webrtc_agc_a
nd_hpf_key); |
121 keyprefDisplayHud = getString(R.string.pref_displayhud_key); | 123 keyprefDisplayHud = getString(R.string.pref_displayhud_key); |
122 keyprefTracing = getString(R.string.pref_tracing_key); | 124 keyprefTracing = getString(R.string.pref_tracing_key); |
123 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key); | 125 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key); |
124 keyprefRoom = getString(R.string.pref_room_key); | 126 keyprefRoom = getString(R.string.pref_room_key); |
125 keyprefRoomList = getString(R.string.pref_room_list_key); | 127 keyprefRoomList = getString(R.string.pref_room_list_key); |
126 keyprefEnableDataChannel = getString(R.string.pref_enable_datachannel_key); | 128 keyprefEnableDataChannel = getString(R.string.pref_enable_datachannel_key); |
127 keyprefOrdered = getString(R.string.pref_ordered_key); | 129 keyprefOrdered = getString(R.string.pref_ordered_key); |
128 keyprefMaxRetransmitTimeMs = getString(R.string.pref_max_retransmit_time_ms_
key); | 130 keyprefMaxRetransmitTimeMs = getString(R.string.pref_max_retransmit_time_ms_
key); |
129 keyprefMaxRetransmits = getString(R.string.pref_max_retransmits_key); | 131 keyprefMaxRetransmits = getString(R.string.pref_max_retransmits_key); |
130 keyprefDataProtocol = getString(R.string.pref_data_protocol_key); | 132 keyprefDataProtocol = getString(R.string.pref_data_protocol_key); |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
386 // Check Disable built-in NS flag. | 388 // Check Disable built-in NS flag. |
387 boolean disableBuiltInNS = sharedPrefGetBoolean(R.string.pref_disable_built_
in_ns_key, | 389 boolean disableBuiltInNS = sharedPrefGetBoolean(R.string.pref_disable_built_
in_ns_key, |
388 CallActivity.EXTRA_DISABLE_BUILT_IN_NS, R.string.pref_disable_built_in_n
s_default, | 390 CallActivity.EXTRA_DISABLE_BUILT_IN_NS, R.string.pref_disable_built_in_n
s_default, |
389 useValuesFromIntent); | 391 useValuesFromIntent); |
390 | 392 |
391 // Check Enable level control. | 393 // Check Enable level control. |
392 boolean enableLevelControl = sharedPrefGetBoolean(R.string.pref_enable_level
_control_key, | 394 boolean enableLevelControl = sharedPrefGetBoolean(R.string.pref_enable_level
_control_key, |
393 CallActivity.EXTRA_ENABLE_LEVEL_CONTROL, R.string.pref_enable_level_cont
rol_key, | 395 CallActivity.EXTRA_ENABLE_LEVEL_CONTROL, R.string.pref_enable_level_cont
rol_key, |
394 useValuesFromIntent); | 396 useValuesFromIntent); |
395 | 397 |
| 398 // Check Disable gain control |
| 399 boolean disableWebRtcAGCAndHPF = sharedPrefGetBoolean( |
| 400 R.string.pref_disable_webrtc_agc_and_hpf_key, CallActivity.EXTRA_DISABLE
_WEBRTC_AGC_AND_HPF, |
| 401 R.string.pref_disable_webrtc_agc_and_hpf_key, useValuesFromIntent); |
| 402 |
396 // Get video resolution from settings. | 403 // Get video resolution from settings. |
397 int videoWidth = 0; | 404 int videoWidth = 0; |
398 int videoHeight = 0; | 405 int videoHeight = 0; |
399 if (useValuesFromIntent) { | 406 if (useValuesFromIntent) { |
400 videoWidth = getIntent().getIntExtra(CallActivity.EXTRA_VIDEO_WIDTH, 0); | 407 videoWidth = getIntent().getIntExtra(CallActivity.EXTRA_VIDEO_WIDTH, 0); |
401 videoHeight = getIntent().getIntExtra(CallActivity.EXTRA_VIDEO_HEIGHT, 0); | 408 videoHeight = getIntent().getIntExtra(CallActivity.EXTRA_VIDEO_HEIGHT, 0); |
402 } | 409 } |
403 if (videoWidth == 0 && videoHeight == 0) { | 410 if (videoWidth == 0 && videoHeight == 0) { |
404 String resolution = | 411 String resolution = |
405 sharedPref.getString(keyprefResolution, getString(R.string.pref_resolu
tion_default)); | 412 sharedPref.getString(keyprefResolution, getString(R.string.pref_resolu
tion_default)); |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
514 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); | 521 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); |
515 intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, captureToText
ure); | 522 intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, captureToText
ure); |
516 intent.putExtra(CallActivity.EXTRA_FLEXFEC_ENABLED, flexfecEnabled); | 523 intent.putExtra(CallActivity.EXTRA_FLEXFEC_ENABLED, flexfecEnabled); |
517 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, noAudioProce
ssing); | 524 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, noAudioProce
ssing); |
518 intent.putExtra(CallActivity.EXTRA_AECDUMP_ENABLED, aecDump); | 525 intent.putExtra(CallActivity.EXTRA_AECDUMP_ENABLED, aecDump); |
519 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES); | 526 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES); |
520 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AEC, disableBuiltInAEC
); | 527 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AEC, disableBuiltInAEC
); |
521 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AGC, disableBuiltInAGC
); | 528 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AGC, disableBuiltInAGC
); |
522 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_NS, disableBuiltInNS); | 529 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_NS, disableBuiltInNS); |
523 intent.putExtra(CallActivity.EXTRA_ENABLE_LEVEL_CONTROL, enableLevelContro
l); | 530 intent.putExtra(CallActivity.EXTRA_ENABLE_LEVEL_CONTROL, enableLevelContro
l); |
| 531 intent.putExtra(CallActivity.EXTRA_DISABLE_WEBRTC_AGC_AND_HPF, disableWebR
tcAGCAndHPF); |
524 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); | 532 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); |
525 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); | 533 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); |
526 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); | 534 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); |
527 intent.putExtra(CallActivity.EXTRA_TRACING, tracing); | 535 intent.putExtra(CallActivity.EXTRA_TRACING, tracing); |
528 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun); | 536 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun); |
529 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs); | 537 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs); |
530 | 538 |
531 intent.putExtra(CallActivity.EXTRA_DATA_CHANNEL_ENABLED, dataChannelEnable
d); | 539 intent.putExtra(CallActivity.EXTRA_DATA_CHANNEL_ENABLED, dataChannelEnable
d); |
532 | 540 |
533 if (dataChannelEnabled) { | 541 if (dataChannelEnabled) { |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
609 } | 617 } |
610 }; | 618 }; |
611 | 619 |
612 private final OnClickListener connectListener = new OnClickListener() { | 620 private final OnClickListener connectListener = new OnClickListener() { |
613 @Override | 621 @Override |
614 public void onClick(View view) { | 622 public void onClick(View view) { |
615 connectToRoom(roomEditText.getText().toString(), false, false, false, 0); | 623 connectToRoom(roomEditText.getText().toString(), false, false, false, 0); |
616 } | 624 } |
617 }; | 625 }; |
618 } | 626 } |
OLD | NEW |