| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2015 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 public static final String EXTRA_AUDIO_BITRATE = | 71 public static final String EXTRA_AUDIO_BITRATE = |
| 72 "org.appspot.apprtc.AUDIO_BITRATE"; | 72 "org.appspot.apprtc.AUDIO_BITRATE"; |
| 73 public static final String EXTRA_AUDIOCODEC = | 73 public static final String EXTRA_AUDIOCODEC = |
| 74 "org.appspot.apprtc.AUDIOCODEC"; | 74 "org.appspot.apprtc.AUDIOCODEC"; |
| 75 public static final String EXTRA_NOAUDIOPROCESSING_ENABLED = | 75 public static final String EXTRA_NOAUDIOPROCESSING_ENABLED = |
| 76 "org.appspot.apprtc.NOAUDIOPROCESSING"; | 76 "org.appspot.apprtc.NOAUDIOPROCESSING"; |
| 77 public static final String EXTRA_OPENSLES_ENABLED = | 77 public static final String EXTRA_OPENSLES_ENABLED = |
| 78 "org.appspot.apprtc.OPENSLES"; | 78 "org.appspot.apprtc.OPENSLES"; |
| 79 public static final String EXTRA_DISPLAY_HUD = | 79 public static final String EXTRA_DISPLAY_HUD = |
| 80 "org.appspot.apprtc.DISPLAY_HUD"; | 80 "org.appspot.apprtc.DISPLAY_HUD"; |
| 81 public static final String EXTRA_TRACING = "org.appspot.apprtc.TRACING"; |
| 81 public static final String EXTRA_CMDLINE = | 82 public static final String EXTRA_CMDLINE = |
| 82 "org.appspot.apprtc.CMDLINE"; | 83 "org.appspot.apprtc.CMDLINE"; |
| 83 public static final String EXTRA_RUNTIME = | 84 public static final String EXTRA_RUNTIME = |
| 84 "org.appspot.apprtc.RUNTIME"; | 85 "org.appspot.apprtc.RUNTIME"; |
| 85 private static final String TAG = "CallRTCClient"; | 86 private static final String TAG = "CallRTCClient"; |
| 86 | 87 |
| 87 // List of mandatory application permissions. | 88 // List of mandatory application permissions. |
| 88 private static final String[] MANDATORY_PERMISSIONS = { | 89 private static final String[] MANDATORY_PERMISSIONS = { |
| 89 "android.permission.MODIFY_AUDIO_SETTINGS", | 90 "android.permission.MODIFY_AUDIO_SETTINGS", |
| 90 "android.permission.RECORD_AUDIO", | 91 "android.permission.RECORD_AUDIO", |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 } | 207 } |
| 207 String roomId = intent.getStringExtra(EXTRA_ROOMID); | 208 String roomId = intent.getStringExtra(EXTRA_ROOMID); |
| 208 if (roomId == null || roomId.length() == 0) { | 209 if (roomId == null || roomId.length() == 0) { |
| 209 logAndToast(getString(R.string.missing_url)); | 210 logAndToast(getString(R.string.missing_url)); |
| 210 Log.e(TAG, "Incorrect room ID in intent!"); | 211 Log.e(TAG, "Incorrect room ID in intent!"); |
| 211 setResult(RESULT_CANCELED); | 212 setResult(RESULT_CANCELED); |
| 212 finish(); | 213 finish(); |
| 213 return; | 214 return; |
| 214 } | 215 } |
| 215 boolean loopback = intent.getBooleanExtra(EXTRA_LOOPBACK, false); | 216 boolean loopback = intent.getBooleanExtra(EXTRA_LOOPBACK, false); |
| 217 boolean tracing = intent.getBooleanExtra(EXTRA_TRACING, false); |
| 216 peerConnectionParameters = new PeerConnectionParameters( | 218 peerConnectionParameters = new PeerConnectionParameters( |
| 217 intent.getBooleanExtra(EXTRA_VIDEO_CALL, true), | 219 intent.getBooleanExtra(EXTRA_VIDEO_CALL, true), |
| 218 loopback, | 220 loopback, |
| 221 tracing, |
| 219 intent.getIntExtra(EXTRA_VIDEO_WIDTH, 0), | 222 intent.getIntExtra(EXTRA_VIDEO_WIDTH, 0), |
| 220 intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0), | 223 intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0), |
| 221 intent.getIntExtra(EXTRA_VIDEO_FPS, 0), | 224 intent.getIntExtra(EXTRA_VIDEO_FPS, 0), |
| 222 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), | 225 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), |
| 223 intent.getStringExtra(EXTRA_VIDEOCODEC), | 226 intent.getStringExtra(EXTRA_VIDEOCODEC), |
| 224 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), | 227 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), |
| 225 intent.getBooleanExtra(EXTRA_CAPTURETOTEXTURE_ENABLED, false), | 228 intent.getBooleanExtra(EXTRA_CAPTURETOTEXTURE_ENABLED, false), |
| 226 intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0), | 229 intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0), |
| 227 intent.getStringExtra(EXTRA_AUDIOCODEC), | 230 intent.getStringExtra(EXTRA_AUDIOCODEC), |
| 228 intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false), | 231 intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false), |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 643 } | 646 } |
| 644 } | 647 } |
| 645 }); | 648 }); |
| 646 } | 649 } |
| 647 | 650 |
| 648 @Override | 651 @Override |
| 649 public void onPeerConnectionError(final String description) { | 652 public void onPeerConnectionError(final String description) { |
| 650 reportError(description); | 653 reportError(description); |
| 651 } | 654 } |
| 652 } | 655 } |
| OLD | NEW |