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 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
555 | 555 |
556 void OnIceCandidatesRemoved( | 556 void OnIceCandidatesRemoved( |
557 const std::vector<cricket::Candidate>& candidates) override { | 557 const std::vector<cricket::Candidate>& candidates) override { |
558 callback_triggered_ = true; | 558 callback_triggered_ = true; |
559 } | 559 } |
560 | 560 |
561 void OnIceConnectionReceivingChange(bool receiving) override { | 561 void OnIceConnectionReceivingChange(bool receiving) override { |
562 callback_triggered_ = true; | 562 callback_triggered_ = true; |
563 } | 563 } |
564 | 564 |
565 void OnAddTrack(rtc::scoped_refptr<webrtc::RtpReceiverInterface> receiver, | 565 void OnAddTrack( |
566 std::vector<rtc::scoped_refptr<webrtc::MediaStreamInterface>> | 566 rtc::scoped_refptr<webrtc::RtpReceiverInterface> receiver, |
567 streams) override { | 567 const std::vector<rtc::scoped_refptr<webrtc::MediaStreamInterface>>& |
| 568 streams) override { |
568 EXPECT_TRUE(receiver != nullptr); | 569 EXPECT_TRUE(receiver != nullptr); |
569 num_added_tracks_++; | 570 num_added_tracks_++; |
570 last_added_track_label_ = receiver->id(); | 571 last_added_track_label_ = receiver->id(); |
571 } | 572 } |
572 | 573 |
573 // Returns the label of the last added stream. | 574 // Returns the label of the last added stream. |
574 // Empty string if no stream have been added. | 575 // Empty string if no stream have been added. |
575 std::string GetLastAddedStreamLabel() { | 576 std::string GetLastAddedStreamLabel() { |
576 if (last_added_stream_.get()) | 577 if (last_added_stream_.get()) |
577 return last_added_stream_->label(); | 578 return last_added_stream_->label(); |
(...skipping 2403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2981 FakeConstraints updated_answer_c; | 2982 FakeConstraints updated_answer_c; |
2982 answer_c.SetMandatoryReceiveAudio(false); | 2983 answer_c.SetMandatoryReceiveAudio(false); |
2983 answer_c.SetMandatoryReceiveVideo(false); | 2984 answer_c.SetMandatoryReceiveVideo(false); |
2984 | 2985 |
2985 cricket::MediaSessionOptions updated_answer_options; | 2986 cricket::MediaSessionOptions updated_answer_options; |
2986 EXPECT_TRUE( | 2987 EXPECT_TRUE( |
2987 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); | 2988 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); |
2988 EXPECT_TRUE(updated_answer_options.has_audio()); | 2989 EXPECT_TRUE(updated_answer_options.has_audio()); |
2989 EXPECT_TRUE(updated_answer_options.has_video()); | 2990 EXPECT_TRUE(updated_answer_options.has_video()); |
2990 } | 2991 } |
OLD | NEW |