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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 static const char kTurnIceServerWithIPv6Address[] = | 62 static const char kTurnIceServerWithIPv6Address[] = |
63 "turn:test@[2401:fa00:4::]:1234"; | 63 "turn:test@[2401:fa00:4::]:1234"; |
64 | 64 |
65 class NullPeerConnectionObserver : public PeerConnectionObserver { | 65 class NullPeerConnectionObserver : public PeerConnectionObserver { |
66 public: | 66 public: |
67 virtual ~NullPeerConnectionObserver() = default; | 67 virtual ~NullPeerConnectionObserver() = default; |
68 virtual void OnMessage(const std::string& msg) {} | 68 virtual void OnMessage(const std::string& msg) {} |
69 virtual void OnSignalingMessage(const std::string& msg) {} | 69 virtual void OnSignalingMessage(const std::string& msg) {} |
70 virtual void OnSignalingChange( | 70 virtual void OnSignalingChange( |
71 PeerConnectionInterface::SignalingState new_state) {} | 71 PeerConnectionInterface::SignalingState new_state) {} |
72 virtual void OnAddStream(MediaStreamInterface* stream) {} | 72 virtual void OnAddStream(rtc::scoped_refptr<MediaStreamInterface> stream) {} |
73 virtual void OnRemoveStream(MediaStreamInterface* stream) {} | 73 virtual void OnRemoveStream(rtc::scoped_refptr<MediaStreamInterface> stream) { |
74 virtual void OnDataChannel(DataChannelInterface* data_channel) {} | 74 } |
| 75 virtual void OnDataChannel( |
| 76 rtc::scoped_refptr<DataChannelInterface> data_channel) {} |
75 virtual void OnRenegotiationNeeded() {} | 77 virtual void OnRenegotiationNeeded() {} |
76 virtual void OnIceConnectionChange( | 78 virtual void OnIceConnectionChange( |
77 PeerConnectionInterface::IceConnectionState new_state) {} | 79 PeerConnectionInterface::IceConnectionState new_state) {} |
78 virtual void OnIceGatheringChange( | 80 virtual void OnIceGatheringChange( |
79 PeerConnectionInterface::IceGatheringState new_state) {} | 81 PeerConnectionInterface::IceGatheringState new_state) {} |
80 virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) {} | 82 virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) {} |
81 }; | 83 }; |
82 | 84 |
83 } // namespace | 85 } // namespace |
84 | 86 |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 track->set_enabled(false); | 350 track->set_enabled(false); |
349 EXPECT_TRUE(capturer->CaptureFrame()); | 351 EXPECT_TRUE(capturer->CaptureFrame()); |
350 EXPECT_EQ(2, local_renderer.num_rendered_frames()); | 352 EXPECT_EQ(2, local_renderer.num_rendered_frames()); |
351 EXPECT_TRUE(local_renderer.black_frame()); | 353 EXPECT_TRUE(local_renderer.black_frame()); |
352 | 354 |
353 track->set_enabled(true); | 355 track->set_enabled(true); |
354 EXPECT_TRUE(capturer->CaptureFrame()); | 356 EXPECT_TRUE(capturer->CaptureFrame()); |
355 EXPECT_EQ(3, local_renderer.num_rendered_frames()); | 357 EXPECT_EQ(3, local_renderer.num_rendered_frames()); |
356 EXPECT_FALSE(local_renderer.black_frame()); | 358 EXPECT_FALSE(local_renderer.black_frame()); |
357 } | 359 } |
OLD | NEW |