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

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

Issue 2720753002: Revert of Add the OnAddTrack callback for Objective-C wrapper. (Closed)
Patch Set: Created 3 years, 9 months 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(
53 rtc::scoped_refptr<RtpReceiverInterface> receiver,
54 const std::vector<rtc::scoped_refptr<MediaStreamInterface>>& streams) over ride;
55
56 private: 52 private:
57 __weak RTCPeerConnection* peer_connection_; 53 __weak RTCPeerConnection *peer_connection_;
58 }; 54 };
59 55
60 } // namespace webrtc 56 } // namespace webrtc
61 57
62 58
63 @interface RTCPeerConnection () 59 @interface RTCPeerConnection ()
64 60
65 /** The native PeerConnectionInterface created during construction. */ 61 /** The native PeerConnectionInterface created during construction. */
66 @property(nonatomic, readonly) 62 @property(nonatomic, readonly)
67 rtc::scoped_refptr<webrtc::PeerConnectionInterface> nativePeerConnection; 63 rtc::scoped_refptr<webrtc::PeerConnectionInterface> nativePeerConnection;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 nativeIceGatheringStateForState:(RTCIceGatheringState)state; 95 nativeIceGatheringStateForState:(RTCIceGatheringState)state;
100 96
101 + (RTCIceGatheringState)iceGatheringStateForNativeState: 97 + (RTCIceGatheringState)iceGatheringStateForNativeState:
102 (webrtc::PeerConnectionInterface::IceGatheringState)nativeState; 98 (webrtc::PeerConnectionInterface::IceGatheringState)nativeState;
103 99
104 + (NSString *)stringForIceGatheringState:(RTCIceGatheringState)state; 100 + (NSString *)stringForIceGatheringState:(RTCIceGatheringState)state;
105 101
106 + (webrtc::PeerConnectionInterface::StatsOutputLevel) 102 + (webrtc::PeerConnectionInterface::StatsOutputLevel)
107 nativeStatsOutputLevelForLevel:(RTCStatsOutputLevel)level; 103 nativeStatsOutputLevelForLevel:(RTCStatsOutputLevel)level;
108 104
109 - (RTCMediaStream *)mediaStreamForNativeStream:
110 (rtc::scoped_refptr<webrtc::MediaStreamInterface>)stream;
111
112 - (void)removeNativeMediaStream:(rtc::scoped_refptr<webrtc::MediaStreamInterface >)stream;
113
114 @end 105 @end
115 106
116 NS_ASSUME_NONNULL_END 107 NS_ASSUME_NONNULL_END
OLDNEW
« no previous file with comments | « webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm ('k') | webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698