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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 // If capturing format is not specified for screencapture, use screen resolu
tion. | 273 // If capturing format is not specified for screencapture, use screen resolu
tion. |
274 if (screencaptureEnabled && videoWidth == 0 && videoHeight == 0) { | 274 if (screencaptureEnabled && videoWidth == 0 && videoHeight == 0) { |
275 DisplayMetrics displayMetrics = new DisplayMetrics(); | 275 DisplayMetrics displayMetrics = new DisplayMetrics(); |
276 WindowManager windowManager = | 276 WindowManager windowManager = |
277 (WindowManager) getApplication().getSystemService(Context.WINDOW_SERVI
CE); | 277 (WindowManager) getApplication().getSystemService(Context.WINDOW_SERVI
CE); |
278 windowManager.getDefaultDisplay().getRealMetrics(displayMetrics); | 278 windowManager.getDefaultDisplay().getRealMetrics(displayMetrics); |
279 videoWidth = displayMetrics.widthPixels; | 279 videoWidth = displayMetrics.widthPixels; |
280 videoHeight = displayMetrics.heightPixels; | 280 videoHeight = displayMetrics.heightPixels; |
281 } | 281 } |
282 DataChannelParameters dataChannelParameters = null; | 282 DataChannelParameters dataChannelParameters = null; |
283 if (intent.getBooleanExtra(EXTRA_DATA_CHANNEL_ENABLED, true)) { | 283 if (intent.getBooleanExtra(EXTRA_DATA_CHANNEL_ENABLED, false)) { |
284 dataChannelParameters = new DataChannelParameters(intent.getBooleanExtra(E
XTRA_ORDERED, true), | 284 dataChannelParameters = new DataChannelParameters(intent.getBooleanExtra(E
XTRA_ORDERED, true), |
285 intent.getIntExtra(EXTRA_MAX_RETRANSMITS_MS, -1), | 285 intent.getIntExtra(EXTRA_MAX_RETRANSMITS_MS, -1), |
286 intent.getIntExtra(EXTRA_MAX_RETRANSMITS, -1), intent.getStringExtra(E
XTRA_PROTOCOL), | 286 intent.getIntExtra(EXTRA_MAX_RETRANSMITS, -1), intent.getStringExtra(E
XTRA_PROTOCOL), |
287 intent.getBooleanExtra(EXTRA_NEGOTIATED, false), intent.getIntExtra(EX
TRA_ID, -1)); | 287 intent.getBooleanExtra(EXTRA_NEGOTIATED, false), intent.getIntExtra(EX
TRA_ID, -1)); |
288 } | 288 } |
289 peerConnectionParameters = | 289 peerConnectionParameters = |
290 new PeerConnectionParameters(intent.getBooleanExtra(EXTRA_VIDEO_CALL, tr
ue), loopback, | 290 new PeerConnectionParameters(intent.getBooleanExtra(EXTRA_VIDEO_CALL, tr
ue), loopback, |
291 tracing, videoWidth, videoHeight, intent.getIntExtra(EXTRA_VIDEO_FPS
, 0), | 291 tracing, videoWidth, videoHeight, intent.getIntExtra(EXTRA_VIDEO_FPS
, 0), |
292 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), intent.getStringExtra(EX
TRA_VIDEOCODEC), | 292 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), intent.getStringExtra(EX
TRA_VIDEOCODEC), |
293 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), | 293 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), |
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
889 } | 889 } |
890 } | 890 } |
891 }); | 891 }); |
892 } | 892 } |
893 | 893 |
894 @Override | 894 @Override |
895 public void onPeerConnectionError(final String description) { | 895 public void onPeerConnectionError(final String description) { |
896 reportError(description); | 896 reportError(description); |
897 } | 897 } |
898 } | 898 } |
OLD | NEW |