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 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
447 default: | 447 default: |
448 ADD_FAILURE(); | 448 ADD_FAILURE(); |
449 break; | 449 break; |
450 } | 450 } |
451 } | 451 } |
452 | 452 |
453 MediaStreamInterface* RemoteStream(const std::string& label) { | 453 MediaStreamInterface* RemoteStream(const std::string& label) { |
454 return remote_streams_->find(label); | 454 return remote_streams_->find(label); |
455 } | 455 } |
456 StreamCollectionInterface* remote_streams() const { return remote_streams_; } | 456 StreamCollectionInterface* remote_streams() const { return remote_streams_; } |
457 void OnAddStream(MediaStreamInterface* stream) override { | 457 void OnAddStream(rtc::scoped_refptr<MediaStreamInterface> stream) override { |
458 last_added_stream_ = stream; | 458 last_added_stream_ = stream; |
459 remote_streams_->AddStream(stream); | 459 remote_streams_->AddStream(stream); |
460 } | 460 } |
461 void OnRemoveStream(MediaStreamInterface* stream) override { | 461 void OnRemoveStream( |
| 462 rtc::scoped_refptr<MediaStreamInterface> stream) override { |
462 last_removed_stream_ = stream; | 463 last_removed_stream_ = stream; |
463 remote_streams_->RemoveStream(stream); | 464 remote_streams_->RemoveStream(stream); |
464 } | 465 } |
465 void OnRenegotiationNeeded() override { renegotiation_needed_ = true; } | 466 void OnRenegotiationNeeded() override { renegotiation_needed_ = true; } |
466 void OnDataChannel(DataChannelInterface* data_channel) override { | 467 void OnDataChannel( |
| 468 rtc::scoped_refptr<DataChannelInterface> data_channel) override { |
467 last_datachannel_ = data_channel; | 469 last_datachannel_ = data_channel; |
468 } | 470 } |
469 | 471 |
470 void OnIceConnectionChange( | 472 void OnIceConnectionChange( |
471 PeerConnectionInterface::IceConnectionState new_state) override { | 473 PeerConnectionInterface::IceConnectionState new_state) override { |
472 EXPECT_EQ(pc_->ice_connection_state(), new_state); | 474 EXPECT_EQ(pc_->ice_connection_state(), new_state); |
473 } | 475 } |
474 void OnIceGatheringChange( | 476 void OnIceGatheringChange( |
475 PeerConnectionInterface::IceGatheringState new_state) override { | 477 PeerConnectionInterface::IceGatheringState new_state) override { |
476 EXPECT_EQ(pc_->ice_gathering_state(), new_state); | 478 EXPECT_EQ(pc_->ice_gathering_state(), new_state); |
(...skipping 2233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2710 FakeConstraints updated_answer_c; | 2712 FakeConstraints updated_answer_c; |
2711 answer_c.SetMandatoryReceiveAudio(false); | 2713 answer_c.SetMandatoryReceiveAudio(false); |
2712 answer_c.SetMandatoryReceiveVideo(false); | 2714 answer_c.SetMandatoryReceiveVideo(false); |
2713 | 2715 |
2714 cricket::MediaSessionOptions updated_answer_options; | 2716 cricket::MediaSessionOptions updated_answer_options; |
2715 EXPECT_TRUE( | 2717 EXPECT_TRUE( |
2716 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); | 2718 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); |
2717 EXPECT_TRUE(updated_answer_options.has_audio()); | 2719 EXPECT_TRUE(updated_answer_options.has_audio()); |
2718 EXPECT_TRUE(updated_answer_options.has_video()); | 2720 EXPECT_TRUE(updated_answer_options.has_video()); |
2719 } | 2721 } |
OLD | NEW |