OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2013 Google Inc. | 3 * Copyright 2013 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 #import "RTCPeerConnection+Internal.h" | 43 #import "RTCPeerConnection+Internal.h" |
44 #import "RTCPeerConnectionDelegate.h" | 44 #import "RTCPeerConnectionDelegate.h" |
45 #import "RTCPeerConnectionInterface+Internal.h" | 45 #import "RTCPeerConnectionInterface+Internal.h" |
46 #import "RTCVideoCapturer+Internal.h" | 46 #import "RTCVideoCapturer+Internal.h" |
47 #import "RTCVideoSource+Internal.h" | 47 #import "RTCVideoSource+Internal.h" |
48 #import "RTCVideoTrack+Internal.h" | 48 #import "RTCVideoTrack+Internal.h" |
49 | 49 |
50 #include "webrtc/api/audiotrack.h" | 50 #include "webrtc/api/audiotrack.h" |
51 #include "webrtc/api/mediastreaminterface.h" | 51 #include "webrtc/api/mediastreaminterface.h" |
52 #include "webrtc/api/peerconnectioninterface.h" | 52 #include "webrtc/api/peerconnectioninterface.h" |
53 #include "webrtc/api/videosourceinterface.h" | |
54 #include "webrtc/api/videotrack.h" | 53 #include "webrtc/api/videotrack.h" |
55 #include "webrtc/base/logging.h" | 54 #include "webrtc/base/logging.h" |
56 #include "webrtc/base/ssladapter.h" | 55 #include "webrtc/base/ssladapter.h" |
57 | 56 |
58 @implementation RTCPeerConnectionFactory { | 57 @implementation RTCPeerConnectionFactory { |
59 std::unique_ptr<rtc::Thread> _signalingThread; | 58 std::unique_ptr<rtc::Thread> _signalingThread; |
60 std::unique_ptr<rtc::Thread> _workerThread; | 59 std::unique_ptr<rtc::Thread> _workerThread; |
61 } | 60 } |
62 | 61 |
63 @synthesize nativeFactory = _nativeFactory; | 62 @synthesize nativeFactory = _nativeFactory; |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 return [[RTCVideoTrack alloc] initWithMediaTrack:track]; | 138 return [[RTCVideoTrack alloc] initWithMediaTrack:track]; |
140 } | 139 } |
141 | 140 |
142 - (RTCAudioTrack*)audioTrackWithID:(NSString*)audioId { | 141 - (RTCAudioTrack*)audioTrackWithID:(NSString*)audioId { |
143 rtc::scoped_refptr<webrtc::AudioTrackInterface> track = | 142 rtc::scoped_refptr<webrtc::AudioTrackInterface> track = |
144 self.nativeFactory->CreateAudioTrack([audioId UTF8String], NULL); | 143 self.nativeFactory->CreateAudioTrack([audioId UTF8String], NULL); |
145 return [[RTCAudioTrack alloc] initWithMediaTrack:track]; | 144 return [[RTCAudioTrack alloc] initWithMediaTrack:track]; |
146 } | 145 } |
147 | 146 |
148 @end | 147 @end |
OLD | NEW |