Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Side by Side Diff: webrtc/api/peerconnectionfactory_unittest.cc

Issue 2505173002: Added a callback function OnAddTrack to PeerConnectionObserver (Closed)
Patch Set: Simple change on java and obj-c. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 virtual void OnRemoveStream(rtc::scoped_refptr<MediaStreamInterface> stream) { 79 virtual void OnRemoveStream(rtc::scoped_refptr<MediaStreamInterface> stream) {
80 } 80 }
81 virtual void OnDataChannel( 81 virtual void OnDataChannel(
82 rtc::scoped_refptr<DataChannelInterface> data_channel) {} 82 rtc::scoped_refptr<DataChannelInterface> data_channel) {}
83 virtual void OnRenegotiationNeeded() {} 83 virtual void OnRenegotiationNeeded() {}
84 virtual void OnIceConnectionChange( 84 virtual void OnIceConnectionChange(
85 PeerConnectionInterface::IceConnectionState new_state) {} 85 PeerConnectionInterface::IceConnectionState new_state) {}
86 virtual void OnIceGatheringChange( 86 virtual void OnIceGatheringChange(
87 PeerConnectionInterface::IceGatheringState new_state) {} 87 PeerConnectionInterface::IceGatheringState new_state) {}
88 virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) {} 88 virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) {}
89 virtual void OnAddTrack(
90 rtc::scoped_refptr<webrtc::RtpReceiverInterface> receiver,
Taylor Brandstetter 2016/11/17 00:34:23 Good idea putting just the receiver in the event,
91 std::vector<rtc::scoped_refptr<MediaStreamInterface>> streams) {}
89 }; 92 };
90 93
91 } // namespace 94 } // namespace
92 95
93 class PeerConnectionFactoryTest : public testing::Test { 96 class PeerConnectionFactoryTest : public testing::Test {
94 void SetUp() { 97 void SetUp() {
95 #ifdef WEBRTC_ANDROID 98 #ifdef WEBRTC_ANDROID
96 webrtc::InitializeAndroidObjects(); 99 webrtc::InitializeAndroidObjects();
97 #endif 100 #endif
98 factory_ = webrtc::CreatePeerConnectionFactory( 101 factory_ = webrtc::CreatePeerConnectionFactory(
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 track->set_enabled(false); 357 track->set_enabled(false);
355 EXPECT_TRUE(capturer->CaptureFrame()); 358 EXPECT_TRUE(capturer->CaptureFrame());
356 EXPECT_EQ(2, local_renderer.num_rendered_frames()); 359 EXPECT_EQ(2, local_renderer.num_rendered_frames());
357 EXPECT_TRUE(local_renderer.black_frame()); 360 EXPECT_TRUE(local_renderer.black_frame());
358 361
359 track->set_enabled(true); 362 track->set_enabled(true);
360 EXPECT_TRUE(capturer->CaptureFrame()); 363 EXPECT_TRUE(capturer->CaptureFrame());
361 EXPECT_EQ(3, local_renderer.num_rendered_frames()); 364 EXPECT_EQ(3, local_renderer.num_rendered_frames());
362 EXPECT_FALSE(local_renderer.black_frame()); 365 EXPECT_FALSE(local_renderer.black_frame());
363 } 366 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698