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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 private String keyprefFps; | 59 private String keyprefFps; |
60 private String keyprefCaptureQualitySlider; | 60 private String keyprefCaptureQualitySlider; |
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 keyprefCaptureToTexture; | 68 private String keyprefCaptureToTexture; |
| 69 private String keyprefFlexfec; |
69 private String keyprefNoAudioProcessingPipeline; | 70 private String keyprefNoAudioProcessingPipeline; |
70 private String keyprefAecDump; | 71 private String keyprefAecDump; |
71 private String keyprefOpenSLES; | 72 private String keyprefOpenSLES; |
72 private String keyprefDisableBuiltInAec; | 73 private String keyprefDisableBuiltInAec; |
73 private String keyprefDisableBuiltInAgc; | 74 private String keyprefDisableBuiltInAgc; |
74 private String keyprefDisableBuiltInNs; | 75 private String keyprefDisableBuiltInNs; |
75 private String keyprefEnableLevelControl; | 76 private String keyprefEnableLevelControl; |
76 private String keyprefDisplayHud; | 77 private String keyprefDisplayHud; |
77 private String keyprefTracing; | 78 private String keyprefTracing; |
78 private String keyprefRoomServerUrl; | 79 private String keyprefRoomServerUrl; |
(...skipping 20 matching lines...) Expand all Loading... |
99 keyprefScreencapture = getString(R.string.pref_screencapture_key); | 100 keyprefScreencapture = getString(R.string.pref_screencapture_key); |
100 keyprefCamera2 = getString(R.string.pref_camera2_key); | 101 keyprefCamera2 = getString(R.string.pref_camera2_key); |
101 keyprefResolution = getString(R.string.pref_resolution_key); | 102 keyprefResolution = getString(R.string.pref_resolution_key); |
102 keyprefFps = getString(R.string.pref_fps_key); | 103 keyprefFps = getString(R.string.pref_fps_key); |
103 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k
ey); | 104 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k
ey); |
104 keyprefVideoBitrateType = getString(R.string.pref_maxvideobitrate_key); | 105 keyprefVideoBitrateType = getString(R.string.pref_maxvideobitrate_key); |
105 keyprefVideoBitrateValue = getString(R.string.pref_maxvideobitratevalue_key)
; | 106 keyprefVideoBitrateValue = getString(R.string.pref_maxvideobitratevalue_key)
; |
106 keyprefVideoCodec = getString(R.string.pref_videocodec_key); | 107 keyprefVideoCodec = getString(R.string.pref_videocodec_key); |
107 keyprefHwCodecAcceleration = getString(R.string.pref_hwcodec_key); | 108 keyprefHwCodecAcceleration = getString(R.string.pref_hwcodec_key); |
108 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key); | 109 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key); |
| 110 keyprefFlexfec = getString(R.string.pref_flexfec_key); |
109 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); | 111 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); |
110 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke
y); | 112 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke
y); |
111 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); | 113 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); |
112 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing
_key); | 114 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing
_key); |
113 keyprefAecDump = getString(R.string.pref_aecdump_key); | 115 keyprefAecDump = getString(R.string.pref_aecdump_key); |
114 keyprefOpenSLES = getString(R.string.pref_opensles_key); | 116 keyprefOpenSLES = getString(R.string.pref_opensles_key); |
115 keyprefDisableBuiltInAec = getString(R.string.pref_disable_built_in_aec_key)
; | 117 keyprefDisableBuiltInAec = getString(R.string.pref_disable_built_in_aec_key)
; |
116 keyprefDisableBuiltInAgc = getString(R.string.pref_disable_built_in_agc_key)
; | 118 keyprefDisableBuiltInAgc = getString(R.string.pref_disable_built_in_agc_key)
; |
117 keyprefDisableBuiltInNs = getString(R.string.pref_disable_built_in_ns_key); | 119 keyprefDisableBuiltInNs = getString(R.string.pref_disable_built_in_ns_key); |
118 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key
); | 120 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key
); |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 | 349 |
348 // Check HW codec flag. | 350 // Check HW codec flag. |
349 boolean hwCodec = sharedPrefGetBoolean(R.string.pref_hwcodec_key, | 351 boolean hwCodec = sharedPrefGetBoolean(R.string.pref_hwcodec_key, |
350 CallActivity.EXTRA_HWCODEC_ENABLED, R.string.pref_hwcodec_default, useVa
luesFromIntent); | 352 CallActivity.EXTRA_HWCODEC_ENABLED, R.string.pref_hwcodec_default, useVa
luesFromIntent); |
351 | 353 |
352 // Check Capture to texture. | 354 // Check Capture to texture. |
353 boolean captureToTexture = sharedPrefGetBoolean(R.string.pref_capturetotextu
re_key, | 355 boolean captureToTexture = sharedPrefGetBoolean(R.string.pref_capturetotextu
re_key, |
354 CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, R.string.pref_capturetotext
ure_default, | 356 CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, R.string.pref_capturetotext
ure_default, |
355 useValuesFromIntent); | 357 useValuesFromIntent); |
356 | 358 |
| 359 // Check FlexFEC. |
| 360 boolean flexfecEnabled = sharedPrefGetBoolean(R.string.pref_flexfec_key, |
| 361 CallActivity.EXTRA_FLEXFEC_ENABLED, R.string.pref_flexfec_default, useVa
luesFromIntent); |
| 362 |
357 // Check Disable Audio Processing flag. | 363 // Check Disable Audio Processing flag. |
358 boolean noAudioProcessing = sharedPrefGetBoolean(R.string.pref_noaudioproces
sing_key, | 364 boolean noAudioProcessing = sharedPrefGetBoolean(R.string.pref_noaudioproces
sing_key, |
359 CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, R.string.pref_noaudioproce
ssing_default, | 365 CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, R.string.pref_noaudioproce
ssing_default, |
360 useValuesFromIntent); | 366 useValuesFromIntent); |
361 | 367 |
362 // Check Disable Audio Processing flag. | 368 // Check Disable Audio Processing flag. |
363 boolean aecDump = sharedPrefGetBoolean(R.string.pref_aecdump_key, | 369 boolean aecDump = sharedPrefGetBoolean(R.string.pref_aecdump_key, |
364 CallActivity.EXTRA_AECDUMP_ENABLED, R.string.pref_aecdump_default, useVa
luesFromIntent); | 370 CallActivity.EXTRA_AECDUMP_ENABLED, R.string.pref_aecdump_default, useVa
luesFromIntent); |
365 | 371 |
366 // Check OpenSL ES enabled flag. | 372 // Check OpenSL ES enabled flag. |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
500 intent.putExtra(CallActivity.EXTRA_SCREENCAPTURE, useScreencapture); | 506 intent.putExtra(CallActivity.EXTRA_SCREENCAPTURE, useScreencapture); |
501 intent.putExtra(CallActivity.EXTRA_CAMERA2, useCamera2); | 507 intent.putExtra(CallActivity.EXTRA_CAMERA2, useCamera2); |
502 intent.putExtra(CallActivity.EXTRA_VIDEO_WIDTH, videoWidth); | 508 intent.putExtra(CallActivity.EXTRA_VIDEO_WIDTH, videoWidth); |
503 intent.putExtra(CallActivity.EXTRA_VIDEO_HEIGHT, videoHeight); | 509 intent.putExtra(CallActivity.EXTRA_VIDEO_HEIGHT, videoHeight); |
504 intent.putExtra(CallActivity.EXTRA_VIDEO_FPS, cameraFps); | 510 intent.putExtra(CallActivity.EXTRA_VIDEO_FPS, cameraFps); |
505 intent.putExtra(CallActivity.EXTRA_VIDEO_CAPTUREQUALITYSLIDER_ENABLED, cap
tureQualitySlider); | 511 intent.putExtra(CallActivity.EXTRA_VIDEO_CAPTUREQUALITYSLIDER_ENABLED, cap
tureQualitySlider); |
506 intent.putExtra(CallActivity.EXTRA_VIDEO_BITRATE, videoStartBitrate); | 512 intent.putExtra(CallActivity.EXTRA_VIDEO_BITRATE, videoStartBitrate); |
507 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec); | 513 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec); |
508 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); | 514 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); |
509 intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, captureToText
ure); | 515 intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, captureToText
ure); |
| 516 intent.putExtra(CallActivity.EXTRA_FLEXFEC_ENABLED, flexfecEnabled); |
510 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, noAudioProce
ssing); | 517 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, noAudioProce
ssing); |
511 intent.putExtra(CallActivity.EXTRA_AECDUMP_ENABLED, aecDump); | 518 intent.putExtra(CallActivity.EXTRA_AECDUMP_ENABLED, aecDump); |
512 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES); | 519 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES); |
513 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AEC, disableBuiltInAEC
); | 520 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AEC, disableBuiltInAEC
); |
514 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AGC, disableBuiltInAGC
); | 521 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AGC, disableBuiltInAGC
); |
515 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_NS, disableBuiltInNS); | 522 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_NS, disableBuiltInNS); |
516 intent.putExtra(CallActivity.EXTRA_ENABLE_LEVEL_CONTROL, enableLevelContro
l); | 523 intent.putExtra(CallActivity.EXTRA_ENABLE_LEVEL_CONTROL, enableLevelContro
l); |
517 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); | 524 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); |
518 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); | 525 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); |
519 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); | 526 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
602 } | 609 } |
603 }; | 610 }; |
604 | 611 |
605 private final OnClickListener connectListener = new OnClickListener() { | 612 private final OnClickListener connectListener = new OnClickListener() { |
606 @Override | 613 @Override |
607 public void onClick(View view) { | 614 public void onClick(View view) { |
608 connectToRoom(roomEditText.getText().toString(), false, false, false, 0); | 615 connectToRoom(roomEditText.getText().toString(), false, false, false, 0); |
609 } | 616 } |
610 }; | 617 }; |
611 } | 618 } |
OLD | NEW |