| 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 super.onCreate(savedInstanceState); | 87 super.onCreate(savedInstanceState); |
| 88 | 88 |
| 89 // Get setting keys. | 89 // Get setting keys. |
| 90 PreferenceManager.setDefaultValues(this, R.xml.preferences, false); | 90 PreferenceManager.setDefaultValues(this, R.xml.preferences, false); |
| 91 sharedPref = PreferenceManager.getDefaultSharedPreferences(this); | 91 sharedPref = PreferenceManager.getDefaultSharedPreferences(this); |
| 92 keyprefVideoCallEnabled = getString(R.string.pref_videocall_key); | 92 keyprefVideoCallEnabled = getString(R.string.pref_videocall_key); |
| 93 keyprefCamera2 = getString(R.string.pref_camera2_key); | 93 keyprefCamera2 = getString(R.string.pref_camera2_key); |
| 94 keyprefResolution = getString(R.string.pref_resolution_key); | 94 keyprefResolution = getString(R.string.pref_resolution_key); |
| 95 keyprefFps = getString(R.string.pref_fps_key); | 95 keyprefFps = getString(R.string.pref_fps_key); |
| 96 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k
ey); | 96 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k
ey); |
| 97 keyprefVideoBitrateType = getString(R.string.pref_startvideobitrate_key); | 97 keyprefVideoBitrateType = getString(R.string.pref_maxvideobitrate_key); |
| 98 keyprefVideoBitrateValue = getString(R.string.pref_startvideobitratevalue_ke
y); | 98 keyprefVideoBitrateValue = getString(R.string.pref_maxvideobitratevalue_key)
; |
| 99 keyprefVideoCodec = getString(R.string.pref_videocodec_key); | 99 keyprefVideoCodec = getString(R.string.pref_videocodec_key); |
| 100 keyprefHwCodecAcceleration = getString(R.string.pref_hwcodec_key); | 100 keyprefHwCodecAcceleration = getString(R.string.pref_hwcodec_key); |
| 101 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key); | 101 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key); |
| 102 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); | 102 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); |
| 103 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke
y); | 103 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke
y); |
| 104 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); | 104 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); |
| 105 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing
_key); | 105 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing
_key); |
| 106 keyprefAecDump = getString(R.string.pref_aecdump_key); | 106 keyprefAecDump = getString(R.string.pref_aecdump_key); |
| 107 keyprefOpenSLES = getString(R.string.pref_opensles_key); | 107 keyprefOpenSLES = getString(R.string.pref_opensles_key); |
| 108 keyprefDisableBuiltInAec = getString(R.string.pref_disable_built_in_aec_key)
; | 108 keyprefDisableBuiltInAec = getString(R.string.pref_disable_built_in_aec_key)
; |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 } | 350 } |
| 351 } | 351 } |
| 352 | 352 |
| 353 // Check capture quality slider flag. | 353 // Check capture quality slider flag. |
| 354 boolean captureQualitySlider = sharedPref.getBoolean(keyprefCaptureQualitySl
ider, | 354 boolean captureQualitySlider = sharedPref.getBoolean(keyprefCaptureQualitySl
ider, |
| 355 Boolean.valueOf(getString(R.string.pref_capturequalityslider_default))); | 355 Boolean.valueOf(getString(R.string.pref_capturequalityslider_default))); |
| 356 | 356 |
| 357 // Get video and audio start bitrate. | 357 // Get video and audio start bitrate. |
| 358 int videoStartBitrate = 0; | 358 int videoStartBitrate = 0; |
| 359 String bitrateTypeDefault = getString( | 359 String bitrateTypeDefault = getString( |
| 360 R.string.pref_startvideobitrate_default); | 360 R.string.pref_maxvideobitrate_default); |
| 361 String bitrateType = sharedPref.getString( | 361 String bitrateType = sharedPref.getString( |
| 362 keyprefVideoBitrateType, bitrateTypeDefault); | 362 keyprefVideoBitrateType, bitrateTypeDefault); |
| 363 if (!bitrateType.equals(bitrateTypeDefault)) { | 363 if (!bitrateType.equals(bitrateTypeDefault)) { |
| 364 String bitrateValue = sharedPref.getString(keyprefVideoBitrateValue, | 364 String bitrateValue = sharedPref.getString(keyprefVideoBitrateValue, |
| 365 getString(R.string.pref_startvideobitratevalue_default)); | 365 getString(R.string.pref_maxvideobitratevalue_default)); |
| 366 videoStartBitrate = Integer.parseInt(bitrateValue); | 366 videoStartBitrate = Integer.parseInt(bitrateValue); |
| 367 } | 367 } |
| 368 int audioStartBitrate = 0; | 368 int audioStartBitrate = 0; |
| 369 bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_default); | 369 bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_default); |
| 370 bitrateType = sharedPref.getString( | 370 bitrateType = sharedPref.getString( |
| 371 keyprefAudioBitrateType, bitrateTypeDefault); | 371 keyprefAudioBitrateType, bitrateTypeDefault); |
| 372 if (!bitrateType.equals(bitrateTypeDefault)) { | 372 if (!bitrateType.equals(bitrateTypeDefault)) { |
| 373 String bitrateValue = sharedPref.getString(keyprefAudioBitrateValue, | 373 String bitrateValue = sharedPref.getString(keyprefAudioBitrateValue, |
| 374 getString(R.string.pref_startaudiobitratevalue_default)); | 374 getString(R.string.pref_startaudiobitratevalue_default)); |
| 375 audioStartBitrate = Integer.parseInt(bitrateValue); | 375 audioStartBitrate = Integer.parseInt(bitrateValue); |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 } | 457 } |
| 458 }; | 458 }; |
| 459 | 459 |
| 460 private final OnClickListener connectListener = new OnClickListener() { | 460 private final OnClickListener connectListener = new OnClickListener() { |
| 461 @Override | 461 @Override |
| 462 public void onClick(View view) { | 462 public void onClick(View view) { |
| 463 connectToRoom(roomEditText.getText().toString(), false, false, 0); | 463 connectToRoom(roomEditText.getText().toString(), false, false, 0); |
| 464 } | 464 } |
| 465 }; | 465 }; |
| 466 } | 466 } |
| OLD | NEW |