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 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
538 class PeerConnectionInterfaceTest : public testing::Test { | 538 class PeerConnectionInterfaceTest : public testing::Test { |
539 protected: | 539 protected: |
540 PeerConnectionInterfaceTest() { | 540 PeerConnectionInterfaceTest() { |
541 #ifdef WEBRTC_ANDROID | 541 #ifdef WEBRTC_ANDROID |
542 webrtc::InitializeAndroidObjects(); | 542 webrtc::InitializeAndroidObjects(); |
543 #endif | 543 #endif |
544 } | 544 } |
545 | 545 |
546 virtual void SetUp() { | 546 virtual void SetUp() { |
547 pc_factory_ = webrtc::CreatePeerConnectionFactory( | 547 pc_factory_ = webrtc::CreatePeerConnectionFactory( |
548 rtc::Thread::Current(), rtc::Thread::Current(), NULL, NULL, | 548 rtc::Thread::Current(), rtc::Thread::Current(), rtc::Thread::Current(), |
549 NULL); | 549 nullptr, nullptr, nullptr); |
550 ASSERT_TRUE(pc_factory_.get() != NULL); | 550 ASSERT_TRUE(pc_factory_); |
551 } | 551 } |
552 | 552 |
553 void CreatePeerConnection() { | 553 void CreatePeerConnection() { |
554 CreatePeerConnection(PeerConnectionInterface::RTCConfiguration(), nullptr); | 554 CreatePeerConnection(PeerConnectionInterface::RTCConfiguration(), nullptr); |
555 } | 555 } |
556 | 556 |
557 void CreatePeerConnection(webrtc::MediaConstraintsInterface* constraints) { | 557 void CreatePeerConnection(webrtc::MediaConstraintsInterface* constraints) { |
558 CreatePeerConnection(PeerConnectionInterface::RTCConfiguration(), | 558 CreatePeerConnection(PeerConnectionInterface::RTCConfiguration(), |
559 constraints); | 559 constraints); |
560 } | 560 } |
(...skipping 2245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2806 FakeConstraints updated_answer_c; | 2806 FakeConstraints updated_answer_c; |
2807 answer_c.SetMandatoryReceiveAudio(false); | 2807 answer_c.SetMandatoryReceiveAudio(false); |
2808 answer_c.SetMandatoryReceiveVideo(false); | 2808 answer_c.SetMandatoryReceiveVideo(false); |
2809 | 2809 |
2810 cricket::MediaSessionOptions updated_answer_options; | 2810 cricket::MediaSessionOptions updated_answer_options; |
2811 EXPECT_TRUE( | 2811 EXPECT_TRUE( |
2812 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); | 2812 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); |
2813 EXPECT_TRUE(updated_answer_options.has_audio()); | 2813 EXPECT_TRUE(updated_answer_options.has_audio()); |
2814 EXPECT_TRUE(updated_answer_options.has_video()); | 2814 EXPECT_TRUE(updated_answer_options.has_video()); |
2815 } | 2815 } |
OLD | NEW |