| 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 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 rtcConfig.keyType = PeerConnection.KeyType.ECDSA; | 483 rtcConfig.keyType = PeerConnection.KeyType.ECDSA; |
| 484 | 484 |
| 485 peerConnection = factory.createPeerConnection( | 485 peerConnection = factory.createPeerConnection( |
| 486 rtcConfig, pcConstraints, pcObserver); | 486 rtcConfig, pcConstraints, pcObserver); |
| 487 isInitiator = false; | 487 isInitiator = false; |
| 488 | 488 |
| 489 // Set default WebRTC tracing and INFO libjingle logging. | 489 // Set default WebRTC tracing and INFO libjingle logging. |
| 490 // NOTE: this _must_ happen while |factory| is alive! | 490 // NOTE: this _must_ happen while |factory| is alive! |
| 491 Logging.enableTracing( | 491 Logging.enableTracing( |
| 492 "logcat:", | 492 "logcat:", |
| 493 EnumSet.of(Logging.TraceLevel.TRACE_DEFAULT), | 493 EnumSet.of(Logging.TraceLevel.TRACE_DEFAULT)); |
| 494 Logging.Severity.LS_INFO); | 494 Logging.enableLogToDebugOutput(Logging.Severity.LS_INFO); |
| 495 | 495 |
| 496 mediaStream = factory.createLocalMediaStream("ARDAMS"); | 496 mediaStream = factory.createLocalMediaStream("ARDAMS"); |
| 497 if (videoCallEnabled) { | 497 if (videoCallEnabled) { |
| 498 String cameraDeviceName = CameraEnumerationAndroid.getDeviceName(0); | 498 String cameraDeviceName = CameraEnumerationAndroid.getDeviceName(0); |
| 499 String frontCameraDeviceName = | 499 String frontCameraDeviceName = |
| 500 CameraEnumerationAndroid.getNameOfFrontFacingDevice(); | 500 CameraEnumerationAndroid.getNameOfFrontFacingDevice(); |
| 501 if (numberOfCameras > 1 && frontCameraDeviceName != null) { | 501 if (numberOfCameras > 1 && frontCameraDeviceName != null) { |
| 502 cameraDeviceName = frontCameraDeviceName; | 502 cameraDeviceName = frontCameraDeviceName; |
| 503 } | 503 } |
| 504 Log.d(TAG, "Opening camera: " + cameraDeviceName); | 504 Log.d(TAG, "Opening camera: " + cameraDeviceName); |
| (...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1142 public void onCreateFailure(final String error) { | 1142 public void onCreateFailure(final String error) { |
| 1143 reportError("createSDP error: " + error); | 1143 reportError("createSDP error: " + error); |
| 1144 } | 1144 } |
| 1145 | 1145 |
| 1146 @Override | 1146 @Override |
| 1147 public void onSetFailure(final String error) { | 1147 public void onSetFailure(final String error) { |
| 1148 reportError("setSDP error: " + error); | 1148 reportError("setSDP error: " + error); |
| 1149 } | 1149 } |
| 1150 } | 1150 } |
| 1151 } | 1151 } |
| OLD | NEW |