| 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 |
| 11 #import "ARDAppClient+Internal.h" | 11 #import "ARDAppClient+Internal.h" |
| 12 | 12 |
| 13 #import "WebRTC/RTCAVFoundationVideoSource.h" |
| 13 #if defined(WEBRTC_IOS) | 14 #if defined(WEBRTC_IOS) |
| 14 #import "WebRTC/RTCAVFoundationVideoSource.h" | 15 #import "WebRTC/RTCTracing.h" |
| 15 #endif | 16 #endif |
| 16 #import "WebRTC/RTCAudioTrack.h" | 17 #import "WebRTC/RTCAudioTrack.h" |
| 17 #import "WebRTC/RTCConfiguration.h" | 18 #import "WebRTC/RTCConfiguration.h" |
| 18 #import "WebRTC/RTCFileLogger.h" | 19 #import "WebRTC/RTCFileLogger.h" |
| 19 #import "WebRTC/RTCIceServer.h" | 20 #import "WebRTC/RTCIceServer.h" |
| 20 #import "WebRTC/RTCLogging.h" | 21 #import "WebRTC/RTCLogging.h" |
| 21 #import "WebRTC/RTCMediaConstraints.h" | 22 #import "WebRTC/RTCMediaConstraints.h" |
| 22 #import "WebRTC/RTCMediaStream.h" | 23 #import "WebRTC/RTCMediaStream.h" |
| 23 #import "WebRTC/RTCPeerConnectionFactory.h" | 24 #import "WebRTC/RTCPeerConnectionFactory.h" |
| 24 #import "WebRTC/RTCRtpSender.h" | 25 #import "WebRTC/RTCRtpSender.h" |
| (...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 672 return sender; | 673 return sender; |
| 673 } | 674 } |
| 674 | 675 |
| 675 - (RTCVideoTrack *)createLocalVideoTrack { | 676 - (RTCVideoTrack *)createLocalVideoTrack { |
| 676 RTCVideoTrack* localVideoTrack = nil; | 677 RTCVideoTrack* localVideoTrack = nil; |
| 677 // The iOS simulator doesn't provide any sort of camera capture | 678 // The iOS simulator doesn't provide any sort of camera capture |
| 678 // support or emulation (http://goo.gl/rHAnC1) so don't bother | 679 // support or emulation (http://goo.gl/rHAnC1) so don't bother |
| 679 // trying to open a local stream. | 680 // trying to open a local stream. |
| 680 // TODO(tkchin): local video capture for OSX. See | 681 // TODO(tkchin): local video capture for OSX. See |
| 681 // https://code.google.com/p/webrtc/issues/detail?id=3417. | 682 // https://code.google.com/p/webrtc/issues/detail?id=3417. |
| 682 #if !TARGET_IPHONE_SIMULATOR && TARGET_OS_IPHONE | 683 #if !TARGET_IPHONE_SIMULATOR |
| 683 if (!_isAudioOnly) { | 684 if (!_isAudioOnly) { |
| 684 RTCMediaConstraints *mediaConstraints = | 685 RTCMediaConstraints *mediaConstraints = |
| 685 [self defaultMediaStreamConstraints]; | 686 [self defaultMediaStreamConstraints]; |
| 686 RTCAVFoundationVideoSource *source = | 687 RTCAVFoundationVideoSource *source = |
| 687 [_factory avFoundationVideoSourceWithConstraints:mediaConstraints]; | 688 [_factory avFoundationVideoSourceWithConstraints:mediaConstraints]; |
| 688 localVideoTrack = | 689 localVideoTrack = |
| 689 [_factory videoTrackWithSource:source | 690 [_factory videoTrackWithSource:source |
| 690 trackId:kARDVideoTrackId]; | 691 trackId:kARDVideoTrackId]; |
| 691 } | 692 } |
| 692 #endif | 693 #endif |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 813 code:kARDAppClientErrorInvalidRoom | 814 code:kARDAppClientErrorInvalidRoom |
| 814 userInfo:@{ | 815 userInfo:@{ |
| 815 NSLocalizedDescriptionKey: @"Invalid room.", | 816 NSLocalizedDescriptionKey: @"Invalid room.", |
| 816 }]; | 817 }]; |
| 817 break; | 818 break; |
| 818 } | 819 } |
| 819 return error; | 820 return error; |
| 820 } | 821 } |
| 821 | 822 |
| 822 @end | 823 @end |
| OLD | NEW |