Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1302)

Side by Side Diff: webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h

Issue 2513063003: Add the OnAddTrack callback for Objective-C wrapper.
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 PeerConnectionInterface::IceConnectionState new_state) override; 42 PeerConnectionInterface::IceConnectionState new_state) override;
43 43
44 void OnIceGatheringChange( 44 void OnIceGatheringChange(
45 PeerConnectionInterface::IceGatheringState new_state) override; 45 PeerConnectionInterface::IceGatheringState new_state) override;
46 46
47 void OnIceCandidate(const IceCandidateInterface *candidate) override; 47 void OnIceCandidate(const IceCandidateInterface *candidate) override;
48 48
49 void OnIceCandidatesRemoved( 49 void OnIceCandidatesRemoved(
50 const std::vector<cricket::Candidate>& candidates) override; 50 const std::vector<cricket::Candidate>& candidates) override;
51 51
52 void OnAddTrack(
tkchin_webrtc 2016/11/22 20:41:34 what is the distinction between track and receiver
Zhi Huang 2016/11/22 23:38:42 There is one track attached to one RtpReceiver. A
53 rtc::scoped_refptr<RtpReceiverInterface> receiver,
54 std::vector<rtc::scoped_refptr<MediaStreamInterface>> streams) override;
55
52 private: 56 private:
53 __weak RTCPeerConnection *peer_connection_; 57 RTCMediaStream* GetOrCreateObjcStream(
58 rtc::scoped_refptr<MediaStreamInterface> stream);
59
60 __weak RTCPeerConnection* peer_connection_;
61 NSMutableDictionary* nativeToObjcMediaStream_ =
62 [NSMutableDictionary dictionary];
tkchin_webrtc 2016/11/22 20:41:34 Shouldn't this be initialized in ctor?
Zhi Huang 2016/11/22 23:38:42 Done.
54 }; 63 };
55 64
56 } // namespace webrtc 65 } // namespace webrtc
57 66
58 67
59 @interface RTCPeerConnection () 68 @interface RTCPeerConnection ()
60 69
61 /** The native PeerConnectionInterface created during construction. */ 70 /** The native PeerConnectionInterface created during construction. */
62 @property(nonatomic, readonly) 71 @property(nonatomic, readonly)
63 rtc::scoped_refptr<webrtc::PeerConnectionInterface> nativePeerConnection; 72 rtc::scoped_refptr<webrtc::PeerConnectionInterface> nativePeerConnection;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 (webrtc::PeerConnectionInterface::IceGatheringState)nativeState; 107 (webrtc::PeerConnectionInterface::IceGatheringState)nativeState;
99 108
100 + (NSString *)stringForIceGatheringState:(RTCIceGatheringState)state; 109 + (NSString *)stringForIceGatheringState:(RTCIceGatheringState)state;
101 110
102 + (webrtc::PeerConnectionInterface::StatsOutputLevel) 111 + (webrtc::PeerConnectionInterface::StatsOutputLevel)
103 nativeStatsOutputLevelForLevel:(RTCStatsOutputLevel)level; 112 nativeStatsOutputLevelForLevel:(RTCStatsOutputLevel)level;
104 113
105 @end 114 @end
106 115
107 NS_ASSUME_NONNULL_END 116 NS_ASSUME_NONNULL_END
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698