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

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

Issue 1770003002: Renamed VideoSourceInterface to VideoTrackSourceInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 9 months 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 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 396
397 rtc::scoped_refptr<webrtc::VideoTrackInterface> CreateLocalVideoTrack( 397 rtc::scoped_refptr<webrtc::VideoTrackInterface> CreateLocalVideoTrack(
398 const std::string& stream_label) { 398 const std::string& stream_label) {
399 // Set max frame rate to 10fps to reduce the risk of the tests to be flaky. 399 // Set max frame rate to 10fps to reduce the risk of the tests to be flaky.
400 FakeConstraints source_constraints = video_constraints_; 400 FakeConstraints source_constraints = video_constraints_;
401 source_constraints.SetMandatoryMaxFrameRate(10); 401 source_constraints.SetMandatoryMaxFrameRate(10);
402 402
403 cricket::FakeVideoCapturer* fake_capturer = 403 cricket::FakeVideoCapturer* fake_capturer =
404 new webrtc::FakePeriodicVideoCapturer(); 404 new webrtc::FakePeriodicVideoCapturer();
405 video_capturers_.push_back(fake_capturer); 405 video_capturers_.push_back(fake_capturer);
406 rtc::scoped_refptr<webrtc::VideoSourceInterface> source = 406 rtc::scoped_refptr<webrtc::VideoTrackSourceInterface> source =
407 peer_connection_factory_->CreateVideoSource(fake_capturer, 407 peer_connection_factory_->CreateVideoSource(fake_capturer,
408 &source_constraints); 408 &source_constraints);
409 std::string label = stream_label + kVideoTrackLabelBase; 409 std::string label = stream_label + kVideoTrackLabelBase;
410 return peer_connection_factory_->CreateVideoTrack(label, source); 410 return peer_connection_factory_->CreateVideoTrack(label, source);
411 } 411 }
412 412
413 DataChannelInterface* data_channel() { return data_channel_; } 413 DataChannelInterface* data_channel() { return data_channel_; }
414 const MockDataChannelObserver* data_observer() const { 414 const MockDataChannelObserver* data_observer() const {
415 return data_observer_.get(); 415 return data_observer_.get();
416 } 416 }
(...skipping 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after
2003 PeerConnectionInterface::IceServer server; 2003 PeerConnectionInterface::IceServer server;
2004 server.urls.push_back("turn:hostname"); 2004 server.urls.push_back("turn:hostname");
2005 server.urls.push_back("turn:hostname2"); 2005 server.urls.push_back("turn:hostname2");
2006 servers.push_back(server); 2006 servers.push_back(server);
2007 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); 2007 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
2008 EXPECT_EQ(2U, turn_servers_.size()); 2008 EXPECT_EQ(2U, turn_servers_.size());
2009 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); 2009 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
2010 } 2010 }
2011 2011
2012 #endif // if !defined(THREAD_SANITIZER) 2012 #endif // if !defined(THREAD_SANITIZER)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698