zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the new versions of OnAddStream/OnRemoveStream in objc binding.

Browse Source 
Review-Url: https://codereview.webrtc.org/2049153002
Cr-Commit-Position: refs/heads/master@{#13078}
This commit is contained in:
deadbeef
2016-06-08 13:31:45 -07:00
committed by Commit bot
parent 73fbcf9237
commit d5f41ce898
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h
View File

@ -29,11 +29,12 @@ class PeerConnectionDelegateAdapter : public PeerConnectionObserver {
void OnSignalingChange( void OnSignalingChange(
PeerConnectionInterface::SignalingState new_state) override; PeerConnectionInterface::SignalingState new_state) override;
void OnAddStream(MediaStreamInterface *stream) override; void OnAddStream(rtc::scoped_refptr<MediaStreamInterface> stream) override;
void OnRemoveStream(MediaStreamInterface *stream) override; void OnRemoveStream(rtc::scoped_refptr<MediaStreamInterface> stream) override;
void OnDataChannel(DataChannelInterface *data_channel) override; void OnDataChannel(
rtc::scoped_refptr<DataChannelInterface> data_channel) override;
void OnRenegotiationNeeded() override; void OnRenegotiationNeeded() override;

6
webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
View File

@ -126,7 +126,7 @@ void PeerConnectionDelegateAdapter::OnSignalingChange(
} }
void PeerConnectionDelegateAdapter::OnAddStream( void PeerConnectionDelegateAdapter::OnAddStream(
MediaStreamInterface *stream) { rtc::scoped_refptr<MediaStreamInterface> stream) {
RTCMediaStream *mediaStream = RTCMediaStream *mediaStream =
[[RTCMediaStream alloc] initWithNativeMediaStream:stream]; [[RTCMediaStream alloc] initWithNativeMediaStream:stream];
RTCPeerConnection *peer_connection = peer_connection_; RTCPeerConnection *peer_connection = peer_connection_;
@ -135,7 +135,7 @@ void PeerConnectionDelegateAdapter::OnAddStream(
} }
void PeerConnectionDelegateAdapter::OnRemoveStream( void PeerConnectionDelegateAdapter::OnRemoveStream(
MediaStreamInterface *stream) { rtc::scoped_refptr<MediaStreamInterface> stream) {
RTCMediaStream *mediaStream = RTCMediaStream *mediaStream =
[[RTCMediaStream alloc] initWithNativeMediaStream:stream]; [[RTCMediaStream alloc] initWithNativeMediaStream:stream];
RTCPeerConnection *peer_connection = peer_connection_; RTCPeerConnection *peer_connection = peer_connection_;
@ -144,7 +144,7 @@ void PeerConnectionDelegateAdapter::OnRemoveStream(
} }
void PeerConnectionDelegateAdapter::OnDataChannel( void PeerConnectionDelegateAdapter::OnDataChannel(
DataChannelInterface *data_channel) { rtc::scoped_refptr<DataChannelInterface> data_channel) {
RTCDataChannel *dataChannel = RTCDataChannel *dataChannel =
[[RTCDataChannel alloc] initWithNativeDataChannel:data_channel]; [[RTCDataChannel alloc] initWithNativeDataChannel:data_channel];
RTCPeerConnection *peer_connection = peer_connection_; RTCPeerConnection *peer_connection = peer_connection_;