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