OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 std::unique_ptr<webrtc::IceCandidateInterface> candidate( | 234 std::unique_ptr<webrtc::IceCandidateInterface> candidate( |
235 webrtc::CreateIceCandidate(sdp_mid, sdp_mline_index, msg, nullptr)); | 235 webrtc::CreateIceCandidate(sdp_mid, sdp_mline_index, msg, nullptr)); |
236 EXPECT_TRUE(pc()->AddIceCandidate(candidate.get())); | 236 EXPECT_TRUE(pc()->AddIceCandidate(candidate.get())); |
237 } | 237 } |
238 | 238 |
239 // PeerConnectionObserver callbacks. | 239 // PeerConnectionObserver callbacks. |
240 void OnSignalingChange( | 240 void OnSignalingChange( |
241 webrtc::PeerConnectionInterface::SignalingState new_state) override { | 241 webrtc::PeerConnectionInterface::SignalingState new_state) override { |
242 EXPECT_EQ(pc()->signaling_state(), new_state); | 242 EXPECT_EQ(pc()->signaling_state(), new_state); |
243 } | 243 } |
244 void OnAddStream(MediaStreamInterface* media_stream) override { | 244 void OnAddStream( |
| 245 rtc::scoped_refptr<MediaStreamInterface> media_stream) override { |
245 media_stream->RegisterObserver(this); | 246 media_stream->RegisterObserver(this); |
246 for (size_t i = 0; i < media_stream->GetVideoTracks().size(); ++i) { | 247 for (size_t i = 0; i < media_stream->GetVideoTracks().size(); ++i) { |
247 const std::string id = media_stream->GetVideoTracks()[i]->id(); | 248 const std::string id = media_stream->GetVideoTracks()[i]->id(); |
248 ASSERT_TRUE(fake_video_renderers_.find(id) == | 249 ASSERT_TRUE(fake_video_renderers_.find(id) == |
249 fake_video_renderers_.end()); | 250 fake_video_renderers_.end()); |
250 fake_video_renderers_[id].reset(new webrtc::FakeVideoTrackRenderer( | 251 fake_video_renderers_[id].reset(new webrtc::FakeVideoTrackRenderer( |
251 media_stream->GetVideoTracks()[i])); | 252 media_stream->GetVideoTracks()[i])); |
252 } | 253 } |
253 } | 254 } |
254 void OnRemoveStream(MediaStreamInterface* media_stream) override {} | 255 void OnRemoveStream( |
| 256 rtc::scoped_refptr<MediaStreamInterface> media_stream) override {} |
255 void OnRenegotiationNeeded() override {} | 257 void OnRenegotiationNeeded() override {} |
256 void OnIceConnectionChange( | 258 void OnIceConnectionChange( |
257 webrtc::PeerConnectionInterface::IceConnectionState new_state) override { | 259 webrtc::PeerConnectionInterface::IceConnectionState new_state) override { |
258 EXPECT_EQ(pc()->ice_connection_state(), new_state); | 260 EXPECT_EQ(pc()->ice_connection_state(), new_state); |
259 } | 261 } |
260 void OnIceGatheringChange( | 262 void OnIceGatheringChange( |
261 webrtc::PeerConnectionInterface::IceGatheringState new_state) override { | 263 webrtc::PeerConnectionInterface::IceGatheringState new_state) override { |
262 EXPECT_EQ(pc()->ice_gathering_state(), new_state); | 264 EXPECT_EQ(pc()->ice_gathering_state(), new_state); |
263 } | 265 } |
264 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override { | 266 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override { |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
418 nullptr)) { | 420 nullptr)) { |
419 return value; | 421 return value; |
420 } | 422 } |
421 return true; | 423 return true; |
422 } | 424 } |
423 return offer_answer_options_.offer_to_receive_video > 0 || | 425 return offer_answer_options_.offer_to_receive_video > 0 || |
424 offer_answer_options_.offer_to_receive_video == | 426 offer_answer_options_.offer_to_receive_video == |
425 PeerConnectionInterface::RTCOfferAnswerOptions::kUndefined; | 427 PeerConnectionInterface::RTCOfferAnswerOptions::kUndefined; |
426 } | 428 } |
427 | 429 |
428 void OnDataChannel(DataChannelInterface* data_channel) override { | 430 void OnDataChannel( |
| 431 rtc::scoped_refptr<DataChannelInterface> data_channel) override { |
429 LOG(INFO) << id_ << "OnDataChannel"; | 432 LOG(INFO) << id_ << "OnDataChannel"; |
430 data_channel_ = data_channel; | 433 data_channel_ = data_channel; |
431 data_observer_.reset(new MockDataChannelObserver(data_channel)); | 434 data_observer_.reset(new MockDataChannelObserver(data_channel)); |
432 } | 435 } |
433 | 436 |
434 void CreateDataChannel() { | 437 void CreateDataChannel() { |
435 data_channel_ = pc()->CreateDataChannel(kDataChannelLabel, nullptr); | 438 data_channel_ = pc()->CreateDataChannel(kDataChannelLabel, nullptr); |
436 ASSERT_TRUE(data_channel_.get() != nullptr); | 439 ASSERT_TRUE(data_channel_.get() != nullptr); |
437 data_observer_.reset(new MockDataChannelObserver(data_channel_)); | 440 data_observer_.reset(new MockDataChannelObserver(data_channel_)); |
438 } | 441 } |
(...skipping 1760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2199 server.urls.push_back("turn:hostname2"); | 2202 server.urls.push_back("turn:hostname2"); |
2200 servers.push_back(server); | 2203 servers.push_back(server); |
2201 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); | 2204 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); |
2202 EXPECT_EQ(2U, turn_servers_.size()); | 2205 EXPECT_EQ(2U, turn_servers_.size()); |
2203 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); | 2206 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); |
2204 } | 2207 } |
2205 | 2208 |
2206 #endif // if !defined(THREAD_SANITIZER) | 2209 #endif // if !defined(THREAD_SANITIZER) |
2207 | 2210 |
2208 } // namespace | 2211 } // namespace |
OLD | NEW |